dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added "is static" information for all wh types to the UI table

Browse Source 
- fixed some missing "wandering" wh types in C2, C4, C5, C6 systems
This commit is contained in:
Mark Friedrich
2018-06-30 17:47:22 +02:00
parent 5e9c57758b
commit 664914c71a
8 changed files with 114 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
js/app/conf/signature_type.js
View File

@@ -6,7 +6,7 @@
* proofed, signature names (copy & paste from scanning window)
*/
define(['jquery'], function($) {
define(['jquery'], ($) => {
'use strict';
@@ -95,6 +95,7 @@ define(['jquery'], function($) {
5: 'Ordinary Perimeter Reservoir' //*
},
5: { // Wormhole
// all k-space exits are static or K162
1: 'H121 - C1',
2: 'C125 - C2',
3: 'O883 - C3',
@@ -138,12 +139,8 @@ define(['jquery'], function($) {
5: 'Ordinary Perimeter Reservoir' //*
},
5: { // Wormhole
1: 'Z647 - C1',
2: 'D382 - C2',
3: 'O477 - C3',
4: 'Y683 - C4',
5: 'N062 - C5',
6: 'R474 - C6',
// all w-space -> w-space are statics or K162
// all w-space -> k-space are statics or k162
7: 'F135 - Thera'
},
6: { // ORE
@@ -183,6 +180,7 @@ define(['jquery'], function($) {
7: 'Vast Frontier Reservoir' //*
},
5: { // Wormhole
// all k-space exits are static or K162
1: 'V301 - C1',
2: 'I182 - C2',
3: 'N968 - C3',
@@ -228,8 +226,11 @@ define(['jquery'], function($) {
7: 'Bountiful Frontier Reservoir' //*
},
5: { // Wormhole
// no *wandering* w-space -> k-space wormholes
// no *wandering* w-space -> w-space
// all holes are statics or K162
1: 'S047 - HS',
2: 'N290 - LS',
3: 'K329 - 0.0'
},
6: { // ORE
1: 'Ordinary Perimeter Deposit', //*
@@ -272,8 +273,7 @@ define(['jquery'], function($) {
5: { // Wormhole
1: 'D792 - HS',
2: 'C140 - LS',
3: 'Z142 - 0.0',
4: 'F135 - Thera'
3: 'Z142 - 0.0'
},
6: { // ORE
1: 'Average Frontier Deposit', //*
@@ -318,10 +318,12 @@ define(['jquery'], function($) {
9: 'Vital Core Reservoir' //*
},
5: { // Wormhole
1: 'D792 - HS',
2: 'C391 - LS',
3: 'C248 - 0.0',
4: 'F135 - Thera'
1: 'B520 - HS',
2: 'D792 - HS',
3: 'C140 - LS',
4: 'C391 - LS',
5: 'C248 - 0.0',
6: 'Z142 - 0.0'
},
6: { // ORE
1: 'Ordinary Perimeter Deposit', //*
@@ -376,13 +378,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'M555 - C5',
5: 'B041 - C6',
6: 'A641 - HS',
7: 'R051 - LS',
8: 'V283 - 0.0',
9: 'T458 - Thera'
4: 'O128 - C4',
5: 'M555 - C5',
6: 'B041 - C6',
7: 'A641 - HS',
8: 'R051 - LS',
9: 'V283 - 0.0',
10: 'T458 - Thera'
}
},
11: { // Low Sec
@@ -390,13 +392,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'N432 - C5',
5: 'U319 - C6',
6: 'B449 - HS',
7: 'N944 - LS',
8: 'S199 - 0.0',
9: 'M164 - Thera'
4: 'O128 - C4',
5: 'N432 - C5',
6: 'U319 - C6',
7: 'B449 - HS',
8: 'N944 - LS',
9: 'S199 - 0.0',
10: 'M164 - Thera'
}
},
12: { // 0.0
@@ -404,13 +406,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'N432 - C5',
5: 'U319 - C6',
6: 'B449 - HS',
7: 'N944 - LS',
8: 'S199 - 0.0',
9: 'L031 - Thera'
4: 'O128 - C4',
5: 'N432 - C5',
6: 'U319 - C6',
7: 'B449 - HS',
8: 'N944 - LS',
9: 'S199 - 0.0',
10: 'L031 - Thera'
}
}
}

14
js/app/ui/dialog/jump_info.js
View File

@@ -45,6 +45,18 @@ define([
}.bind({
Util: Util
}),
formatStatic: function(){
return function(value, render){
console.log(render(value));
console.log(typeof render(value));
let isStatic = render(value) === 'true';
if(isStatic){
return '<i class="fas fa-check"></i>';
}else{
return '';
}
};
},
sigStrengthValue: function(){
return function(value, render){
let float = render(value);
@@ -94,6 +106,8 @@ define([
});
});
jumpDialog.initTooltips();
jumpDialog.modal('show');
});
};

2
public/css/v1.3.6/pathfinder.css
View File

File diff suppressed because one or more lines are too long

2
public/css/v1.3.6/pathfinder.css.map
View File

File diff suppressed because one or more lines are too long

72
public/js/v1.3.6/app/conf/signature_type.js
View File

@@ -6,7 +6,7 @@
* proofed, signature names (copy & paste from scanning window)
*/
define(['jquery'], function($) {
define(['jquery'], ($) => {
'use strict';
@@ -95,6 +95,7 @@ define(['jquery'], function($) {
5: 'Ordinary Perimeter Reservoir' //*
},
5: { // Wormhole
// all k-space exits are static or K162
1: 'H121 - C1',
2: 'C125 - C2',
3: 'O883 - C3',
@@ -138,12 +139,8 @@ define(['jquery'], function($) {
5: 'Ordinary Perimeter Reservoir' //*
},
5: { // Wormhole
1: 'Z647 - C1',
2: 'D382 - C2',
3: 'O477 - C3',
4: 'Y683 - C4',
5: 'N062 - C5',
6: 'R474 - C6',
// all w-space -> w-space are statics or K162
// all w-space -> k-space are statics or k162
7: 'F135 - Thera'
},
6: { // ORE
@@ -183,6 +180,7 @@ define(['jquery'], function($) {
7: 'Vast Frontier Reservoir' //*
},
5: { // Wormhole
// all k-space exits are static or K162
1: 'V301 - C1',
2: 'I182 - C2',
3: 'N968 - C3',
@@ -228,8 +226,11 @@ define(['jquery'], function($) {
7: 'Bountiful Frontier Reservoir' //*
},
5: { // Wormhole
// no *wandering* w-space -> k-space wormholes
// no *wandering* w-space -> w-space
// all holes are statics or K162
1: 'S047 - HS',
2: 'N290 - LS',
3: 'K329 - 0.0'
},
6: { // ORE
1: 'Ordinary Perimeter Deposit', //*
@@ -272,8 +273,7 @@ define(['jquery'], function($) {
5: { // Wormhole
1: 'D792 - HS',
2: 'C140 - LS',
3: 'Z142 - 0.0',
4: 'F135 - Thera'
3: 'Z142 - 0.0'
},
6: { // ORE
1: 'Average Frontier Deposit', //*
@@ -318,10 +318,12 @@ define(['jquery'], function($) {
9: 'Vital Core Reservoir' //*
},
5: { // Wormhole
1: 'D792 - HS',
2: 'C391 - LS',
3: 'C248 - 0.0',
4: 'F135 - Thera'
1: 'B520 - HS',
2: 'D792 - HS',
3: 'C140 - LS',
4: 'C391 - LS',
5: 'C248 - 0.0',
6: 'Z142 - 0.0'
},
6: { // ORE
1: 'Ordinary Perimeter Deposit', //*
@@ -376,13 +378,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'M555 - C5',
5: 'B041 - C6',
6: 'A641 - HS',
7: 'R051 - LS',
8: 'V283 - 0.0',
9: 'T458 - Thera'
4: 'O128 - C4',
5: 'M555 - C5',
6: 'B041 - C6',
7: 'A641 - HS',
8: 'R051 - LS',
9: 'V283 - 0.0',
10: 'T458 - Thera'
}
},
11: { // Low Sec
@@ -390,13 +392,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'N432 - C5',
5: 'U319 - C6',
6: 'B449 - HS',
7: 'N944 - LS',
8: 'S199 - 0.0',
9: 'M164 - Thera'
4: 'O128 - C4',
5: 'N432 - C5',
6: 'U319 - C6',
7: 'B449 - HS',
8: 'N944 - LS',
9: 'S199 - 0.0',
10: 'M164 - Thera'
}
},
12: { // 0.0
@@ -404,13 +406,13 @@ define(['jquery'], function($) {
1: 'Z971 - C1',
2: 'R943 - C2',
3: 'X702 - C3',
// no C4
4: 'N432 - C5',
5: 'U319 - C6',
6: 'B449 - HS',
7: 'N944 - LS',
8: 'S199 - 0.0',
9: 'L031 - Thera'
4: 'O128 - C4',
5: 'N432 - C5',
6: 'U319 - C6',
7: 'B449 - HS',
8: 'N944 - LS',
9: 'S199 - 0.0',
10: 'L031 - Thera'
}
}
}

14
public/js/v1.3.6/app/ui/dialog/jump_info.js
View File

@@ -45,6 +45,18 @@ define([
}.bind({
Util: Util
}),
formatStatic: function(){
return function(value, render){
console.log(render(value));
console.log(typeof render(value));
let isStatic = render(value) === 'true';
if(isStatic){
return '<i class="fas fa-check"></i>';
}else{
return '';
}
};
},
sigStrengthValue: function(){
return function(value, render){
let float = render(value);
@@ -94,6 +106,8 @@ define([
});
});
jumpDialog.initTooltips();
jumpDialog.modal('show');
});
};

10
public/templates/dialog/jump_info.html
View File

@@ -4,6 +4,7 @@
<tr>
<th class=""></th>
<th class="text-center">Leads to</th>
<th class="text-center pf-table-cell-10" title="is static"><i class="fas fa-thumbtack"></i></th>
<th class="text-right">Mass total</th>
<th class="text-right">Mass individual</th>
<th class="text-right">Mass regeneration</th>
@@ -16,10 +17,11 @@
<tr>
<td>{{name}}</td>
<td class="text-center {{#securityClass}}{{security}}{{/securityClass}}">{{security}}</td>
<td class="text-right">{{#massValue}}{{massTotal}}{{/massValue}}</td>
<td class="text-right">{{#massValue}}{{massIndividual}}{{/massValue}}</td>
<td class="text-right">{{#massValue}}{{massRegeneration}}{{/massValue}}</td>
<td class="text-right">{{maxStableTime}}&nbsp;h</td>
<td class="text-center" data-order="{{static}}">{{#formatStatic}}{{static}}{{/formatStatic}}</td>
<td class="text-right" data-order="{{massTotal}}">{{#massValue}}{{massTotal}}{{/massValue}}</td>
<td class="text-right" data-order="{{massIndividual}}">{{#massValue}}{{massIndividual}}{{/massValue}}</td>
<td class="text-right" data-order="{{massRegeneration}}">{{#massValue}}{{massRegeneration}}{{/massValue}}</td>
<td class="text-right" data-order="{{maxStableTime}}">{{maxStableTime}}&nbsp&nbsp;h</td>
<td class="text-right txt-color {{^signatureStrength}}txt-color-grayLight{{/signatureStrength}}" data-order="{{signatureStrength}}">
{{#sigStrengthValue}}{{signatureStrength}}{{/sigStrengthValue}}
</td>

4
sass/layout/_main.scss
View File

@@ -376,6 +376,10 @@ table{
}
td, th{
&.pf-table-cell-10{
width: 10px;
}
&.pf-table-cell-20{
width: 20px;
}