aa-intel-tool 2.0.0b1__py3-none-any.whl → 2.1.1__py3-none-any.whl

aa_intel_tool/parser/module/dscan.py

@@ -104,6 +104,15 @@ def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
 
     ships = {"all": {}, "ongrid": {}, "offgrid": {}, "types": {}}
 
+    # Ship types
+    # Get all ship types
+    #
+    # Ship type list:
+    #   - eve_type[0] = ID
+    #   - eve_type[1] = Name
+    #   - eve_type[2] = Group ID
+    #   - eve_type[3] = Group Name
+    #   - eve_type[4] = Mass
     eve_types_ships = eve_types.filter(
         eve_group__eve_category_id__exact=EveCategoryId.SHIP
     )
@@ -115,18 +124,27 @@ def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
             if eve_type[1] not in ships["all"]:
                 ships["all"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
                 ships["all"][eve_type[1]]["count"] = counter["all"][eve_type[0]]
+                ships["all"][eve_type[1]]["mass"] = (
+                    eve_type[4] * counter["all"][eve_type[0]]
+                )
 
         # Info for "On Grid" table
         if eve_type[0] in counter["ongrid"]:
             if eve_type[1] not in ships["ongrid"]:
                 ships["ongrid"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
                 ships["ongrid"][eve_type[1]]["count"] = counter["ongrid"][eve_type[0]]
+                ships["ongrid"][eve_type[1]]["mass"] = (
+                    eve_type[4] * counter["ongrid"][eve_type[0]]
+                )
 
         # Info for "Off Grid" table
         if eve_type[0] in counter["offgrid"]:
             if eve_type[1] not in ships["offgrid"]:
                 ships["offgrid"][eve_type[1]] = _get_type_info_dict(eve_type=eve_type)
                 ships["offgrid"][eve_type[1]]["count"] = counter["offgrid"][eve_type[0]]
+                ships["offgrid"][eve_type[1]]["mass"] = (
+                    eve_type[4] * counter["offgrid"][eve_type[0]]
+                )
 
         # Info for "Ship Types" table
         if eve_type[3] not in ships["types"]:
@@ -268,32 +286,44 @@ def _get_scan_details(scan_data: list) -> tuple:
     :rtype:
     """
 
+    # AA Intel Tool
+    from aa_intel_tool.constants import (  # pylint: disable=import-outside-toplevel
+        REGEX_PATTERN,
+    )
+
     ansiblex_destination = None
     counter = {"all": {}, "ongrid": {}, "offgrid": {}, "type": {}}
     eve_ids = {"all": [], "ongrid": [], "offgrid": []}
 
     # Let's split this list up
     #
-    # line[0] => Item ID
-    # line[1] => Name
-    # line[2] => Ship Class / Structure Type
-    # line[3] => Distance
+    # line.group(1) => Item ID
+    # line.group(2) => Name
+    # line.group(3) => Ship Class / Structure Type
+    # line.group(4) => Distance
     #
     # Loop through all lines
     for entry in scan_data:
-        line = re.split(pattern=r"\t+", string=entry.rstrip("\t"))
-        entry_id = int(line[0])
+        # Apparently you can copy/paste a tab into the ship name, which will cause the split by tab to fail.
+        # The regex is detecting the D-Scan correctly though. But splitting by tab might put the ship class as distance.
+        # See https://github.com/ppfeufer/aa-intel-tool/issues/82
+        #
+        # This is why we use re.search() to get the parts of the D-Scan entry, instead of re-split()
+        #
+        # Thanks CCP for sanitizing your inputs! 😂
+        line = re.search(pattern=REGEX_PATTERN["dscan"], string=entry)
+        entry_id = int(line.group(1))
 
         counter["all"][entry_id] = counter["all"].get(entry_id, 0) + 1
 
         # Check if the entry is "on grid" or not
-        if _is_on_grid(line[3]):
+        if _is_on_grid(line.group(4)):
             counter["ongrid"][entry_id] = counter["ongrid"].get(entry_id, 0) + 1
 
             # If it is an Ansiblex Jump Gate, get its destination system
             if entry_id == UpwellStructureId.ANSIBLEX_JUMP_GATE:
                 ansiblex_destination = _get_ansiblex_jumpgate_destination(
-                    ansiblex_name=line[1]
+                    ansiblex_name=line.group(2)
                 )
 
             eve_ids["ongrid"].append(entry_id)
@@ -330,7 +360,9 @@ def parse(scan_data: list) -> Scan:
 
         eve_types = EveType.objects.bulk_get_or_create_esi(
             ids=set(eve_ids["all"]), include_children=True
-        ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
+        ).values_list(
+            "id", "name", "eve_group__id", "eve_group__name", "mass", named=True
+        )
 
         # Parse the data parts
         ships = _get_ships(eve_types=eve_types, counter=counter)

aa_intel_tool/parser/module/fleetcomp.py

@@ -49,7 +49,7 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
     # Get ship class details
     ship_class_details = EveType.objects.bulk_get_or_create_esi(
         ids=set(ship_class_ids), include_children=True
-    ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
+    ).values_list("id", "name", "eve_group__id", "eve_group__name", "mass", named=True)
 
     # Loop through ship classes
     for ship_class in ship_class_details:
@@ -61,6 +61,9 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
         ships["class"][ship_class.name]["image"] = eveimageserver.type_icon_url(
             type_id=ship_class.id, size=32
         )
+        ships["class"][ship_class.name]["mass"] = (
+            ship_class.mass * ships["class"][ship_class.name]["count"]
+        )
 
         # Build ship type dict
         ships["type"][ship_class.eve_group__name]["id"] = ship_class.eve_group__id

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.js

@@ -5,10 +5,13 @@ $(() => {
 
     const elementShipClassesAllTable = $('table.aa-intel-dscan-ship-classes-all-list');
     const elementDscanCountAll = $('span#aa-intel-dscan-all-count');
+    const elementDscanMassAll = $('span#aa-intel-dscan-all-mass');
     const elementShipClassesOngridTable = $('table.aa-intel-dscan-ship-classes-ongrid-list');
     const elementDscanCountOngrid = $('span#aa-intel-dscan-ongrid-count');
+    const elementDscanMassOnGrid = $('span#aa-intel-dscan-ongrid-mass');
     const elementShipClassesOffgridTable = $('table.aa-intel-dscan-ship-classes-offgrid-list');
     const elementDscanCountOffgrid = $('span#aa-intel-dscan-offgrid-count');
+    const elementDscanMassOffGrid = $('span#aa-intel-dscan-offgrid-mass');
     const elementShipTypesTable = $('table.aa-intel-dscan-ship-types-list');
     const elementUpwellStructuresTable = $('table.aa-intel-dscan-upwell-structures-list');
     const elementDscanCountUpwellStructures = $('span#aa-intel-dscan-upwell-structures-count');
@@ -81,6 +84,16 @@ $(() => {
 
                         elementDscanCountAll.html(newTotal);
 
+                        const currentMass = elementDscanMassAll.data('mass') || 0;
+                        const newMass = parseInt(currentMass) + data.mass;
+
+                        elementDscanMassAll.data('mass', newMass);
+                        elementDscanMassAll.html(
+                            new Intl.NumberFormat(
+                                aaIntelToolJsL10n.language
+                            ).format(newMass)
+                        );
+
                         $(row)
                             .attr('data-shipclass-id', data.id)
                             .attr('data-shiptype-id', data.type_id);
@@ -172,6 +185,16 @@ $(() => {
 
                         elementDscanCountOngrid.html(newTotal);
 
+                        const currentMass = elementDscanMassOnGrid.data('mass') || 0;
+                        const newMass = parseInt(currentMass) + data.mass;
+
+                        elementDscanMassOnGrid.data('mass', newMass);
+                        elementDscanMassOnGrid.html(
+                            new Intl.NumberFormat(
+                                aaIntelToolJsL10n.language
+                            ).format(newMass)
+                        );
+
                         $(row)
                             .attr('data-shipclass-id', data.id)
                             .attr('data-shiptype-id', data.type_id);
@@ -263,6 +286,16 @@ $(() => {
 
                         elementDscanCountOffgrid.html(newTotal);
 
+                        const currentMass = elementDscanMassOffGrid.data('mass') || 0;
+                        const newMass = parseInt(currentMass) + data.mass;
+
+                        elementDscanMassOffGrid.data('mass', newMass);
+                        elementDscanMassOffGrid.html(
+                            new Intl.NumberFormat(
+                                aaIntelToolJsL10n.language
+                            ).format(newMass)
+                        );
+
                         $(row)
                             .attr('data-shipclass-id', data.id)
                             .attr('data-shiptype-id', data.type_id);

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js

@@ -1,2 +1,2 @@
-$(()=>{"use strict";const e=$("table.aa-intel-dscan-ship-classes-all-list"),l=$("span#aa-intel-dscan-all-count"),t=$("table.aa-intel-dscan-ship-classes-ongrid-list"),n=$("span#aa-intel-dscan-ongrid-count"),s=$("table.aa-intel-dscan-ship-classes-offgrid-list"),i=$("span#aa-intel-dscan-offgrid-count"),o=$("table.aa-intel-dscan-ship-types-list"),d=$("table.aa-intel-dscan-upwell-structures-list"),r=$("span#aa-intel-dscan-upwell-structures-count"),c=$("table.aa-intel-dscan-deployables-list"),h=$("span#aa-intel-dscan-deployables-count"),g=$("table.aa-intel-dscan-starbases-list"),p=$("span#aa-intel-dscan-starbases-count");fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesAll).then(a=>{a&&($("div.aa-intel-loading-table-info-all").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-all").removeClass("d-none"):($("div.table-dscan-ship-classes-all").removeClass("d-none"),e.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=l.html(),s=parseInt(e)+a.count;l.html(s),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesOngrid).then(a=>{a&&($("div.aa-intel-loading-table-info-ongrid").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ongrid").removeClass("d-none"):($("div.table-dscan-ship-classes-ongrid").removeClass("d-none"),t.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=n.html(),s=parseInt(e)+a.count;n.html(s),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesOffgrid).then(a=>{a&&($("div.aa-intel-loading-table-info-offgrid").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-offgrid").removeClass("d-none"):($("div.table-dscan-ship-classes-offgrid").removeClass("d-none"),s.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=i.html(),s=parseInt(e)+a.count;i.html(s),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipTypes).then(a=>{a&&($("div.aa-intel-loading-table-info-ship-types").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ship-types").removeClass("d-none"):($("div.table-dscan-ship-types").removeClass("d-none"),o.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:"name"},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(t,a)=>{$(t).attr("data-shiptype-id",a.id),$(t).mouseenter(()=>{addDscanHightlight("shiptype",$(t))}).mouseleave(()=>{removeDscanHightlight("shiptype",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shiptype",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getStructuresOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-upwell-structures").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-upwell-structures").removeClass("d-none"):($("div.col-aa-intel-upwell-structures").removeClass("d-none"),d.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=r.html(),s=parseInt(t)+e.count;r.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getDeployablesOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-deployables").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-deployables").removeClass("d-none"):($("div.col-aa-intel-deployables").removeClass("d-none"),c.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=h.html(),s=parseInt(t)+e.count;h.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getStarbasesOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-starbases").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-starbases").removeClass("d-none"):($("div.col-aa-intel-starbases").removeClass("d-none"),g.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=p.html(),s=parseInt(t)+e.count;p.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))})});
+$(()=>{"use strict";const e=$("table.aa-intel-dscan-ship-classes-all-list"),o=$("span#aa-intel-dscan-all-count"),i=$("span#aa-intel-dscan-all-mass"),t=$("table.aa-intel-dscan-ship-classes-ongrid-list"),d=$("span#aa-intel-dscan-ongrid-count"),r=$("span#aa-intel-dscan-ongrid-mass"),s=$("table.aa-intel-dscan-ship-classes-offgrid-list"),c=$("span#aa-intel-dscan-offgrid-count"),g=$("span#aa-intel-dscan-offgrid-mass"),l=$("table.aa-intel-dscan-ship-types-list"),n=$("table.aa-intel-dscan-upwell-structures-list"),h=$("span#aa-intel-dscan-upwell-structures-count"),m=$("table.aa-intel-dscan-deployables-list"),p=$("span#aa-intel-dscan-deployables-count"),u=$("table.aa-intel-dscan-starbases-list"),b=$("span#aa-intel-dscan-starbases-count");fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesAll).then(a=>{a&&($("div.aa-intel-loading-table-info-all").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-all").removeClass("d-none"):($("div.table-dscan-ship-classes-all").removeClass("d-none"),e.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=o.html(),s=parseInt(e)+a.count,l=(o.html(s),i.data("mass")||0),n=parseInt(l)+a.mass;i.data("mass",n),i.html(new Intl.NumberFormat(aaIntelToolJsL10n.language).format(n)),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesOngrid).then(a=>{a&&($("div.aa-intel-loading-table-info-ongrid").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ongrid").removeClass("d-none"):($("div.table-dscan-ship-classes-ongrid").removeClass("d-none"),t.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=d.html(),s=parseInt(e)+a.count,l=(d.html(s),r.data("mass")||0),n=parseInt(l)+a.mass;r.data("mass",n),r.html(new Intl.NumberFormat(aaIntelToolJsL10n.language).format(n)),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClassesOffgrid).then(a=>{a&&($("div.aa-intel-loading-table-info-offgrid").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-offgrid").removeClass("d-none"):($("div.table-dscan-ship-classes-offgrid").removeClass("d-none"),s.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(t,a)=>{const e=c.html(),s=parseInt(e)+a.count,l=(c.html(s),g.data("mass")||0),n=parseInt(l)+a.mass;g.data("mass",n),g.html(new Intl.NumberFormat(aaIntelToolJsL10n.language).format(n)),$(t).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(t).mouseenter(()=>{addDscanHightlight("shipclass",$(t))}).mouseleave(()=>{removeDscanHightlight("shipclass",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shipclass",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipTypes).then(a=>{a&&($("div.aa-intel-loading-table-info-ship-types").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ship-types").removeClass("d-none"):($("div.table-dscan-ship-types").removeClass("d-none"),l.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:"name"},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(t,a)=>{$(t).attr("data-shiptype-id",a.id),$(t).mouseenter(()=>{addDscanHightlight("shiptype",$(t))}).mouseleave(()=>{removeDscanHightlight("shiptype",$(t))}),$(t).click(a=>{const e=$(a.target);e.hasClass("aa-intel-information-link")?a.stopPropagation():changeDscanStickyHighlight("shiptype",$(t))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getStructuresOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-upwell-structures").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-upwell-structures").removeClass("d-none"):($("div.col-aa-intel-upwell-structures").removeClass("d-none"),n.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=h.html(),s=parseInt(t)+e.count;h.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getDeployablesOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-deployables").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-deployables").removeClass("d-none"):($("div.col-aa-intel-deployables").removeClass("d-none"),m.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=p.html(),s=parseInt(t)+e.count;p.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getStarbasesOnGrid).then(a=>{a&&($("div.aa-intel-loading-table-info-starbases").addClass("d-none"),$("div#aa-intel-dscan-row-interesting-on-grid").removeClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-starbases").removeClass("d-none"):($("div.col-aa-intel-starbases").removeClass("d-none"),u.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{const t=b.html(),s=parseInt(t)+e.count;b.html(s),$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{$(a).addClass("aa-intel-highlight")}).mouseleave(()=>{$(a).removeClass("aa-intel-highlight")})}})))})});
 //# sourceMappingURL=aa-intel-tool-dscan.min.js.map

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aa-intel-tool-dscan.js"],"names":["$","elementShipClassesAllTable","elementDscanCountAll","elementShipClassesOngridTable","elementDscanCountOngrid","elementShipClassesOffgridTable","elementDscanCountOffgrid","elementShipTypesTable","elementUpwellStructuresTable","elementDscanCountUpwellStructures","elementDeployablesTable","elementDscanCountDeployables","elementStarbasesTable","elementDscanCountStarbases","fetchAjaxData","aaIntelToolJsOptions","ajax","getShipClassesAll","then","tableData","addClass","Object","keys","length","removeClass","DataTable","data","paging","language","aaIntelToolJsL10n","dataTables","translation","lengthChange","dom","columns","shipInfoPanel","order","columnDefs","targets","createdCell","td","width","visible","createdRow","row","currentTotal","html","newTotal","parseInt","count","attr","id","type_id","mouseenter","addDscanHightlight","mouseleave","removeDscanHightlight","click","target","event","hasClass","stopPropagation","changeDscanStickyHighlight","getShipClassesOngrid","getShipClassesOffgrid","getShipTypes","getStructuresOnGrid","getDeployablesOnGrid","getStarbasesOnGrid"],"mappings":"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"}
+{"version":3,"sources":["aa-intel-tool-dscan.js"],"names":["$","elementShipClassesAllTable","elementDscanCountAll","elementDscanMassAll","elementShipClassesOngridTable","elementDscanCountOngrid","elementDscanMassOnGrid","elementShipClassesOffgridTable","elementDscanCountOffgrid","elementDscanMassOffGrid","elementShipTypesTable","elementUpwellStructuresTable","elementDscanCountUpwellStructures","elementDeployablesTable","elementDscanCountDeployables","elementStarbasesTable","elementDscanCountStarbases","fetchAjaxData","aaIntelToolJsOptions","ajax","getShipClassesAll","then","tableData","addClass","Object","keys","length","removeClass","DataTable","data","paging","language","aaIntelToolJsL10n","dataTables","translation","lengthChange","dom","columns","shipInfoPanel","order","columnDefs","targets","createdCell","td","width","visible","createdRow","row","currentTotal","html","newTotal","parseInt","count","currentMass","newMass","mass","Intl","NumberFormat","format","attr","id","type_id","mouseenter","addDscanHightlight","mouseleave","removeDscanHightlight","click","target","event","hasClass","stopPropagation","changeDscanStickyHighlight","getShipClassesOngrid","getShipClassesOffgrid","getShipTypes","getStructuresOnGrid","getDeployablesOnGrid","getStarbasesOnGrid"],"mappings":"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"}

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.js

@@ -4,6 +4,7 @@ $(() => {
     'use strict';
 
     const elementShipClassesTable = $('table.aa-intel-dscan-ship-classes-ship-classes-list');
+    const elementShipClassesMass = $('span#aa-intel-dscan-ship-classes-mass');
     const elementShipTypesTable = $('table.aa-intel-dscan-ship-types-list');
     const elementFleetcompositionTable = $('table.aa-intel-fleetcomp-pilot-ships-list');
     const elementPilotsCount = $('span#aa-intel-fleet-participation-count');
@@ -66,6 +67,16 @@ $(() => {
                         }
                     ],
                     createdRow: (row, data) => {
+                        const currentMass = elementShipClassesMass.data('mass') || 0;
+                        const newMass = parseInt(currentMass) + data.mass;
+
+                        elementShipClassesMass.data('mass', newMass);
+                        elementShipClassesMass.html(
+                            new Intl.NumberFormat(
+                                aaIntelToolJsL10n.language
+                            ).format(newMass)
+                        );
+
                         $(row)
                             .attr('data-shipclass-id', data.id)
                             .attr('data-shiptype-id', data.type_id);

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js

@@ -1,2 +1,2 @@
-$(()=>{"use strict";const a=$("table.aa-intel-dscan-ship-classes-ship-classes-list"),t=$("table.aa-intel-dscan-ship-types-list"),s=$("table.aa-intel-fleetcomp-pilot-ships-list"),l=$("span#aa-intel-fleet-participation-count");fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClasses).then(e=>{e&&($("div.aa-intel-loading-table-info-ship-classes").addClass("d-none"),0===Object.keys(e).length?$("div.aa-intel-empty-table-info-ship-classes").removeClass("d-none"):($("div.table-dscan-ship-classes-ship-classes").removeClass("d-none"),a.DataTable({data:e,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:e=>shipInfoPanel(e)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:e=>{$(e).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:e=>{$(e).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(e,a)=>{$(e).attr("data-shipclass-id",a.id).attr("data-shiptype-id",a.type_id),$(e).mouseenter(()=>{addFleetcompositionHightlight("shipclass",$(e))}).mouseleave(()=>{removeFleetcompositionHightlight("shipclass",$(e))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipTypes).then(e=>{e&&($("div.aa-intel-loading-table-info-ship-types").addClass("d-none"),0===Object.keys(e).length?$("div.aa-intel-empty-table-info-ship-types").removeClass("d-none"):($("div.table-dscan-ship-types").removeClass("d-none"),t.DataTable({data:e,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:"name"},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:e=>{$(e).addClass("text-end")}}],createdRow:(e,a)=>{$(e).attr("data-shiptype-id",a.id),$(e).mouseenter(()=>{addFleetcompositionHightlight("shiptype",$(e))}).mouseleave(()=>{removeFleetcompositionHightlight("shiptype",$(e))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getFleetComposition).then(e=>{e&&($("div.aa-intel-loading-table-info-fleetcomp-pilot-ships").addClass("d-none"),0===Object.keys(e).length?$("div.aa-intel-empty-table-info-fleetcomp-pilot-ships").removeClass("d-none"):($("div.table-fleetcomp-pilot-ships").removeClass("d-none"),s.DataTable({data:e,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:e=>pilotInfoPanel(e)},{data:"ship"},{data:"solarsystem"}],order:[[0,"asc"]],columnDefs:[{targets:0,createdCell:e=>{$(e).addClass("fix-eve-image-position")}}],createdRow:(e,a)=>{const t=l.html(),s=parseInt(t)+1;l.html(s),$(e).attr("data-shipclass-id",a.ship_id).attr("data-shiptype-id",a.ship_type_id),$(e).mouseenter(()=>{addFleetcompositionHightlight("shiptype",$(e))}).mouseleave(()=>{removeFleetcompositionHightlight("shiptype",$(e))})}})))})});
+$(()=>{"use strict";const e=$("table.aa-intel-dscan-ship-classes-ship-classes-list"),l=$("span#aa-intel-dscan-ship-classes-mass"),t=$("table.aa-intel-dscan-ship-types-list"),s=$("table.aa-intel-fleetcomp-pilot-ships-list"),i=$("span#aa-intel-fleet-participation-count");fetchAjaxData(aaIntelToolJsOptions.ajax.getShipClasses).then(a=>{a&&($("div.aa-intel-loading-table-info-ship-classes").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ship-classes").removeClass("d-none"):($("div.table-dscan-ship-classes-ship-classes").removeClass("d-none"),e.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>shipInfoPanel(a)},{data:"count"},{data:"type_name"}],order:[[1,"desc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("text-ellipsis")}},{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}},{targets:2,visible:!1}],createdRow:(a,e)=>{const t=l.data("mass")||0,s=parseInt(t)+e.mass;l.data("mass",s),l.html(new Intl.NumberFormat(aaIntelToolJsL10n.language).format(s)),$(a).attr("data-shipclass-id",e.id).attr("data-shiptype-id",e.type_id),$(a).mouseenter(()=>{addFleetcompositionHightlight("shipclass",$(a))}).mouseleave(()=>{removeFleetcompositionHightlight("shipclass",$(a))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getShipTypes).then(a=>{a&&($("div.aa-intel-loading-table-info-ship-types").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-ship-types").removeClass("d-none"):($("div.table-dscan-ship-types").removeClass("d-none"),t.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:"name"},{data:"count"}],order:[[1,"desc"]],columnDefs:[{targets:1,width:45,createdCell:a=>{$(a).addClass("text-end")}}],createdRow:(a,e)=>{$(a).attr("data-shiptype-id",e.id),$(a).mouseenter(()=>{addFleetcompositionHightlight("shiptype",$(a))}).mouseleave(()=>{removeFleetcompositionHightlight("shiptype",$(a))})}})))}),fetchAjaxData(aaIntelToolJsOptions.ajax.getFleetComposition).then(a=>{a&&($("div.aa-intel-loading-table-info-fleetcomp-pilot-ships").addClass("d-none"),0===Object.keys(a).length?$("div.aa-intel-empty-table-info-fleetcomp-pilot-ships").removeClass("d-none"):($("div.table-fleetcomp-pilot-ships").removeClass("d-none"),s.DataTable({data:a,paging:!1,language:aaIntelToolJsL10n.dataTables.translation,lengthChange:!1,dom:"<'row'<'col-sm-12'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12'i>>",columns:[{data:a=>pilotInfoPanel(a)},{data:"ship"},{data:"solarsystem"}],order:[[0,"asc"]],columnDefs:[{targets:0,createdCell:a=>{$(a).addClass("fix-eve-image-position")}}],createdRow:(a,e)=>{const t=i.html(),s=parseInt(t)+1;i.html(s),$(a).attr("data-shipclass-id",e.ship_id).attr("data-shiptype-id",e.ship_type_id),$(a).mouseenter(()=>{addFleetcompositionHightlight("shiptype",$(a))}).mouseleave(()=>{removeFleetcompositionHightlight("shiptype",$(a))})}})))})});
 //# sourceMappingURL=aa-intel-tool-fleetcomposition.min.js.map

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aa-intel-tool-fleetcomposition.js"],"names":["$","elementShipClassesTable","elementShipTypesTable","elementFleetcompositionTable","elementPilotsCount","fetchAjaxData","aaIntelToolJsOptions","ajax","getShipClasses","then","tableData","addClass","Object","keys","length","removeClass","DataTable","data","paging","language","aaIntelToolJsL10n","dataTables","translation","lengthChange","dom","columns","shipInfoPanel","order","columnDefs","targets","createdCell","td","width","visible","createdRow","row","attr","id","type_id","mouseenter","addFleetcompositionHightlight","mouseleave","removeFleetcompositionHightlight","getShipTypes","getFleetComposition","pilotInfoPanel","currentTotal","html","newTotal","parseInt","ship_id","ship_type_id"],"mappings":"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"}
+{"version":3,"sources":["aa-intel-tool-fleetcomposition.js"],"names":["$","elementShipClassesTable","elementShipClassesMass","elementShipTypesTable","elementFleetcompositionTable","elementPilotsCount","fetchAjaxData","aaIntelToolJsOptions","ajax","getShipClasses","then","tableData","addClass","Object","keys","length","removeClass","DataTable","data","paging","language","aaIntelToolJsL10n","dataTables","translation","lengthChange","dom","columns","shipInfoPanel","order","columnDefs","targets","createdCell","td","width","visible","createdRow","row","currentMass","newMass","parseInt","mass","html","Intl","NumberFormat","format","attr","id","type_id","mouseenter","addFleetcompositionHightlight","mouseleave","removeFleetcompositionHightlight","getShipTypes","getFleetComposition","pilotInfoPanel","currentTotal","newTotal","ship_id","ship_type_id"],"mappings":"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"}

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.js

@@ -45,10 +45,10 @@ const eveImageHtml = (eveId, eveName, imageSource, imageSize = 32) => {
  * Get the link HTML to EveWho for a pilot
  *
  * @param {string} href
- * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
  */
 const eveWhoLinkHtml = (href) => {
-    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
 };
 
 
@@ -56,10 +56,10 @@ const eveWhoLinkHtml = (href) => {
  * Get the link HTML to zKillboard
  *
  * @param {string} href
- * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
  */
 const zkillboardLinkHtml = (href) => {
-    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
 };
 
 
@@ -67,10 +67,10 @@ const zkillboardLinkHtml = (href) => {
  * Get the link HTML to dotlan
  *
  * @param {string} href
- * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
+ * @returns {`<a class="aa-intel-information-link" href="${string}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`}
  */
 const dotlanLinkHtml = (href) => {
-    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
+    return `<a class="aa-intel-information-link" href="${href}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`;
 };
 
 

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js

@@ -1,2 +1,2 @@
-"use strict";const fetchAjaxData=async a=>fetch(a).then(a=>a.ok?Promise.resolve(a):Promise.reject(new Error("Failed to load"))).then(a=>a.json()).then(a=>a).catch(function(a){console.log("Error: "+a.message)}),eveImageHtml=(a,e,l,n=32)=>`<img class="eve-image rounded" data-eveid="${a}" src="${l}" alt="${e}" title="${e}" loading="lazy" width="${n}" height="${n}">`,eveWhoLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,zkillboardLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,dotlanLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fas fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,pilotInfoPanel=a=>{const e=`<span class="aa-intel-pilot-avatar-wrapper">${eveImageHtml(a.id,a.name,a.portrait)}</span>`;let l=`<span class="aa-intel-pilot-information-wrapper"><span class="aa-intel-pilot-name-wrapper">${a.name}</span>`;return l+=`<span class="aa-intel-pilot-links-wrapper"><small>${eveWhoLinkHtml(a.evewho)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,e+l},corporationInfoPanel=(a,e=!1)=>{const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-corporation-information-wrapper"><span class="aa-intel-corporation-name-wrapper">${a.name}</span>`;return n+='<span class="aa-intel-corporation-links-wrapper"><small>',1e6<=a.id&&a.id<=2e6?n+=`(${aaIntelToolJsL10n.scanData.npcCorp})`:n+=`${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,n+="</span>",e?l:l+n},allianceInfoPanel=(a,e=!1)=>{""===a.name&&(a.name=aaIntelToolJsL10n.scanData.empty);const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-alliance-information-wrapper"><span class="aa-intel-alliance-name-wrapper">${a.name}</span>`;return 1<a.id&&(n+=`<span class="aa-intel-alliance-links-wrapper"><small>${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`),n+="</span>",e?1===a.id?"":l:l+n},shipInfoPanel=a=>{const e=`<span class="aa-intel-ship-image-wrapper">${eveImageHtml(a.id,a.name,a.image)}</span>`,l=`<span class="aa-intel-ship-information-wrapper"><span class="aa-intel-ship-name-wrapper">${a.name}</span></span>`;return e+l};$(()=>{const a=$("button#btn-copy-permalink-to-clipboard"),l=(ClipboardJS.isSupported()||a.remove(),(a,e=10)=>{$(a).fadeTo(1e3*e,500).slideUp(500,()=>{$(a).remove()})}),n=(a,e)=>{$(e).html(`<div class="alert alert-success alert-dismissible alert-message-success d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-success")},s=(a,e)=>{$(e).html(`<div class="alert alert-danger alert-dismissible alert-message-error d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-error",9999)},e=a=>{const e=new ClipboardJS(a);e.on("success",a=>{n(aaIntelToolJsL10n.copyToClipboard.permalink.text.success,".aa-intel-copy-result"),a.clearSelection(),e.destroy()}),e.on("error",()=>{s(aaIntelToolJsL10n.copyToClipboard.permalink.text.error,".aa-intel-copy-result"),e.destroy()})};a.click(()=>{e("#"+a.attr("id"))})});
+"use strict";const fetchAjaxData=async a=>fetch(a).then(a=>a.ok?Promise.resolve(a):Promise.reject(new Error("Failed to load"))).then(a=>a.json()).then(a=>a).catch(function(a){console.log(`Error: ${a.message}`)}),eveImageHtml=(a,e,l,n=32)=>`<img class="eve-image rounded" data-eveid="${a}" src="${l}" alt="${e}" title="${e}" loading="lazy" width="${n}" height="${n}">`,eveWhoLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">evewho <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,zkillboardLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">zkillboard <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,dotlanLinkHtml=a=>`<a class="aa-intel-information-link" href="${a}" target="_blank" rel="noopener noreferer">dotlan <sup><small><i class="fa-solid fa-external-link-alt" aria-hidden="true"></i></small></sup></a>`,pilotInfoPanel=a=>{const e=`<span class="aa-intel-pilot-avatar-wrapper">${eveImageHtml(a.id,a.name,a.portrait)}</span>`;let l=`<span class="aa-intel-pilot-information-wrapper"><span class="aa-intel-pilot-name-wrapper">${a.name}</span>`;return l+=`<span class="aa-intel-pilot-links-wrapper"><small>${eveWhoLinkHtml(a.evewho)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,e+l},corporationInfoPanel=(a,e=!1)=>{const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-corporation-information-wrapper"><span class="aa-intel-corporation-name-wrapper">${a.name}</span>`;return n+=`<span class="aa-intel-corporation-links-wrapper"><small>`,1e6<=a.id&&a.id<=2e6?n+=`(${aaIntelToolJsL10n.scanData.npcCorp})`:n+=`${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`,n+=`</span>`,e?l:l+n},allianceInfoPanel=(a,e=!1)=>{""===a.name&&(a.name=aaIntelToolJsL10n.scanData.empty);const l=`<span class="aa-intel-corporation-logo-wrapper">${eveImageHtml(a.id,a.name,a.logo)}</span>`;let n=`<span class="aa-intel-alliance-information-wrapper"><span class="aa-intel-alliance-name-wrapper">${a.name}</span>`;return 1<a.id&&(n+=`<span class="aa-intel-alliance-links-wrapper"><small>${dotlanLinkHtml(a.dotlan)} | ${zkillboardLinkHtml(a.zkillboard)}</small></span>`),n+=`</span>`,e?1===a.id?"":l:l+n},shipInfoPanel=a=>{const e=`<span class="aa-intel-ship-image-wrapper">${eveImageHtml(a.id,a.name,a.image)}</span>`,l=`<span class="aa-intel-ship-information-wrapper"><span class="aa-intel-ship-name-wrapper">${a.name}</span></span>`;return e+l};$(()=>{const a=$("button#btn-copy-permalink-to-clipboard"),l=(ClipboardJS.isSupported()||a.remove(),(a,e=10)=>{$(a).fadeTo(1e3*e,500).slideUp(500,()=>{$(a).remove()})}),n=(a,e)=>{$(e).html(`<div class="alert alert-success alert-dismissible alert-message-success d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-success")},s=(a,e)=>{$(e).html(`<div class="alert alert-danger alert-dismissible alert-message-error d-flex align-items-center fade show">${a}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>`),l(".alert-message-error",9999)},e=a=>{const e=new ClipboardJS(a);e.on("success",a=>{n(aaIntelToolJsL10n.copyToClipboard.permalink.text.success,".aa-intel-copy-result"),a.clearSelection(),e.destroy()}),e.on("error",()=>{s(aaIntelToolJsL10n.copyToClipboard.permalink.text.error,".aa-intel-copy-result"),e.destroy()})};a.click(()=>{e("#"+a.attr("id"))})});
 //# sourceMappingURL=aa-intel-tool-scan-result-common.min.js.map

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aa-intel-tool-scan-result-common.js"],"names":["fetchAjaxData","async","url","fetch","then","response","ok","Promise","resolve","reject","Error","json","tableData","catch","error","console","log","message","eveImageHtml","eveId","eveName","imageSource","imageSize","eveWhoLinkHtml","href","zkillboardLinkHtml","dotlanLinkHtml","pilotInfoPanel","html_logo","pilotData","id","name","portrait","let","html_info","evewho","zkillboard","corporationInfoPanel","corporationData","logoOnly","logo","aaIntelToolJsL10n","scanData","npcCorp","dotlan","allianceInfoPanel","allianceData","empty","shipInfoPanel","shipData","image","$","elementCopyToClipboard","closeMessageElement","ClipboardJS","isSupported","remove","element","closeAfter","fadeTo","slideUp","showSuccess","html","showError","copyScanLink","clipboardScanLink","elementId","on","copyToClipboard","permalink","text","success","e","clearSelection","destroy","click","attr"],"mappings":"AAEA,aAQA,MAAMA,cAAgBC,MAAOC,GACZC,MAAMD,CAAG,EACjBE,KAAKC,GACEA,EAASC,GACFC,QAAQC,QAAQH,CAAQ,EAExBE,QAAQE,OAAO,IAAIC,MAAM,gBAAgB,CAAC,CAExD,EACAN,KAAKC,GAAYA,EAASM,KAAK,CAAC,EAChCP,KAAKQ,GACKA,CACV,EACAC,MAAM,SAAUC,GACbC,QAAQC,IAAI,UAAUF,EAAMG,OAAS,CACzC,CAAC,EAaHC,aAAe,CAACC,EAAOC,EAASC,EAAaC,EAAY,mDACNH,WAAeE,WAAqBD,aAAmBA,4BAAkCE,cAAsBA,MAUlKC,eAAiB,iDACkCC,+IAUnDC,mBAAqB,iDAC8BD,mJAUnDE,eAAiB,iDACkCF,+IAUnDG,eAAiB,IACnB,MAAMC,iDAA2DV,aAAaW,EAAUC,GAAID,EAAUE,KAAMF,EAAUG,QAAQ,WAC9HC,IAAIC,gGAA0GL,EAAUE,cAGxH,OAFAG,wDAAkEX,eAAeM,EAAUM,MAAM,OAAOV,mBAAmBI,EAAUO,UAAU,mBAExIR,EAAYM,CACvB,EAUMG,qBAAuB,CAACC,EAAiBC,EAAW,CAAA,KACtD,MAAMX,qDAA+DV,aAAaoB,EAAgBR,GAAIQ,EAAgBP,KAAMO,EAAgBE,IAAI,WAChJP,IAAIC,4GAAsHI,EAAgBP,cAW1I,OAVAG,GAAa,2DAER,KAAWI,EAAgBR,IAAOQ,EAAgBR,IAAM,IACzDI,OAAiBO,kBAAkBC,SAASC,WAE5CT,MAAgBR,eAAeY,EAAgBM,MAAM,OAAOnB,mBAAmBa,EAAgBF,UAAU,mBAG7GF,GAAa,UAETK,EACOX,EAGJA,EAAYM,CACvB,EAUMW,kBAAoB,CAACC,EAAcP,EAAW,CAAA,KACtB,KAAtBO,EAAaf,OACbe,EAAaf,KAAOU,kBAAkBC,SAASK,OAGnD,MAAMnB,qDAA+DV,aAAa4B,EAAahB,GAAIgB,EAAaf,KAAMe,EAAaN,IAAI,WACvIP,IAAIC,sGAAgHY,EAAaf,cAQjI,OANsB,EAAlBe,EAAahB,KACbI,2DAAqER,eAAeoB,EAAaF,MAAM,OAAOnB,mBAAmBqB,EAAaV,UAAU,oBAG5JF,GAAa,UAETK,EACwB,IAApBO,EAAahB,GACN,GAGJF,EAGJA,EAAYM,CACvB,EASMc,cAAgB,IAClB,MAAMpB,+CAAyDV,aAAa+B,EAASnB,GAAImB,EAASlB,KAAMkB,EAASC,KAAK,WAChHhB,8FAAwGe,EAASlB,qBAEvH,OAAOH,EAAYM,CACvB,EAGAiB,EAAE,KACE,MAAMC,EAAyBD,EAAE,wCAAwC,EAiBnEE,GAXDC,YAAYC,YAAY,GACzBH,EAAuBI,OAAO,EAUN,CAACC,EAASC,EAAa,MAC/CP,EAAEM,CAAO,EAAEE,OAAoB,IAAbD,EAAmB,GAAG,EAAEE,QAAQ,IAAK,KACnDT,EAAEM,CAAO,EAAED,OAAO,CACtB,CAAC,CACL,GASMK,EAAc,CAAC5C,EAASwC,KAC1BN,EAAEM,CAAO,EAAEK,qHACyG7C,qGACpH,EAEAoC,EAAoB,wBAAwB,CAChD,EASMU,EAAY,CAAC9C,EAASwC,KACxBN,EAAEM,CAAO,EAAEK,kHACsG7C,qGACjH,EAEAoC,EAAoB,uBAAwB,IAAI,CACpD,EAQMW,EAAe,IAMjB,MAAMC,EAAoB,IAAIX,YAAYY,CAAS,EAOnDD,EAAkBE,GAAG,UAAW,IAC5BN,EACIpB,kBAAkB2B,gBAAgBC,UAAUC,KAAKC,QACjD,uBACJ,EAEAC,EAAEC,eAAe,EACjBR,EAAkBS,QAAQ,CAC9B,CAAC,EAKDT,EAAkBE,GAAG,QAAS,KAC1BJ,EACItB,kBAAkB2B,gBAAgBC,UAAUC,KAAKxD,MACjD,uBACJ,EAEAmD,EAAkBS,QAAQ,CAC9B,CAAC,CACL,EAMAtB,EAAuBuB,MAAM,KACzBX,EAAa,IAAMZ,EAAuBwB,KAAK,IAAI,CAAC,CACxD,CAAC,CACL,CAAC"}
+{"version":3,"sources":["aa-intel-tool-scan-result-common.js"],"names":["fetchAjaxData","async","url","fetch","then","response","ok","Promise","resolve","reject","Error","json","tableData","catch","error","console","log","message","eveImageHtml","eveId","eveName","imageSource","imageSize","eveWhoLinkHtml","href","zkillboardLinkHtml","dotlanLinkHtml","pilotInfoPanel","html_logo","pilotData","id","name","portrait","let","html_info","evewho","zkillboard","corporationInfoPanel","corporationData","logoOnly","logo","aaIntelToolJsL10n","scanData","npcCorp","dotlan","allianceInfoPanel","allianceData","empty","shipInfoPanel","shipData","image","$","elementCopyToClipboard","closeMessageElement","ClipboardJS","isSupported","remove","element","closeAfter","fadeTo","slideUp","showSuccess","html","showError","copyScanLink","clipboardScanLink","elementId","on","copyToClipboard","permalink","text","success","e","clearSelection","destroy","click","attr"],"mappings":"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"}

aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html

@@ -2,6 +2,7 @@
 
 <script>
     const aaIntelToolJsL10n = {
+        language: '{{ LANGUAGE_CODE }}',
         copyToClipboard: {
             permalink: {
                 text: {

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html

@@ -25,6 +25,11 @@
                         </tr>
                     </thead>
                 </table>
+
+                <div class="text-center mt-3">
+                    {% translate "Total mass (in kg):" %}
+                    <span id="aa-intel-dscan-{{ dscan_section }}-mass" data-mass="0"></span>
+                </div>
             </div>
 
             <div class="aa-intel-loading-table-info aa-intel-loading-table-info-{{ dscan_section }} aa-callout aa-callout-info">

aa_intel_tool/tests/test_access.py

@@ -37,7 +37,7 @@ class TestAccess(TestCase):
         cls.html_menu = f"""
             <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
                 <i class="nav-link fa-solid fa-clipboard-list fa-fw align-self-center me-3 active"></i>
-                <a class="nav-link flex-fill align-self-center me-auto" href="{reverse('aa_intel_tool:intel_tool_index')}">
+                <a class="nav-link flex-fill align-self-center me-auto active" href="{reverse('aa_intel_tool:intel_tool_index')}">
                     Intel Parser
                 </a>
             </li>

{aa_intel_tool-2.0.0b1.dist-info → aa_intel_tool-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: aa-intel-tool
-Version: 2.0.0b1
+Version: 2.1.1
 Summary: A simple parser for D-Scans and more for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-intel-tool/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-intel-tool/blob/master/README.md
@@ -702,7 +702,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Requires-Dist: allianceauth-app-utils>=1.19.1
-Requires-Dist: allianceauth>=4.0.0b1
+Requires-Dist: allianceauth<5.0.0,>=4
 Requires-Dist: django-eveuniverse>=1.3
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
@@ -787,11 +787,13 @@ See [Settings](#settings) section for details.
 
 > \[!NOTE\]
 >
-> **AA Intel Tool needs at least Alliance Auth v4.0.0!**
+> **AA Intel Tool >= 2.0.0 needs at least Alliance Auth v4.0.0!**
 >
 > Please make sure to update your Alliance Auth instance _before_ you install this
 > module or update to the latest version, otherwise an update to Alliance Auth will
 > be pulled in unsupervised.
+>
+> The last version compatible with Alliance Auth v3 is `1.2.0`.
 
 **Important**: Please make sure you meet all preconditions before you proceed: