aa-intel-tool 0.0.1a8__py3-none-any.whl → 0.0.1a10__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- aa_intel_tool/app_settings.py +7 -0
- aa_intel_tool/constants.py +40 -13
- aa_intel_tool/helper/data_structure.py +22 -0
- aa_intel_tool/locale/es/LC_MESSAGES/django.mo +0 -0
- aa_intel_tool/locale/es/LC_MESSAGES/django.po +19 -17
- aa_intel_tool/locale/ru/LC_MESSAGES/django.mo +0 -0
- aa_intel_tool/locale/ru/LC_MESSAGES/django.po +22 -20
- aa_intel_tool/migrations/0006_alter_scandata_unique_together.py +17 -0
- aa_intel_tool/models.py +2 -0
- aa_intel_tool/parser/module/chatlist.py +4 -22
- aa_intel_tool/parser/module/dscan.py +194 -102
- aa_intel_tool/static/aa_intel_tool/javascript/{aa-intel-tool-highlight.js → aa-intel-tool-chatscan-highlight.js} +23 -23
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js +1 -0
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.js +3 -3
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.min.js +1 -1
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-clipboard.js +3 -4
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-clipboard.min.js +1 -1
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.js +40 -0
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js +1 -0
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.js +43 -45
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js +1 -1
- aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-chatscan-js.html +1 -1
- aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-dscan-js.html +1 -1
- aa_intel_tool/tests/test-data/dscan-german-client.txt +176 -0
- aa_intel_tool/tests/test-data/dscan-russian-client.txt +13 -0
- aa_intel_tool/tests/test-data/dscan.txt +1 -1
- aa_intel_tool/tests/test_app_settings.py +27 -0
- aa_intel_tool/tests/test_parser.py +16 -17
- aa_intel_tool/views/ajax.py +4 -9
- {aa_intel_tool-0.0.1a8.dist-info → aa_intel_tool-0.0.1a10.dist-info}/METADATA +13 -11
- {aa_intel_tool-0.0.1a8.dist-info → aa_intel_tool-0.0.1a10.dist-info}/RECORD +33 -25
- aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-highlight.min.js +0 -1
- {aa_intel_tool-0.0.1a8.dist-info → aa_intel_tool-0.0.1a10.dist-info}/WHEEL +0 -0
- {aa_intel_tool-0.0.1a8.dist-info → aa_intel_tool-0.0.1a10.dist-info}/licenses/LICENSE +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
jQuery(document).ready($=>{"use strict";const elementPilotsTable=$("table.aa-intel-pilot-participation-list");const elementCorporationsTable=$("table.aa-intel-corporation-participation-list");const elementAlliancesTable=$("table.aa-intel-alliance-participation-list");const elementPilotsTotalCount=$("span#aa-intel-pilots-count");const elementCorporationsTotalCount=$("span#aa-intel-corporations-count");const elementAlliancesTotalCount=$("span#aa-intel-alliances-count");const pilotInfoPanel=pilotData=>{let html_logo=""+'<span class="aa-intel-pilot-avatar-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+pilotData["id"]+'" '+' src="'+pilotData["portrait"]+'" '+' alt="'+pilotData["name"]+'" '+' title="'+pilotData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-pilot-information-wrapper">\n'+' <span class="aa-intel-pilot-name-wrapper">\n'+" "+pilotData["name"]+"\n"+" </span>\n";html_info+=""+' <span class="aa-intel-pilot-links-wrapper">\n'+" <small>\n"+" <a "+' class="aa-intel-information-link" '+' href="'+pilotData["evewho"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' evewho <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+pilotData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n";return html_logo+html_info};const corporationInfoPanel=(corporationData,logoOnly=false)=>{let html_logo=""+'<span class="aa-intel-corporation-logo-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+corporationData["id"]+'" '+' src="'+corporationData["logo"]+'" '+' alt="'+corporationData["name"]+'" '+' title="'+corporationData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-corporation-information-wrapper">\n'+' <span class="aa-intel-corporation-name-wrapper">\n'+" "+corporationData["name"]+"\n"+" </span>\n";html_info+=""+' <span class="aa-intel-corporation-links-wrapper">\n'+" <small>\n";if(1e6<=corporationData["id"]&&corporationData["id"]<=2e6){html_info+=""+" ("+aaIntelToolJsL10n.scanData.npcCorp+")"}else{html_info+=""+" <a "+' class="aa-intel-information-link" '+' href="'+corporationData["dotlan"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+corporationData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n"}html_info+=""+"</span>";if(logoOnly){return html_logo}return html_logo+html_info};const allianceInfoPanel=(allianceData,logoOnly=false)=>{if(allianceData["name"]===""){allianceData["name"]=aaIntelToolJsL10n.scanData.empty}let html_logo=""+'<span class="aa-intel-alliance-logo-wrapper alliance-id-'+allianceData["id"]+'">\n'+" <img "+' class="eve-image" '+' data-eveid="'+allianceData["id"]+'" '+' src="'+allianceData["logo"]+'" '+' alt="'+allianceData["name"]+'" '+' title="'+allianceData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-alliance-information-wrapper">\n'+' <span class="aa-intel-alliance-name-wrapper">\n'+" "+allianceData["name"]+"\n"+" </span>\n";if(allianceData["id"]>1){html_info+=""+' <span class="aa-intel-alliance-links-wrapper">\n'+" <small>\n"+" <a "+' class="aa-intel-information-link" '+' href="'+allianceData["dotlan"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+allianceData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n"}html_info+=""+"</span>";if(logoOnly){if(allianceData.id===1){return""}return html_logo}return html_logo+html_info};elementAlliancesTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getAllianceList,dataSrc:"",cache:true},columns:[{data:data=>{return allianceInfoPanel(data)}},{data:"count"},{data:"ticker"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis fix-eve-image-position")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementAlliancesTotalCount.html();let newTotal;if(data["id"]===1){if(parseInt(currentTotal)>1){newTotal=parseInt(currentTotal)-1}}else{newTotal=parseInt(currentTotal)+1}elementAlliancesTotalCount.html(newTotal);$(row).addClass(
|
|
1
|
+
jQuery(document).ready($=>{"use strict";const elementPilotsTable=$("table.aa-intel-pilot-participation-list");const elementCorporationsTable=$("table.aa-intel-corporation-participation-list");const elementAlliancesTable=$("table.aa-intel-alliance-participation-list");const elementPilotsTotalCount=$("span#aa-intel-pilots-count");const elementCorporationsTotalCount=$("span#aa-intel-corporations-count");const elementAlliancesTotalCount=$("span#aa-intel-alliances-count");const pilotInfoPanel=pilotData=>{let html_logo=""+'<span class="aa-intel-pilot-avatar-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+pilotData["id"]+'" '+' src="'+pilotData["portrait"]+'" '+' alt="'+pilotData["name"]+'" '+' title="'+pilotData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-pilot-information-wrapper">\n'+' <span class="aa-intel-pilot-name-wrapper">\n'+" "+pilotData["name"]+"\n"+" </span>\n";html_info+=""+' <span class="aa-intel-pilot-links-wrapper">\n'+" <small>\n"+" <a "+' class="aa-intel-information-link" '+' href="'+pilotData["evewho"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' evewho <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+pilotData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n";return html_logo+html_info};const corporationInfoPanel=(corporationData,logoOnly=false)=>{let html_logo=""+'<span class="aa-intel-corporation-logo-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+corporationData["id"]+'" '+' src="'+corporationData["logo"]+'" '+' alt="'+corporationData["name"]+'" '+' title="'+corporationData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-corporation-information-wrapper">\n'+' <span class="aa-intel-corporation-name-wrapper">\n'+" "+corporationData["name"]+"\n"+" </span>\n";html_info+=""+' <span class="aa-intel-corporation-links-wrapper">\n'+" <small>\n";if(1e6<=corporationData["id"]&&corporationData["id"]<=2e6){html_info+=""+" ("+aaIntelToolJsL10n.scanData.npcCorp+")"}else{html_info+=""+" <a "+' class="aa-intel-information-link" '+' href="'+corporationData["dotlan"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+corporationData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n"}html_info+=""+"</span>";if(logoOnly){return html_logo}return html_logo+html_info};const allianceInfoPanel=(allianceData,logoOnly=false)=>{if(allianceData["name"]===""){allianceData["name"]=aaIntelToolJsL10n.scanData.empty}let html_logo=""+'<span class="aa-intel-alliance-logo-wrapper alliance-id-'+allianceData["id"]+'">\n'+" <img "+' class="eve-image" '+' data-eveid="'+allianceData["id"]+'" '+' src="'+allianceData["logo"]+'" '+' alt="'+allianceData["name"]+'" '+' title="'+allianceData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-alliance-information-wrapper">\n'+' <span class="aa-intel-alliance-name-wrapper">\n'+" "+allianceData["name"]+"\n"+" </span>\n";if(allianceData["id"]>1){html_info+=""+' <span class="aa-intel-alliance-links-wrapper">\n'+" <small>\n"+" <a "+' class="aa-intel-information-link" '+' href="'+allianceData["dotlan"]+'" '+' target="_blank" '+' rel="noopener noreferer"'+" >"+' dotlan <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a> |\n"+" <a "+' class="aa-intel-information-link" '+' href="'+allianceData["zkillboard"]+'" '+' target="_blank" rel="noopener noreferer"'+" >"+' zkillboard <i class="fas fa-external-link-alt" aria-hidden="true"></i>'+" </a>\n"+" </small>\n"+" </span>\n"}html_info+=""+"</span>";if(logoOnly){if(allianceData.id===1){return""}return html_logo}return html_logo+html_info};elementAlliancesTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getAllianceList,dataSrc:"",cache:true},columns:[{data:data=>{return allianceInfoPanel(data)}},{data:"count"},{data:"ticker"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis fix-eve-image-position")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementAlliancesTotalCount.html();let newTotal;if(data["id"]===1){if(parseInt(currentTotal)>1){newTotal=parseInt(currentTotal)-1}}else{newTotal=parseInt(currentTotal)+1}elementAlliancesTotalCount.html(newTotal);$(row).addClass(`aa-intel-alliance-participation-item aa-intel-alliance-id-${data["id"]}`).attr("data-alliance-id",data["id"]);$(row).on("mouseenter",()=>{addHightlight("alliance",$(row))}).on("mouseleave",()=>{removeHightlight("alliance",$(row))});$(row).on("click",()=>{changeStickyHighlight("alliance",$(row))}).on("click",".aa-intel-information-link",e=>{e.stopPropagation()})}});elementCorporationsTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getCorporationList,dataSrc:"",cache:true},columns:[{data:data=>{return corporationInfoPanel(data)}},{data:"count"},{data:"ticker"},{data:"alliance.name"},{data:"alliance.ticker"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis fix-eve-image-position")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:[2,3,4],visible:false}],createdRow:(row,data)=>{const currentTotal=elementCorporationsTotalCount.html();const newTotal=parseInt(currentTotal)+1;elementCorporationsTotalCount.html(newTotal);$(row).addClass(`aa-intel-corporation-participation-item aa-intel-corporation-id-${data["id"]}`).attr("data-corporation-id",data["id"]).attr("data-alliance-id",data["alliance"]["id"]);$(row).on("mouseenter",()=>{addHightlight("corporation",$(row))}).on("mouseleave",()=>{removeHightlight("corporation",$(row))});$(row).on("click",()=>{changeStickyHighlight("corporation",$(row))}).on("click",".aa-intel-information-link",e=>{e.stopPropagation()})}});elementPilotsTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getPilotList,dataSrc:"",cache:true},columns:[{data:data=>{return pilotInfoPanel(data)}},{data:data=>{return allianceInfoPanel(data["alliance"],true)+data["alliance"]["ticker"]}},{data:data=>{return corporationInfoPanel(data["corporation"],true)+data["corporation"]["ticker"]}},{data:"alliance.name"},{data:"corporation.name"}],order:[[0,"asc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis fix-eve-image-position")}},{targets:1,width:125},{targets:2,width:125},{targets:[3,4],visible:false}],createdRow:(row,data)=>{const currentTotal=elementPilotsTotalCount.html();const newTotal=parseInt(currentTotal)+1;elementPilotsTotalCount.html(newTotal);$(row).addClass(`aa-intel-corporation-participation-item aa-intel-corporation-id-${data["id"]}`).attr("data-character-id",data["id"]).attr("data-corporation-id",data["corporation"]["id"]).attr("data-alliance-id",data["alliance"]["id"]);$(row).on("mouseenter",()=>{addHightlight("pilot",$(row))}).on("mouseleave",()=>{removeHightlight("pilot",$(row))});$(row).on("click",()=>{changeStickyHighlight("pilot",$(row))}).on("click",".aa-intel-information-link",e=>{e.stopPropagation()})}})});
|
|
@@ -21,9 +21,9 @@ jQuery(document).ready(($) => {
|
|
|
21
21
|
* @param {int} closeAfter Close Message after given time in seconds (Default: 10)
|
|
22
22
|
*/
|
|
23
23
|
const closeMessageElement = (element, closeAfter = 10) => {
|
|
24
|
-
$(element).fadeTo(closeAfter * 1000, 500).slideUp(500, () => {
|
|
25
|
-
$(
|
|
26
|
-
$(
|
|
24
|
+
$(element).fadeTo(closeAfter * 1000, 500).slideUp(500, (elm) => {
|
|
25
|
+
$(elm).slideUp(500, (el) => {
|
|
26
|
+
$(el).remove();
|
|
27
27
|
});
|
|
28
28
|
});
|
|
29
29
|
};
|
|
@@ -111,5 +111,4 @@ jQuery(document).ready(($) => {
|
|
|
111
111
|
elementCopyToClipboard.on('click', () => {
|
|
112
112
|
copyScanLink('#'+ elementCopyToClipboard.attr('id'));
|
|
113
113
|
});
|
|
114
|
-
|
|
115
114
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
jQuery(document).ready($=>{"use strict";const elementCopyToClipboard=$("button#btn-copy-permalink-to-clipboard");if(!ClipboardJS.isSupported()){elementCopyToClipboard.remove()}const closeMessageElement=(element,closeAfter=10)=>{$(element).fadeTo(closeAfter*1e3,500).slideUp(500,
|
|
1
|
+
jQuery(document).ready($=>{"use strict";const elementCopyToClipboard=$("button#btn-copy-permalink-to-clipboard");if(!ClipboardJS.isSupported()){elementCopyToClipboard.remove()}const closeMessageElement=(element,closeAfter=10)=>{$(element).fadeTo(closeAfter*1e3,500).slideUp(500,elm=>{$(elm).slideUp(500,el=>{$(el).remove()})})};const showSuccess=(message,element)=>{$(element).html('<div class="alert alert-success alert-dismissable alert-message-success">'+'<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>'+message+"</div>");closeMessageElement(".alert-message-success")};const showError=(message,element)=>{$(element).html('<div class="alert alert-danger alert-dismissable alert-message-error">'+'<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>'+message+"</div>");closeMessageElement(".alert-message-error",9999)};const copyScanLink=elementId=>{const clipboardScanLink=new ClipboardJS(elementId);clipboardScanLink.on("success",e=>{showSuccess(aaIntelToolJsL10n.copyToClipboard.permalink.text.success,".aa-intel-copy-result");e.clearSelection();clipboardScanLink.destroy()});clipboardScanLink.on("error",()=>{showError(aaIntelToolJsL10n.copyToClipboard.permalink.text.error,".aa-intel-copy-result");clipboardScanLink.destroy()})};elementCopyToClipboard.on("click",()=>{copyScanLink("#"+elementCopyToClipboard.attr("id"))})});
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
/* Highlighting similar table rows on mouse over and click for d-scans
|
|
4
|
+
--------------------------------------------------------------------------------- */
|
|
5
|
+
|
|
6
|
+
const elementShipClassTable = $('table.aa-intel-dscan-ship-classes');
|
|
7
|
+
const elementShipTypeTable = $('table.aa-intel-dscan-ship-types');
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Add highlight to other tables
|
|
11
|
+
*
|
|
12
|
+
* @param by_table {string} The table from which this function is triggered
|
|
13
|
+
* @param table_row {element} The table row that is to be changed
|
|
14
|
+
*/
|
|
15
|
+
const addHightlight = (by_table, table_row) => { // eslint-disable-line no-unused-vars
|
|
16
|
+
elementShipClassTable
|
|
17
|
+
.find(`tr[data-${by_table}-id="${table_row.data(`${by_table}-id`)}"]`)
|
|
18
|
+
.addClass('aa-intel-highlight');
|
|
19
|
+
|
|
20
|
+
elementShipTypeTable
|
|
21
|
+
.find(`tr[data-shiptype-id="${table_row.data('shiptype-id')}"]`)
|
|
22
|
+
.addClass('aa-intel-highlight');
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Add highlight to other tables
|
|
28
|
+
*
|
|
29
|
+
* @param by_table {string} The table from which this function is triggered
|
|
30
|
+
* @param table_row {element} The table row that is to be changed
|
|
31
|
+
*/
|
|
32
|
+
const removeHightlight = (by_table, table_row) => { // eslint-disable-line no-unused-vars
|
|
33
|
+
elementShipClassTable
|
|
34
|
+
.find(`tr[data-${by_table}-id="${table_row.data(`${by_table}-id`)}"]`)
|
|
35
|
+
.removeClass('aa-intel-highlight');
|
|
36
|
+
|
|
37
|
+
elementShipTypeTable
|
|
38
|
+
.find(`tr[data-shiptype-id="${table_row.data('shiptype-id')}"]`)
|
|
39
|
+
.removeClass('aa-intel-highlight');
|
|
40
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";const elementShipClassTable=$("table.aa-intel-dscan-ship-classes");const elementShipTypeTable=$("table.aa-intel-dscan-ship-types");const addHightlight=(by_table,table_row)=>{elementShipClassTable.find(`tr[data-${by_table}-id="${table_row.data(`${by_table}-id`)}"]`).addClass("aa-intel-highlight");elementShipTypeTable.find(`tr[data-shiptype-id="${table_row.data("shiptype-id")}"]`).addClass("aa-intel-highlight")};const removeHightlight=(by_table,table_row)=>{elementShipClassTable.find(`tr[data-${by_table}-id="${table_row.data(`${by_table}-id`)}"]`).removeClass("aa-intel-highlight");elementShipTypeTable.find(`tr[data-shiptype-id="${table_row.data("shiptype-id")}"]`).removeClass("aa-intel-highlight")};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* global aaIntelToolJsL10n, aaIntelToolJsOptions */
|
|
1
|
+
/* global aaIntelToolJsL10n, aaIntelToolJsOptions, addHightlight, removeHightlight */
|
|
2
2
|
|
|
3
3
|
jQuery(document).ready(($) => {
|
|
4
4
|
'use strict';
|
|
@@ -98,24 +98,24 @@ jQuery(document).ready(($) => {
|
|
|
98
98
|
|
|
99
99
|
elementDscanCountAll.html(newTotal);
|
|
100
100
|
|
|
101
|
-
$(row)
|
|
101
|
+
$(row)
|
|
102
|
+
.attr('data-shipclass-id', data['id'])
|
|
103
|
+
.attr('data-shiptype-id', data['type_id']);
|
|
102
104
|
|
|
103
105
|
// Highlight
|
|
104
106
|
$(row).on('mouseenter', () => {
|
|
105
|
-
|
|
106
|
-
.addClass('aa-intel-highlight');
|
|
107
|
+
addHightlight('shipclass', $(row));
|
|
107
108
|
}).on('mouseleave', () => {
|
|
108
|
-
|
|
109
|
-
.removeClass('aa-intel-highlight');
|
|
109
|
+
removeHightlight('shipclass', $(row));
|
|
110
110
|
});
|
|
111
111
|
|
|
112
112
|
// Sticky
|
|
113
|
-
$(row).on('click', () => {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}).on('click', '.aa-intel-information-link', (e) => {
|
|
117
|
-
|
|
118
|
-
});
|
|
113
|
+
// $(row).on('click', () => {
|
|
114
|
+
// $(`tr[data-highlight="shiptype-${data['type_name_sanitised']}"]`)
|
|
115
|
+
// .toggleClass('aa-intel-highlight-sticky');
|
|
116
|
+
// }).on('click', '.aa-intel-information-link', (e) => {
|
|
117
|
+
// e.stopPropagation();
|
|
118
|
+
// });
|
|
119
119
|
}
|
|
120
120
|
});
|
|
121
121
|
|
|
@@ -178,24 +178,24 @@ jQuery(document).ready(($) => {
|
|
|
178
178
|
|
|
179
179
|
elementDscanCountOngrid.html(newTotal);
|
|
180
180
|
|
|
181
|
-
$(row)
|
|
181
|
+
$(row)
|
|
182
|
+
.attr('data-shipclass-id', data['id'])
|
|
183
|
+
.attr('data-shiptype-id', data['type_id']);
|
|
182
184
|
|
|
183
185
|
// Highlight
|
|
184
186
|
$(row).on('mouseenter', () => {
|
|
185
|
-
|
|
186
|
-
.addClass('aa-intel-highlight');
|
|
187
|
+
addHightlight('shipclass', $(row));
|
|
187
188
|
}).on('mouseleave', () => {
|
|
188
|
-
|
|
189
|
-
.removeClass('aa-intel-highlight');
|
|
189
|
+
removeHightlight('shipclass', $(row));
|
|
190
190
|
});
|
|
191
191
|
|
|
192
192
|
// Sticky
|
|
193
|
-
$(row).on('click', () => {
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
}).on('click', '.aa-intel-information-link', (e) => {
|
|
197
|
-
|
|
198
|
-
});
|
|
193
|
+
// $(row).on('click', () => {
|
|
194
|
+
// $(`tr[data-highlight="shiptype-${data['type_name_sanitised']}"]`)
|
|
195
|
+
// .toggleClass('aa-intel-highlight-sticky');
|
|
196
|
+
// }).on('click', '.aa-intel-information-link', (e) => {
|
|
197
|
+
// e.stopPropagation();
|
|
198
|
+
// });
|
|
199
199
|
}
|
|
200
200
|
});
|
|
201
201
|
|
|
@@ -258,24 +258,24 @@ jQuery(document).ready(($) => {
|
|
|
258
258
|
|
|
259
259
|
elementDscanCountOffgrid.html(newTotal);
|
|
260
260
|
|
|
261
|
-
$(row)
|
|
261
|
+
$(row)
|
|
262
|
+
.attr('data-shipclass-id', data['id'])
|
|
263
|
+
.attr('data-shiptype-id', data['type_id']);
|
|
262
264
|
|
|
263
265
|
// Highlight
|
|
264
266
|
$(row).on('mouseenter', () => {
|
|
265
|
-
|
|
266
|
-
.addClass('aa-intel-highlight');
|
|
267
|
+
addHightlight('shipclass', $(row));
|
|
267
268
|
}).on('mouseleave', () => {
|
|
268
|
-
|
|
269
|
-
.removeClass('aa-intel-highlight');
|
|
269
|
+
removeHightlight('shipclass', $(row));
|
|
270
270
|
});
|
|
271
271
|
|
|
272
272
|
// Sticky
|
|
273
|
-
$(row).on('click', () => {
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
}).on('click', '.aa-intel-information-link', (e) => {
|
|
277
|
-
|
|
278
|
-
});
|
|
273
|
+
// $(row).on('click', () => {
|
|
274
|
+
// $(`tr[data-highlight="shiptype-${data['type_name_sanitised']}"]`)
|
|
275
|
+
// .toggleClass('aa-intel-highlight-sticky');
|
|
276
|
+
// }).on('click', '.aa-intel-information-link', (e) => {
|
|
277
|
+
// e.stopPropagation();
|
|
278
|
+
// });
|
|
279
279
|
}
|
|
280
280
|
});
|
|
281
281
|
|
|
@@ -317,24 +317,22 @@ jQuery(document).ready(($) => {
|
|
|
317
317
|
}
|
|
318
318
|
],
|
|
319
319
|
createdRow: (row, data) => {
|
|
320
|
-
$(row).attr('data-
|
|
320
|
+
$(row).attr('data-shiptype-id', data['id']);
|
|
321
321
|
|
|
322
322
|
// Highlight
|
|
323
323
|
$(row).on('mouseenter', () => {
|
|
324
|
-
|
|
325
|
-
.addClass('aa-intel-highlight');
|
|
324
|
+
addHightlight('shiptype', $(row));
|
|
326
325
|
}).on('mouseleave', () => {
|
|
327
|
-
|
|
328
|
-
.removeClass('aa-intel-highlight');
|
|
326
|
+
removeHightlight('shiptype', $(row));
|
|
329
327
|
});
|
|
330
328
|
|
|
331
329
|
// Sticky
|
|
332
|
-
$(row).on('click', () => {
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
}).on('click', '.aa-intel-information-link', (e) => {
|
|
336
|
-
|
|
337
|
-
});
|
|
330
|
+
// $(row).on('click', () => {
|
|
331
|
+
// $(`tr[data-highlight="shiptype-${data['name_sanitised']}"]`)
|
|
332
|
+
// .toggleClass('aa-intel-highlight-sticky');
|
|
333
|
+
// }).on('click', '.aa-intel-information-link', (e) => {
|
|
334
|
+
// e.stopPropagation();
|
|
335
|
+
// });
|
|
338
336
|
}
|
|
339
337
|
});
|
|
340
338
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
jQuery(document).ready($=>{"use strict";const elementShipClassesAllTable=$("table.aa-intel-dscan-ship-classes-all-list");const elementDscanCountAll=$("span#aa-intel-dscan-all-count");const elementShipClassesOngridTable=$("table.aa-intel-dscan-ship-classes-ongrid-list");const elementDscanCountOngrid=$("span#aa-intel-dscan-ongrid-count");const elementShipClassesOffgridTable=$("table.aa-intel-dscan-ship-classes-offgrid-list");const elementDscanCountOffgrid=$("span#aa-intel-dscan-offgrid-count");const elementShipTypesTable=$("table.aa-intel-dscan-ship-types-list");const ShipInfoPanel=shipData=>{let html_logo=""+'<span class="aa-intel-ship-image-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+shipData["id"]+'" '+' src="'+shipData["image"]+'" '+' alt="'+shipData["name"]+'" '+' title="'+shipData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-ship-information-wrapper">\n'+' <span class="aa-intel-ship-name-wrapper">\n'+" "+shipData["name"]+"\n"+" </span>\n"+"</span>\n";return html_logo+html_info};elementShipClassesAllTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getShipClassesAll,dataSrc:"",cache:true},columns:[{data:data=>{return ShipInfoPanel(data)}},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementDscanCountAll.html();const newTotal=parseInt(currentTotal)+data["count"];elementDscanCountAll.html(newTotal);$(row).attr("data-
|
|
1
|
+
jQuery(document).ready($=>{"use strict";const elementShipClassesAllTable=$("table.aa-intel-dscan-ship-classes-all-list");const elementDscanCountAll=$("span#aa-intel-dscan-all-count");const elementShipClassesOngridTable=$("table.aa-intel-dscan-ship-classes-ongrid-list");const elementDscanCountOngrid=$("span#aa-intel-dscan-ongrid-count");const elementShipClassesOffgridTable=$("table.aa-intel-dscan-ship-classes-offgrid-list");const elementDscanCountOffgrid=$("span#aa-intel-dscan-offgrid-count");const elementShipTypesTable=$("table.aa-intel-dscan-ship-types-list");const ShipInfoPanel=shipData=>{let html_logo=""+'<span class="aa-intel-ship-image-wrapper">\n'+" <img "+' class="eve-image" '+' data-eveid="'+shipData["id"]+'" '+' src="'+shipData["image"]+'" '+' alt="'+shipData["name"]+'" '+' title="'+shipData["name"]+'" '+' width="32" '+' height="32">\n'+"</span>";let html_info=""+'<span class="aa-intel-ship-information-wrapper">\n'+' <span class="aa-intel-ship-name-wrapper">\n'+" "+shipData["name"]+"\n"+" </span>\n"+"</span>\n";return html_logo+html_info};elementShipClassesAllTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getShipClassesAll,dataSrc:"",cache:true},columns:[{data:data=>{return ShipInfoPanel(data)}},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementDscanCountAll.html();const newTotal=parseInt(currentTotal)+data["count"];elementDscanCountAll.html(newTotal);$(row).attr("data-shipclass-id",data["id"]).attr("data-shiptype-id",data["type_id"]);$(row).on("mouseenter",()=>{addHightlight("shipclass",$(row))}).on("mouseleave",()=>{removeHightlight("shipclass",$(row))})}});elementShipClassesOngridTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getShipClassesOngrid,dataSrc:"",cache:true},columns:[{data:data=>{return ShipInfoPanel(data)}},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementDscanCountOngrid.html();const newTotal=parseInt(currentTotal)+data["count"];elementDscanCountOngrid.html(newTotal);$(row).attr("data-shipclass-id",data["id"]).attr("data-shiptype-id",data["type_id"]);$(row).on("mouseenter",()=>{addHightlight("shipclass",$(row))}).on("mouseleave",()=>{removeHightlight("shipclass",$(row))})}});elementShipClassesOffgridTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getShipClassesOffgrid,dataSrc:"",cache:true},columns:[{data:data=>{return ShipInfoPanel(data)}},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:td=>{$(td).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}},{targets:2,visible:false}],createdRow:(row,data)=>{const currentTotal=elementDscanCountOffgrid.html();const newTotal=parseInt(currentTotal)+data["count"];elementDscanCountOffgrid.html(newTotal);$(row).attr("data-shipclass-id",data["id"]).attr("data-shiptype-id",data["type_id"]);$(row).on("mouseenter",()=>{addHightlight("shipclass",$(row))}).on("mouseleave",()=>{removeHightlight("shipclass",$(row))})}});elementShipTypesTable.DataTable({paging:false,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:false,dom:"<'row'<'col-sm-12'f>>"+"<'row'<'col-sm-12'tr>>"+"<'row'<'col-sm-12'i>>",ajax:{url:aaIntelToolJsOptions.ajax.getShipTypes,dataSrc:"",cache:true},columns:[{data:"name"},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:td=>{$(td).addClass("text-right")}}],createdRow:(row,data)=>{$(row).attr("data-shiptype-id",data["id"]);$(row).on("mouseenter",()=>{addHightlight("shiptype",$(row))}).on("mouseleave",()=>{removeHightlight("shiptype",$(row))})}})});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{% load inteltool_versioned_static %}
|
|
2
2
|
|
|
3
3
|
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-clipboard.min.js" %}"></script>
|
|
4
|
-
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-highlight.min.js" %}"></script>
|
|
4
|
+
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js" %}"></script>
|
|
5
5
|
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-chatscan.min.js" %}"></script>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{% load inteltool_versioned_static %}
|
|
2
2
|
|
|
3
3
|
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-clipboard.min.js" %}"></script>
|
|
4
|
-
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-highlight.min.js" %}"></script>
|
|
4
|
+
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js" %}"></script>
|
|
5
5
|
<script src="{% aa_intel_tool_static "aa_intel_tool/javascript/aa-intel-tool-dscan.min.js" %}"></script>
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
2464 Hornet I* Hornet I* -
|
|
2
|
+
2464 Hornet I* Hornet I* -
|
|
3
|
+
2464 Hornet I* Hornet I* -
|
|
4
|
+
2464 Hornet I* Hornet I* -
|
|
5
|
+
2464 Hornet I* Hornet I* -
|
|
6
|
+
16238 ɮ Legolas Cormorant* -
|
|
7
|
+
32880 [Welcome] Mining Venture* 52 km
|
|
8
|
+
28606 ɮ Bender Orca* 31 km
|
|
9
|
+
14 Samanuni V - Moon 1* Moon* 6,9 AE
|
|
10
|
+
14 Samanuni V - Moon 2* Moon* 6,9 AE
|
|
11
|
+
14 Samanuni V - Moon 3* Moon* 6,9 AE
|
|
12
|
+
14 Samanuni V - Moon 4* Moon* 6,9 AE
|
|
13
|
+
14 Samanuni V - Moon 5* Moon* 6,9 AE
|
|
14
|
+
14 Samanuni V - Moon 6* Moon* 6,9 AE
|
|
15
|
+
14 Samanuni V - Moon 7* Moon* 6,9 AE
|
|
16
|
+
14 Samanuni V - Moon 8* Moon* 6,9 AE
|
|
17
|
+
14 Samanuni V - Moon 9* Moon* 6,9 AE
|
|
18
|
+
14 Samanuni VI - Moon 1* Moon* 359.038 km
|
|
19
|
+
14 Samanuni VI - Moon 2* Moon* 942.330 km
|
|
20
|
+
14 Samanuni VII - Moon 1* Moon* 2,4 AE
|
|
21
|
+
14 Samanuni VII - Moon 2* Moon* 2,4 AE
|
|
22
|
+
14 Samanuni VII - Moon 3* Moon* 2,4 AE
|
|
23
|
+
14 Samanuni VIII - Moon 1* Moon* 12,0 AE
|
|
24
|
+
14 Samanuni VIII - Moon 2* Moon* 12,0 AE
|
|
25
|
+
14 Samanuni IX - Moon 1* Moon* 9,4 AE
|
|
26
|
+
14 Samanuni IX - Moon 2* Moon* 9,4 AE
|
|
27
|
+
14 Samanuni IX - Moon 3* Moon* 9,4 AE
|
|
28
|
+
2233 Customs Office (Samanuni IV) Customs Office* 5,8 AE
|
|
29
|
+
2233 Customs Office (Samanuni I) Customs Office* 4,7 AE
|
|
30
|
+
2233 Customs Office (Samanuni II) Customs Office* 4,9 AE
|
|
31
|
+
2233 Customs Office (Samanuni IX) Customs Office* 9,4 AE
|
|
32
|
+
2233 Customs Office (Samanuni VIII) Customs Office* 12,0 AE
|
|
33
|
+
2233 Customs Office (Samanuni III) Customs Office* 5,2 AE
|
|
34
|
+
2233 Customs Office (Samanuni X) Customs Office* 9,5 AE
|
|
35
|
+
2233 Customs Office (Samanuni V) Customs Office* 6,9 AE
|
|
36
|
+
2233 Customs Office (Samanuni VI) Customs Office* 8.747 km
|
|
37
|
+
2233 Customs Office (Samanuni VII) Customs Office* 2,4 AE
|
|
38
|
+
2016 Samanuni I* Planet (Barren)* 4,7 AE
|
|
39
|
+
2016 Samanuni II* Planet (Barren)* 4,9 AE
|
|
40
|
+
2016 Samanuni III* Planet (Barren)* 5,2 AE
|
|
41
|
+
2015 Samanuni IV* Planet (Lava)* 5,8 AE
|
|
42
|
+
13 Samanuni V* Planet (Gas)* 6,9 AE
|
|
43
|
+
11 Samanuni VI* Planet (Temperate)* 5.642 km
|
|
44
|
+
13 Samanuni VII* Planet (Gas)* 2,4 AE
|
|
45
|
+
2014 Samanuni VIII* Planet (Oceanic)* 12,0 AE
|
|
46
|
+
11 Samanuni IX* Planet (Temperate)* 9,4 AE
|
|
47
|
+
2014 Samanuni X* Planet (Oceanic)* 9,5 AE
|
|
48
|
+
4024 Samanuni III - Wiyrkomi Corporation Fabrik* Caldari Food Processing Plant Station* 5,2 AE
|
|
49
|
+
1530 Samanuni VIII - Caldari Constructions Logistische Unterstützung* Caldari Research Station* 12,0 AE
|
|
50
|
+
1529 Samanuni VI - Caldari Navy Ankerpunkt* Caldari Administrative Station* 0 m
|
|
51
|
+
45039 Samanuni - Star* Sun M0 (Orange radiant)* 4,7 AE
|
|
52
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
53
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
54
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
55
|
+
26573 Pithi Destructor*-Wrack* Guristas Small Wreck* -
|
|
56
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
57
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
58
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
59
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
60
|
+
26573 Pithi Wrecker*-Wrack* Guristas Small Wreck* -
|
|
61
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
62
|
+
26573 Pithi Plunderer*-Wrack* Guristas Small Wreck* -
|
|
63
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
64
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
65
|
+
26573 Pithi Wrecker*-Wrack* Guristas Small Wreck* -
|
|
66
|
+
26591 Hunter Alvi*-Wrack* Rogue Small Wreck* -
|
|
67
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
68
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
69
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
70
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
71
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
72
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
73
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
74
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
75
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
76
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
77
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
78
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
79
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
80
|
+
26573 Pithi Plunderer*-Wrack* Guristas Small Wreck* -
|
|
81
|
+
26573 Pithi Wrecker*-Wrack* Guristas Small Wreck* -
|
|
82
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
83
|
+
26573 Pithior Nihilist*-Wrack* Guristas Small Wreck* -
|
|
84
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
85
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
86
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
87
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
88
|
+
26573 Pithi Plunderer*-Wrack* Guristas Small Wreck* -
|
|
89
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
90
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
91
|
+
26591 Hunter Alvi*-Wrack* Rogue Small Wreck* -
|
|
92
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
93
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
94
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
95
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
96
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
97
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
98
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
99
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
100
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
101
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
102
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
103
|
+
26573 Pithior Anarchist*-Wrack* Guristas Small Wreck* -
|
|
104
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
105
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
106
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
107
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
108
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
109
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
110
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
111
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
112
|
+
26573 Pithior Nihilist*-Wrack* Guristas Small Wreck* -
|
|
113
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
114
|
+
26573 Pithior Nihilist*-Wrack* Guristas Small Wreck* -
|
|
115
|
+
26573 Pithior Guerilla*-Wrack* Guristas Small Wreck* -
|
|
116
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
117
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
118
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
119
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
120
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
121
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
122
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
123
|
+
26933 Mercenary Overlord*-Wrack* Mission Generic Large Wreck* -
|
|
124
|
+
26933 Wrack von: Shadow * Mission Generic Large Wreck* -
|
|
125
|
+
26935 Mercenary Wingman*-Wrack* Mission Generic Small Wreck* -
|
|
126
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
127
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
128
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
129
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
130
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
131
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
132
|
+
26591 Hunter Alvi*-Wrack* Rogue Small Wreck* -
|
|
133
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
134
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
135
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
136
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
137
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
138
|
+
26573 Guristas Arrogator*-Wrack* Guristas Small Wreck* -
|
|
139
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
140
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
141
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
142
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
143
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
144
|
+
26573 Pithi Demolisher*-Wrack* Guristas Small Wreck* -
|
|
145
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
146
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
147
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
148
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
149
|
+
26573 Guristas Imputor*-Wrack* Guristas Small Wreck* -
|
|
150
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
151
|
+
26573 Guristas Imputor*-Wrack* Guristas Small Wreck* -
|
|
152
|
+
26573 Guristas Saboteur*-Wrack* Guristas Small Wreck* -
|
|
153
|
+
26573 Pithior Renegade*-Wrack* Guristas Small Wreck* -
|
|
154
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
155
|
+
26591 Hunter Alvi*-Wrack* Rogue Small Wreck* -
|
|
156
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
157
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
158
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
159
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
160
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
161
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
162
|
+
26573 Guristas Invader*-Wrack* Guristas Small Wreck* -
|
|
163
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
164
|
+
26573 Pithi Saboteur*-Wrack* Guristas Small Wreck* -
|
|
165
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
166
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
167
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
168
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
169
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
170
|
+
26573 Pithi Arrogator*-Wrack* Guristas Small Wreck* -
|
|
171
|
+
26573 Pithi Imputor*-Wrack* Guristas Small Wreck* -
|
|
172
|
+
26573 Pithi Plunderer*-Wrack* Guristas Small Wreck* -
|
|
173
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
174
|
+
26573 Pithi Invader*-Wrack* Guristas Small Wreck* -
|
|
175
|
+
26573 Pithi Infiltrator*-Wrack* Guristas Small Wreck* -
|
|
176
|
+
26573 Pithi Despoiler*-Wrack* Guristas Small Wreck* -
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
35835 UC3H-Y - Harvester 1 Athanor* 444 141 км
|
|
2
|
+
35827 UC3H-Y - Factory 56 Sotiyo* 4 236 км
|
|
3
|
+
670 ledu derhauer's Capsule Capsule* 1 943 км
|
|
4
|
+
11963 cyno up Rapier* 1 903 км
|
|
5
|
+
11129 ttjzj Gallente Shuttle* 1 898 км
|
|
6
|
+
16 RD-G2R* Stargate (Caldari System)* 1 799 км
|
|
7
|
+
35841 UC3H-Y » U-INPD - Way to the Light Ansiblex Jump Gate* 1 042 км
|
|
8
|
+
35840 UC3H-Y - The Bacon is Lit Pharolux Cyno Beacon* 594 км
|
|
9
|
+
28665 Vargur I Vargur* -
|
|
10
|
+
35833 UC3H-Y - Restart Fortizar* 2,4 а.е.
|
|
11
|
+
35836 UC3H-Y - Refinery Tatara* 2,4 а.е.
|
|
12
|
+
35835 UC3H-Y - Wasser Athanor* 2,4 а.е.
|
|
13
|
+
11963 cyno up Rapier* -
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
1529 Perimeter II - Moon 1 - Caldari Navy Assembly Plant Caldari Administrative Station 14.0 AU
|
|
8
8
|
4023 Perimeter VII - Poksu Mineral Group Mineral Reserve Caldari Mining Station 12.1 AU
|
|
9
9
|
35833 Perimeter - Tranquility Trading Tower Fortizar 3,808 km
|
|
10
|
-
35833 Perimeter - TEST War Headquarters Fortizar
|
|
10
|
+
35833 Perimeter - TEST War Headquarters Fortizar 50,209 km
|
|
11
11
|
12236 Gallente Control Tower Gallente Control Tower -
|
|
12
12
|
20064 P7 M2 Blocker Gallente Control Tower Small -
|
|
13
13
|
20064 P7 M1 Blocker Gallente Control Tower Small -
|
|
@@ -72,3 +72,30 @@ class TestAppSettings(TestCase):
|
|
|
72
72
|
expected_max_pilots = 1000
|
|
73
73
|
|
|
74
74
|
self.assertEqual(first=max_pilots, second=expected_max_pilots)
|
|
75
|
+
|
|
76
|
+
def test_dscan_grid_size(self):
|
|
77
|
+
"""
|
|
78
|
+
Test for the default INTELTOOL_DSCAN_GRID_SIZE
|
|
79
|
+
|
|
80
|
+
:return:
|
|
81
|
+
:rtype:
|
|
82
|
+
"""
|
|
83
|
+
|
|
84
|
+
grid_size = AppSettings.INTELTOOL_DSCAN_GRID_SIZE
|
|
85
|
+
expected_grid_size = 10000
|
|
86
|
+
|
|
87
|
+
self.assertEqual(first=grid_size, second=expected_grid_size)
|
|
88
|
+
|
|
89
|
+
@mock.patch(SETTINGS_PATH + ".AppSettings.INTELTOOL_DSCAN_GRID_SIZE", 1000)
|
|
90
|
+
def test_dscan_grid_size_custom(self):
|
|
91
|
+
"""
|
|
92
|
+
Test for a custom INTELTOOL_DSCAN_GRID_SIZE
|
|
93
|
+
|
|
94
|
+
:return:
|
|
95
|
+
:rtype:
|
|
96
|
+
"""
|
|
97
|
+
|
|
98
|
+
grid_size = AppSettings.INTELTOOL_DSCAN_GRID_SIZE
|
|
99
|
+
expected_grid_size = 1000
|
|
100
|
+
|
|
101
|
+
self.assertEqual(first=grid_size, second=expected_grid_size)
|
|
@@ -8,9 +8,8 @@ from django.test import TestCase
|
|
|
8
8
|
# AA Intel Tool
|
|
9
9
|
from aa_intel_tool.exceptions import ParserError
|
|
10
10
|
from aa_intel_tool.parser.general import check_intel_type, parse_intel
|
|
11
|
-
from aa_intel_tool.tests.utils import (
|
|
11
|
+
from aa_intel_tool.tests.utils import ( # load_chatscan_txt,
|
|
12
12
|
load_chatscan_faulty_txt,
|
|
13
|
-
load_chatscan_txt,
|
|
14
13
|
load_dscan_txt,
|
|
15
14
|
load_fleetcomp_txt,
|
|
16
15
|
)
|
|
@@ -37,21 +36,21 @@ class TestParserGeneral(TestCase):
|
|
|
37
36
|
|
|
38
37
|
self.assertEqual(first=intel_type, second=expected_intel_type)
|
|
39
38
|
|
|
40
|
-
def test_check_intel_type_chatlist(self):
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
39
|
+
# def test_check_intel_type_chatlist(self):
|
|
40
|
+
# """
|
|
41
|
+
# Test should return 'chatlist' as the expected intel type
|
|
42
|
+
#
|
|
43
|
+
# :return:
|
|
44
|
+
# :rtype:
|
|
45
|
+
# """
|
|
46
|
+
#
|
|
47
|
+
# form_data = load_chatscan_txt()
|
|
48
|
+
# scan_data = str(form_data).splitlines()
|
|
49
|
+
#
|
|
50
|
+
# intel_type = check_intel_type(scan_data=scan_data)
|
|
51
|
+
# expected_intel_type = "chatlist"
|
|
52
|
+
#
|
|
53
|
+
# self.assertEqual(first=intel_type, second=expected_intel_type)
|
|
55
54
|
|
|
56
55
|
def test_check_intel_type_fleetcomp(self):
|
|
57
56
|
"""
|