aa-intel-tool 0.0.1a8__py3-none-any.whl → 0.0.1a10__py3-none-any.whl

aa_intel_tool/parser/module/dscan.py

@@ -7,7 +7,6 @@ import re
 
 # Django
 from django.db.models import QuerySet
-from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
 # Alliance Auth
@@ -23,105 +22,172 @@ from eveuniverse.models import EveType
 from aa_intel_tool import __title__
 from aa_intel_tool.app_settings import AppSettings
 from aa_intel_tool.exceptions import ParserError
+from aa_intel_tool.helper.data_structure import dict_to_list
 from aa_intel_tool.models import Scan, ScanData
 from aa_intel_tool.parser.helper.db import safe_scan_to_db
 
 logger = LoggerAddTag(my_logger=get_extension_logger(name=__name__), prefix=__title__)
 
 
-def _parse_ship_information(eve_types: QuerySet, counter: dict) -> dict:
+def _is_on_grid(distance: str) -> bool:
+    """
+    Determine if something is "on grid" or not
+
+    :param distance:
+    :type distance:
+    :return:
+    :rtype:
+    """
+
+    # AA Intel Tool
+    from aa_intel_tool.constants import (  # pylint: disable=import-outside-toplevel
+        REGEX_PATTERN,
+    )
+
+    if re.search(pattern=REGEX_PATTERN["localised_on_grid"], string=distance):
+        # line = re.split(pattern=r" ", string=distance)
+        distance_sanitised = int(re.sub(r"[^0-9]", "", distance))
+
+        if distance_sanitised <= AppSettings.INTELTOOL_DSCAN_GRID_SIZE:
+            return True
+
+        return False
+
+    return False
+
+
+def _get_type_info_dict(eve_type: tuple) -> dict:
+    """
+    Get the eve_type info dict
+
+    eve_type[0] = ID
+    eve_type[1] = Name
+    eve_type[2] = Group ID
+    eve_type[3] = Group Name
+
+    :param eve_type:
+    :type eve_type:
+    :return:
+    :rtype:
+    """
+
+    return {
+        "id": eve_type[0],
+        "name": eve_type[1],
+        "type_id": eve_type[2],
+        "type_name": eve_type[3],
+        "image": eveimageserver.type_icon_url(type_id=eve_type[0], size=32),
+    }
+
+
+def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
+    """
+    Get the ships
+    This will be the content of the following tables in the D-Scan view:
+    » All Ships
+    » On Grid
+    » Off Grid
+    » Ship Types
+
+    :param eve_types:
+    :type eve_types:
+    :param counter:
+    :type counter:
+    :return:
+    :rtype:
+    """
+
     ships = {"all": {}, "ongrid": {}, "offgrid": {}, "types": {}}
 
     eve_types_ships = eve_types.filter(
         eve_group__eve_category_id__exact=EveCategoryId.SHIP
     )
 
-    for ship_id, ship_name, ship_type_id, ship_type_name in eve_types_ships:
-        if ship_id in counter["all"]:
-            ships["all"][ship_name] = {
-                "id": ship_id,
-                "name": ship_name,
-                "type_id": ship_type_id,
-                "type_name": ship_type_name,
-                "type_name_sanitised": slugify(ship_type_name),
-                "count": counter["all"][ship_id],
-                "image": eveimageserver.type_icon_url(type_id=ship_id, size=32),
+    for eve_type in eve_types_ships:
+        # Info for "All Ships" table
+        if eve_type[0] in counter["all"]:
+            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]]
+
+        # 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]]
+
+        # 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]]
+
+        # Info for "Ship Types" table
+        if eve_type[3] not in ships["types"]:
+            ships["types"][eve_type[3]] = {
+                "id": eve_type[2],
+                "name": eve_type[3],
+                "count": 0,
             }
 
-            if ship_id in counter["ongrid"]:
-                ships["ongrid"][ship_name] = {
-                    "id": ship_id,
-                    "name": ship_name,
-                    "type_id": ship_type_id,
-                    "type_name": ship_type_name,
-                    "type_name_sanitised": slugify(ship_type_name),
-                    "count": counter["ongrid"][ship_id],
-                    "image": eveimageserver.type_icon_url(type_id=ship_id, size=32),
-                }
+        # Add the count to the ship types
+        ships["types"][eve_type[3]]["count"] += counter["all"][eve_type[0]]
+
+    # Leaving this here just in case the method in the first loop turns out to be faulty
+    # for ship_name, ship_info in ships["all"].items():  # pylint: disable=unused-variable
+    #     if ship_info["type_name"] not in counter["type"]:
+    #         counter["type"][ship_info["type_name"]] = 0
+    #
+    #     counter["type"][ship_info["type_name"]] += ship_info["count"]
+    #
+    #     if ship_info["type_name"] not in ships["types"]:
+    #         ships["types"][ship_info["type_name"]] = {
+    #             "name": ship_info["type_name"],
+    #             "name_sanitised": slugify(ship_info["type_name"]),
+    #         }
+    #
+    #     ships["types"][ship_info["type_name"]]["count"] = counter["type"][
+    #         ship_info["type_name"]
+    #     ]
 
-            if ship_id in counter["offgrid"]:
-                ships["offgrid"][ship_name] = {
-                    "id": ship_id,
-                    "name": ship_name,
-                    "type_id": ship_type_id,
-                    "type_name": ship_type_name,
-                    "type_name_sanitised": slugify(ship_type_name),
-                    "count": counter["offgrid"][ship_id],
-                    "image": eveimageserver.type_icon_url(type_id=ship_id, size=32),
-                }
+    return {
+        "all": dict_to_list(input_dict=ships["all"]),
+        "ongrid": dict_to_list(input_dict=ships["ongrid"]),
+        "offgrid": dict_to_list(input_dict=ships["offgrid"]),
+        "types": dict_to_list(input_dict=ships["types"]),
+    }
 
-    for ship_name, ship_info in ships["all"].items():
-        if ship_info["type_name"] not in counter["type"]:
-            counter["type"][ship_info["type_name"]] = 0
 
-        counter["type"][ship_info["type_name"]] += ship_info["count"]
+def _get_upwell_structures_on_grid(eve_types: QuerySet, dscan_list: list) -> list:
+    """
+    Get all Upwell structures that are on grid
 
-        if ship_info["type_name"] not in ships["types"]:
-            ships["types"][ship_info["type_name"]] = {
-                "name": ship_info["type_name"],
-                "name_sanitised": slugify(ship_info["type_name"]),
-            }
+    :param eve_types:
+    :type eve_types:
+    :param counter:
+    :type counter:
+    :return:
+    :rtype:
+    """
 
-        ships["types"][ship_info["type_name"]]["count"] = counter["type"][
-            ship_info["type_name"]
-        ]
-
-    # Sort and clean up the dicts
-    cleaned_ships_all = [
-        ship
-        for (
-            ship_name,  # pylint: disable=unused-variable
-            ship,
-        ) in sorted(ships["all"].items())
-    ]
-    cleaned_ships_ongrid = [
-        ship
-        for (
-            ship_name,  # pylint: disable=unused-variable
-            ship,
-        ) in sorted(ships["ongrid"].items())
-    ]
-    cleaned_ships_offgrid = [
-        ship
-        for (
-            ship_name,  # pylint: disable=unused-variable
-            ship,
-        ) in sorted(ships["offgrid"].items())
-    ]
-    cleaned_ships_types = [
-        ship
-        for (
-            ship_name,  # pylint: disable=unused-variable
-            ship,
-        ) in sorted(ships["types"].items())
-    ]
+    eve_types_structures = eve_types.filter(
+        eve_group__eve_category_id__exact=EveCategoryId.STRUCTURE
+    )
 
-    return {
-        "all": cleaned_ships_all,
-        "ongrid": cleaned_ships_ongrid,
-        "offgrid": cleaned_ships_offgrid,
-        "types": cleaned_ships_types,
-    }
+    structures_on_grid = {}
+
+    for item in dscan_list:
+        if eve_types_structures.filter(id=item[0]).exists() and _is_on_grid(item[3]):
+            if item[0] not in structures_on_grid:
+                structures_on_grid[item[0]] = {
+                    "id": item[0],
+                    "type": item[2],
+                    "count": 0,
+                }
+
+            structures_on_grid[item[0]]["count"] += 1
+
+    return dict_to_list(structures_on_grid)
 
 
 def parse(scan_data: list) -> Scan:
@@ -137,14 +203,21 @@ def parse(scan_data: list) -> Scan:
     message = _("The D-Scan module is currently disabled.")
 
     if AppSettings.INTELTOOL_ENABLE_MODULE_DSCAN is True:
+        # AA Intel Tool
+        from aa_intel_tool.constants import (  # pylint: disable=import-outside-toplevel
+            REGEX_PATTERN,
+        )
+
         counter = {"all": {}, "ongrid": {}, "offgrid": {}, "type": {}}
         eve_ids = {"all": [], "ongrid": [], "offgrid": []}
+        dscan_lines = []
+        parsed_data = {}
 
         # Let's split this list up
         #
         # [0] => Item ID
         # [1] => Name
-        # [2] => Ship Class
+        # [2] => Ship Class / Structure Type
         # [3] => Distance
         for entry in scan_data:
             line = re.split(pattern=r"\t+", string=entry.rstrip("\t"))
@@ -153,48 +226,67 @@ def parse(scan_data: list) -> Scan:
             if entry_id not in counter["all"]:
                 counter["all"][entry_id] = 0
 
-            if line[3] == "-":
-                if entry_id not in counter["offgrid"]:
-                    counter["offgrid"][entry_id] = 0
-
-                counter["offgrid"][entry_id] += 1
-                eve_ids["offgrid"].append(entry_id)
-            else:
+            if re.search(pattern=REGEX_PATTERN["localised_on_grid"], string=line[3]):
                 if entry_id not in counter["ongrid"]:
                     counter["ongrid"][entry_id] = 0
 
                 counter["ongrid"][entry_id] += 1
                 eve_ids["ongrid"].append(entry_id)
+            else:
+                if entry_id not in counter["offgrid"]:
+                    counter["offgrid"][entry_id] = 0
 
-            counter["all"][entry_id] += 1
+                counter["offgrid"][entry_id] += 1
+                eve_ids["offgrid"].append(entry_id)
 
+            counter["all"][entry_id] += 1
             eve_ids["all"].append(entry_id)
+            dscan_lines.append([entry_id, line[1], line[2], line[3]])
 
         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")
+        ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
 
         # Parse the data
-        ships = _parse_ship_information(eve_types=eve_types, counter=counter)
-
-        parsed_data = {
-            "shiptypes": {
+        ships = _get_ships(eve_types=eve_types, counter=counter)
+        upwell_structures = _get_upwell_structures_on_grid(
+            eve_types=eve_types, dscan_list=dscan_lines
+        )
+
+        # Add "ship types" to parsed data when available
+        if len(ships["types"]):
+            parsed_data["shiptypes"] = {
                 "section": ScanData.Section.SHIPTYPES,
                 "data": ships["types"],
-            },
-            "all": {
+            }
+
+        # Add "ships all" to parsed data when available
+        if len(ships["all"]):
+            parsed_data["all"] = {
                 "section": ScanData.Section.SHIPLIST,
                 "data": ships["all"],
-            },
-            "ongrid": {
+            }
+
+        # Add "ships on grid" to parsed data when available
+        if len(ships["ongrid"]):
+            parsed_data["ongrid"] = {
                 "section": ScanData.Section.SHIPLIST_ON_GRID,
                 "data": ships["ongrid"],
-            },
-            "offgrid": {
+            }
+
+        # Add "ships off grid" to parsed data when available
+        if len(ships["offgrid"]):
+            parsed_data["offgrid"] = {
                 "section": ScanData.Section.SHIPLIST_OFF_GRID,
                 "data": ships["offgrid"],
-            },
-        }
+            }
+
+        # Add "Upwell structures on grid" to parsed data when available
+        if len(upwell_structures):
+            parsed_data["sructures_on_grid"] = {
+                "section": ScanData.Section.STRUCTURES_ON_GRID,
+                "data": upwell_structures,
+            }
 
         return safe_scan_to_db(scan_type=Scan.Type.DSCAN, parsed_data=parsed_data)
 

aa_intel_tool/static/aa_intel_tool/javascript/{aa-intel-tool-highlight.js → aa-intel-tool-chatscan-highlight.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-/* Highlighting similar table rows on mouse over and click
+/* Highlighting similar table rows on mouse over and click for chat scans
 --------------------------------------------------------------------------------- */
 
 /**
@@ -12,7 +12,7 @@
 const removeCorporationStickyComplete = (element) => {
     let removeCorporationSticky = true;
 
-    $('table.aa-intel-pilot-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]').each((i, el) => {
+    $(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`).each((i, el) => {
         if ($(el).hasClass('aa-intel-highlight-sticky')) {
             removeCorporationSticky = false;
         }
@@ -31,7 +31,7 @@ const removeCorporationStickyComplete = (element) => {
 const removeAllianceStickyComplete = (element) => {
     let removeAllianceSticky = true;
 
-    $('table.aa-intel-pilot-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]').each((i, el) => {
+    $(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`).each((i, el) => {
         if ($(el).hasClass('aa-intel-highlight-sticky')) {
             removeAllianceSticky = false;
         }
@@ -47,7 +47,7 @@ const removeAllianceStickyComplete = (element) => {
  * @param element
  */
 const allianceTableAddStickyByAllianceId = (element) => {
-    $('table.aa-intel-alliance-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight-sticky');
 };
 
@@ -58,7 +58,7 @@ const allianceTableAddStickyByAllianceId = (element) => {
  * @param element
  */
 const allianceTableAddHighlightByAllianceId = (element) => {
-    $('table.aa-intel-alliance-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight');
 };
 
@@ -69,7 +69,7 @@ const allianceTableAddHighlightByAllianceId = (element) => {
  * @param element
  */
 const allianceTableRemoveStickyByAllianceId = (element) => {
-    $('table.aa-intel-alliance-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight-sticky');
 };
 
@@ -80,7 +80,7 @@ const allianceTableRemoveStickyByAllianceId = (element) => {
  * @param element
  */
 const allianceTableRemoveHighlightByAllianceId = (element) => {
-    $('table.aa-intel-alliance-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight');
 };
 
@@ -91,7 +91,7 @@ const allianceTableRemoveHighlightByAllianceId = (element) => {
  * @param element
  */
 const corporationTableAddStickyByCorporationId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .addClass('aa-intel-highlight-sticky');
 };
 
@@ -102,7 +102,7 @@ const corporationTableAddStickyByCorporationId = (element) => {
  * @param element
  */
 const corporationTableAddHighlightByCorporationId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .addClass('aa-intel-highlight');
 };
 
@@ -113,7 +113,7 @@ const corporationTableAddHighlightByCorporationId = (element) => {
  * @param element
  */
 const corporationTableAddStickyByAllianceId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight-sticky');
 };
 
@@ -124,7 +124,7 @@ const corporationTableAddStickyByAllianceId = (element) => {
  * @param element
  */
 const corporationTableAddHighlightByAllianceId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight');
 };
 
@@ -135,7 +135,7 @@ const corporationTableAddHighlightByAllianceId = (element) => {
  * @param element
  */
 const corporationTableRemoveStickyByCorporationId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .removeClass('aa-intel-highlight-sticky');
 };
 
@@ -146,7 +146,7 @@ const corporationTableRemoveStickyByCorporationId = (element) => {
  * @param element
  */
 const corporationTableRemoveHighlightByCorporationId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .removeClass('aa-intel-highlight');
 };
 
@@ -157,7 +157,7 @@ const corporationTableRemoveHighlightByCorporationId = (element) => {
  * @param element
  */
 const corporationTableRemoveStickyByAllianceId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight-sticky');
 };
 
@@ -168,7 +168,7 @@ const corporationTableRemoveStickyByAllianceId = (element) => {
  * @param element
  */
 const corporationTableRemoveHighlightByAllianceId = (element) => {
-    $('table.aa-intel-corporation-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight');
 };
 
@@ -179,7 +179,7 @@ const corporationTableRemoveHighlightByAllianceId = (element) => {
  * @param element
  */
 const pilotTableAddStickyByCorporationId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .addClass('aa-intel-highlight-sticky');
 };
 
@@ -190,7 +190,7 @@ const pilotTableAddStickyByCorporationId = (element) => {
  * @param element
  */
 const pilotTableAddHighlightByCorporationId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .addClass('aa-intel-highlight');
 };
 
@@ -201,7 +201,7 @@ const pilotTableAddHighlightByCorporationId = (element) => {
  * @param element
  */
 const pilotTableAddStickyByAllianceId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight-sticky');
 };
 
@@ -212,7 +212,7 @@ const pilotTableAddStickyByAllianceId = (element) => {
  * @param element
  */
 const pilotTableAddHighlightByAllianceId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .addClass('aa-intel-highlight');
 };
 
@@ -223,7 +223,7 @@ const pilotTableAddHighlightByAllianceId = (element) => {
  * @param element
  */
 const pilotTableRemoveStickyByCorporationId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .removeClass('aa-intel-highlight-sticky');
 };
 
@@ -234,7 +234,7 @@ const pilotTableRemoveStickyByCorporationId = (element) => {
  * @param element
  */
 const pilotTableRemoveHighlightByCorporationId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-corporation-id="' + element.data('corporationId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data('corporationId')}"]`)
         .removeClass('aa-intel-highlight');
 };
 
@@ -245,7 +245,7 @@ const pilotTableRemoveHighlightByCorporationId = (element) => {
  * @param element
  */
 const pilotTableRemoveStickyByAllianceId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight-sticky');
 };
 
@@ -256,7 +256,7 @@ const pilotTableRemoveStickyByAllianceId = (element) => {
  * @param element
  */
 const pilotTableRemoveHighlightByAllianceId = (element) => {
-    $('table.aa-intel-pilot-participation-list tr[data-alliance-id="' + element.data('allianceId') + '"]')
+    $(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data('allianceId')}"]`)
         .removeClass('aa-intel-highlight');
 };
 

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js

@@ -0,0 +1 @@
+"use strict";const removeCorporationStickyComplete=element=>{let removeCorporationSticky=true;$(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).each((i,el)=>{if($(el).hasClass("aa-intel-highlight-sticky")){removeCorporationSticky=false}});return removeCorporationSticky};const removeAllianceStickyComplete=element=>{let removeAllianceSticky=true;$(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).each((i,el)=>{if($(el).hasClass("aa-intel-highlight-sticky")){removeAllianceSticky=false}});return removeAllianceSticky};const allianceTableAddStickyByAllianceId=element=>{$(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight-sticky")};const allianceTableAddHighlightByAllianceId=element=>{$(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight")};const allianceTableRemoveStickyByAllianceId=element=>{$(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight-sticky")};const allianceTableRemoveHighlightByAllianceId=element=>{$(`table.aa-intel-alliance-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight")};const corporationTableAddStickyByCorporationId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).addClass("aa-intel-highlight-sticky")};const corporationTableAddHighlightByCorporationId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).addClass("aa-intel-highlight")};const corporationTableAddStickyByAllianceId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight-sticky")};const corporationTableAddHighlightByAllianceId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight")};const corporationTableRemoveStickyByCorporationId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).removeClass("aa-intel-highlight-sticky")};const corporationTableRemoveHighlightByCorporationId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).removeClass("aa-intel-highlight")};const corporationTableRemoveStickyByAllianceId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight-sticky")};const corporationTableRemoveHighlightByAllianceId=element=>{$(`table.aa-intel-corporation-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight")};const pilotTableAddStickyByCorporationId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).addClass("aa-intel-highlight-sticky")};const pilotTableAddHighlightByCorporationId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).addClass("aa-intel-highlight")};const pilotTableAddStickyByAllianceId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight-sticky")};const pilotTableAddHighlightByAllianceId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).addClass("aa-intel-highlight")};const pilotTableRemoveStickyByCorporationId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).removeClass("aa-intel-highlight-sticky")};const pilotTableRemoveHighlightByCorporationId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-corporation-id="${element.data("corporationId")}"]`).removeClass("aa-intel-highlight")};const pilotTableRemoveStickyByAllianceId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight-sticky")};const pilotTableRemoveHighlightByAllianceId=element=>{$(`table.aa-intel-pilot-participation-list tr[data-alliance-id="${element.data("allianceId")}"]`).removeClass("aa-intel-highlight")};const addHightlight=(by_table,table_row)=>{table_row.addClass("aa-intel-highlight");if(by_table==="alliance"){corporationTableAddHighlightByAllianceId(table_row);pilotTableAddHighlightByAllianceId(table_row)}if(by_table==="corporation"){allianceTableAddHighlightByAllianceId(table_row);pilotTableAddHighlightByCorporationId(table_row)}if(by_table==="pilot"){allianceTableAddHighlightByAllianceId(table_row);corporationTableAddHighlightByCorporationId(table_row)}};const addSticky=(by_table,table_row)=>{table_row.addClass("aa-intel-highlight-sticky");if(by_table==="alliance"){corporationTableAddStickyByAllianceId(table_row);pilotTableAddStickyByAllianceId(table_row)}if(by_table==="corporation"){allianceTableAddStickyByAllianceId(table_row);pilotTableAddStickyByCorporationId(table_row)}if(by_table==="pilot"){allianceTableAddStickyByAllianceId(table_row);corporationTableAddStickyByCorporationId(table_row)}};const removeHightlight=(by_table,table_row)=>{table_row.removeClass("aa-intel-highlight");if(by_table==="alliance"){corporationTableRemoveHighlightByAllianceId(table_row);pilotTableRemoveHighlightByAllianceId(table_row)}if(by_table==="corporation"){allianceTableRemoveHighlightByAllianceId(table_row);pilotTableRemoveHighlightByCorporationId(table_row)}if(by_table==="pilot"){allianceTableRemoveHighlightByAllianceId(table_row);corporationTableRemoveHighlightByCorporationId(table_row)}};const removeSticky=(by_table,table_row)=>{table_row.removeClass("aa-intel-highlight-sticky");if(by_table==="alliance"){corporationTableRemoveStickyByAllianceId(table_row);pilotTableRemoveStickyByAllianceId(table_row)}if(by_table==="corporation"){pilotTableRemoveStickyByCorporationId(table_row);if(removeAllianceStickyComplete(table_row)===true){allianceTableRemoveStickyByAllianceId(table_row)}}if(by_table==="pilot"){if(removeCorporationStickyComplete(table_row)===true){corporationTableRemoveStickyByCorporationId(table_row)}if(removeAllianceStickyComplete(table_row)===true){allianceTableRemoveStickyByAllianceId(table_row)}}};const changeStickyHighlight=(by_table,table_row)=>{if(table_row.hasClass("aa-intel-highlight-sticky")){removeSticky(by_table,table_row)}else{addSticky(by_table,table_row)}};

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

@@ -267,7 +267,7 @@ jQuery(document).ready(($) => {
             elementAlliancesTotalCount.html(newTotal);
 
             $(row)
-                .addClass('aa-intel-alliance-participation-item aa-intel-alliance-id-' + data['id'])
+                .addClass(`aa-intel-alliance-participation-item aa-intel-alliance-id-${data['id']}`)
                 .attr('data-alliance-id', data['id']);
 
             // Highlight
@@ -352,7 +352,7 @@ jQuery(document).ready(($) => {
             elementCorporationsTotalCount.html(newTotal);
 
             $(row)
-                .addClass('aa-intel-corporation-participation-item aa-intel-corporation-id-' + data['id'])
+                .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']);
 
@@ -443,7 +443,7 @@ jQuery(document).ready(($) => {
             elementPilotsTotalCount.html(newTotal);
 
             $(row)
-                .addClass('aa-intel-corporation-participation-item aa-intel-corporation-id-' + data['id'])
+                .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']);