aa-structures 2.16.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

structures/migrations/0009_add_project_goal_notifications.py

@@ -0,0 +1,152 @@
+# Generated by Django 4.2.16 on 2024-11-05 14:05
+
+import multiselectfield.db.fields
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("structures", "0008_add_notificationtypes_skyhook_metenox"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="webhook",
+            name="notification_types",
+            field=multiselectfield.db.fields.MultiSelectField(
+                choices=[
+                    ("BillOutOfMoneyMsg", "Bill out of money"),
+                    ("CorpAllBillMsg", "Corp alliance billing message"),
+                    (
+                        "InfrastructureHubBillAboutToExpire",
+                        "I-HUB bill about to expire",
+                    ),
+                    ("IHubDestroyedByBillFailure", "I_HUB destroyed by bill failure"),
+                    ("CharAppAcceptMsg", "Character joins corporation"),
+                    ("CorpAppInvitedMsg", "Character invited to join corporation"),
+                    ("CorpAppNewMsg", "Character submitted application"),
+                    ("CharAppRejectMsg", "Corp application rejected message"),
+                    (
+                        "CorpAppRejectCustomMsg",
+                        "Corp application rejected custom message",
+                    ),
+                    ("CharAppWithdrawMsg", "Character withdrew application"),
+                    ("CharLeftCorpMsg", "Character leaves corporation"),
+                    ("CorporationGoalClosed", "Corporation goal closed"),
+                    ("CorporationGoalCompleted", "Corporation goal completed"),
+                    ("CorporationGoalCreated", "Corporation goal created"),
+                    (
+                        "MoonminingAutomaticFracture",
+                        "Moon mining automatic fracture triggered",
+                    ),
+                    (
+                        "MoonminingExtractionCancelled",
+                        "Moon mining extraction cancelled",
+                    ),
+                    ("MoonminingExtractionFinished", "Moon mining extraction finished"),
+                    ("MoonminingExtractionStarted", "Moon mining extraction started"),
+                    ("MoonminingLaserFired", "Moonmining laser fired"),
+                    ("SkyhookDeployed", "Skyhook deployed"),
+                    ("SkyhookDestroyed", "Skyhook destroyed"),
+                    ("SkyhookLostShields", "Skyhook lost shields"),
+                    ("SkyhookOnline", "Skyhook online"),
+                    ("SkyhookUnderAttack", "Skyhook under attack"),
+                    ("OrbitalAttacked", "Customs office attacked"),
+                    ("OrbitalReinforced", "Customs office reinforced"),
+                    ("SovAllClaimAquiredMsg", "Sovereignty claim acknowledgment"),
+                    ("SovAllClaimLostMsg", "Sovereignty lost"),
+                    ("AllAnchoringMsg", "Structure anchoring in alliance space"),
+                    ("EntosisCaptureStarted", "Sovereignty entosis capture started"),
+                    ("SovStructureDestroyed", "Sovereignty structure destroyed"),
+                    ("SovStructureReinforced", "Sovereignty structure reinforced"),
+                    (
+                        "SovCommandNodeEventStarted",
+                        "Sovereignty command node event started",
+                    ),
+                    ("TowerAlertMsg", "Starbase attacked"),
+                    ("TowerRefueledExtra", "Starbase refueled (BETA)"),
+                    ("TowerReinforcedExtra", "Starbase reinforced (BETA)"),
+                    ("TowerResourceAlertMsg", "Starbase fuel alert"),
+                    ("OwnershipTransferred", "Upwell structure ownership transferred"),
+                    ("StructureAnchoring", "Upwell structure anchoring"),
+                    ("StructureDestroyed", "Upwell structure destroyed"),
+                    ("StructureFuelAlert", "Upwell structure fuel alert"),
+                    ("StructureJumpFuelAlert", "Upwell structure jump fuel alert"),
+                    ("StructureLostArmor", "Upwell structure lost armor"),
+                    ("StructureLostShields", "Upwell structure lost shields"),
+                    ("StructureLowReagentsAlert", "Structure low reagents alert"),
+                    ("StructureNoReagentsAlert", "Structure no reagents alert"),
+                    ("StructureOnline", "Upwell structure went online"),
+                    ("StructureRefueledExtra", "Upwell structure refueled"),
+                    (
+                        "StructuresReinforcementChanged",
+                        "Upwell structure reinforcement time changed",
+                    ),
+                    (
+                        "StructureServicesOffline",
+                        "Upwell structure services went offline",
+                    ),
+                    ("StructureUnanchoring", "Upwell structure unanchoring"),
+                    ("StructureUnderAttack", "Upwell structure is under attack"),
+                    ("StructureWentHighPower", "Upwell structure went high power"),
+                    ("StructureWentLowPower", "Upwell structure went low power"),
+                    ("AcceptedAlly", "War accepted ally"),
+                    (
+                        "AllWarCorpJoinedAllianceMsg",
+                        "Alliance war corporation joined alliance message",
+                    ),
+                    ("AllWarSurrenderMsg", "Alliance war surrender message"),
+                    ("AllyJoinedWarAggressorMsg", "War ally joined aggressor"),
+                    ("AllyJoinedWarAllyMsg", "War ally joined ally"),
+                    ("AllyJoinedWarDefenderMsg", "War ally joined defender"),
+                    ("CorpWarSurrenderMsg", "War party surrendered"),
+                    ("CorpBecameWarEligible", "War corporation became eligible"),
+                    ("CorpNoLongerWarEligible", "War corporation no longer eligible"),
+                    ("DeclareWar", "War declared"),
+                    ("WarHQRemovedFromSpace", "War HQ removed from space"),
+                    ("WarInvalid", "War invalid"),
+                    (
+                        "MercOfferedNegotiationMsg",
+                        "War mercenary offered negotiation message",
+                    ),
+                    ("MercOfferRetractedMsg", "War mercenary offer retracted message"),
+                    ("OfferedSurrender", "War offered surrender"),
+                    ("OfferedToAlly", "War offered to become ally"),
+                    ("WarAdopted", "War adopted"),
+                    ("WarDeclared", "War declared"),
+                    ("WarInherited", "War inherited"),
+                    ("WarRetractedByConcord", "War retracted by Concord"),
+                    ("WarSurrenderOfferMsg", "War surrender offered"),
+                ],
+                default=[
+                    "OrbitalAttacked",
+                    "OrbitalReinforced",
+                    "SkyhookDestroyed",
+                    "SkyhookLostShields",
+                    "SkyhookOnline",
+                    "SkyhookUnderAttack",
+                    "SovStructureDestroyed",
+                    "SovStructureReinforced",
+                    "StructureAnchoring",
+                    "StructureDestroyed",
+                    "StructureFuelAlert",
+                    "StructureLostArmor",
+                    "StructureLostShields",
+                    "StructureLowReagentsAlert",
+                    "StructureNoReagentsAlert",
+                    "StructureOnline",
+                    "StructureServicesOffline",
+                    "StructureUnderAttack",
+                    "StructureWentHighPower",
+                    "StructureWentLowPower",
+                    "TowerAlertMsg",
+                    "TowerResourceAlertMsg",
+                ],
+                help_text="Select which type of notifications should be forwarded to this webhook",
+                max_length=1544,
+                verbose_name="notification types",
+            ),
+        ),
+    ]

structures/models/owners.py

@@ -703,7 +703,7 @@ class Owner(models.Model):
 
             s.eve_moon = celestial.eve_object
             s.save()
-            logger.info("%s: Resolved moon for Metenox: %d", self, s.name)
+            logger.info("%s: Resolved moon for Metenox: %s", self, s.name)
 
     def _fetch_custom_offices(self, token: Token) -> bool:
         """Fetch custom offices from ESI for this owner.

structures/static/structures/js/public.js

@@ -92,41 +92,47 @@ $(document).ready(function () {
                 {
                     idx: pocos_idx_start,
                     title: filterTitles.constellation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 1,
                     title: filterTitles.planet_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 2,
                     title: filterTitles.space_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 3,
                     title: filterTitles.region,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 4,
                     title: filterTitles.solar_system,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 5,
                     title: filterTitles.corporation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 6,
                     title: filterTitles.alliance,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 7,
                     title: filterTitles.access,
+                    maxWidth: "10em",
                 },
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
     });
 });

structures/static/structures/js/structures.js

@@ -22,7 +22,7 @@ $(document).ready(function () {
     $('a[href="#' + tabId + '"]').tab("show");
 
     /* remember last selected tab */
-    $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) {
+    $('a[data-bs-toggle="tab"]').on("shown.bs.tab", function (e) {
         const selectedTabId = $(e.target).attr("href").substr(1);
         setCookie(COOKIE_LAST_TAB_ID, selectedTabId, COOKIE_LAST_TAB_HOURS);
     });
@@ -155,6 +155,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -242,6 +243,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -328,6 +330,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -455,6 +458,7 @@ $(document).ready(function () {
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
         createdRow: function (row, data, dataIndex) {
             if (data["is_reinforced"]) {

structures/templates/structures/base.html

@@ -1,13 +1,46 @@
-{% extends 'allianceauth/base.html' %}
+{% extends 'allianceauth/base-bs5.html' %}
 {% load i18n %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Structures" %}{% endblock %}
 
+{% block header_nav_brand %}{% translate "Structures" %}{% endblock %}
+
+{% block header_nav_collapse_left %}
+    {% if perms.structures.view_corporation_structures or perms.structures.view_alliance_structures or perms.structures.view_all_structures %}
+        <li class="nav-item">
+            <a class="nav-link {% navactive request 'structures:structure_list' %}" href="{% url 'structures:structure_list' %}">
+                {% translate 'Structure List' %}
+            </a>
+        </li>
+
+        <li class="nav-item">
+            <a class="nav-link {% navactive request 'structures:statistics' %}" href="{% url 'structures:statistics' %}">
+                {% translate 'Statistics' %}
+            </a>
+        </li>
+    {% endif %}
+
+
+    <li class="nav-item me-auto">
+        <a class="nav-link {% navactive request 'structures:public' %}" href="{% url 'structures:public' %}">
+            {% translate 'Public' %}
+        </a>
+    </li>
+
+{% endblock header_nav_collapse_left %}
+
+{% block header_nav_user_character_control %}
+    {% if perms.structures.add_structure_owner %}
+        <li class="nav-item">
+            <a class="nav-link text-success" href="{% url 'structures:add_structure_owner' %}" title="{% translate 'Add new structure owner or add new sync character to an existing structure owner' %}">
+                <i class="fa-solid fa-plus"></i>
+            </a>
+        </li>
+    {% endif %}
+    <div class="vr"></div>
+{% endblock header_nav_user_character_control %}
+
 {% block content %}
-    <br />
-    <div>
-        {% include 'structures/partials/menu.html' %}
-        <h2 class="text-left">{{ page_title }}</h2>
         {% block details %}{% endblock %}
-    </div>
 {% endblock %}

structures/templates/structures/modals/poco_details.html

@@ -4,8 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title">{{ structure }}</h4>
+    <h5 class="modal-title">{{ structure }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -13,27 +13,27 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-poco-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-poco-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-poco-reinforcement" aria-controls="access" role="tab" data-toggle="tab">
-                {% translate "Reinforcement Time" %}
-            </a>
+            <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-poco-reinforcement" aria-controls="access" role="tab" data-bs-toggle="tab">
+                {% translate "Reinforcement" %}
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-poco-settings" aria-controls="settings" role="tab" data-toggle="tab">
-                {% translate "Tax Rates & Access" %}
-            </a>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-poco-settings" aria-controls="settings" role="tab" data-bs-toggle="tab">
+                {% translate "Tax & Access" %}
+            </button>
         </li>
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-poco-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-poco-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/modals/starbase_detail.html

@@ -4,8 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title">{{structure}}</h4>
+    <h5 class="modal-title">{{structure}}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -13,37 +13,36 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-starbase-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-starbase-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-fuel" aria-controls="fuels" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-fuel" aria-controls="fuels" role="tab" data-bs-toggle="tab">
                 {% translate "Fuel" %} <small>({{ fuel_blocks_count|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-modules" aria-controls="modules" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-modules" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "Modules" %} <small>({{ modules_count }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-settings" aria-controls="settings" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-settings" aria-controls="settings" role="tab" data-bs-toggle="tab">
                 {% translate "Settings" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-access" aria-controls="access" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-access" aria-controls="access" role="tab" data-bs-toggle="tab">
                 {% translate "Access" %}
-            </a>
+            </button>
         </li>
     </ul>
-
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-starbase-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-starbase-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/modals/structure_details.html

@@ -4,10 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
-    </button>
-    <h4 class="modal-title">{{structure.eve_solar_system.name}} - {{structure.name}}</h4>
+    <h5 class="modal-title">{{structure.eve_solar_system.name}} - {{structure.name}}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -15,38 +13,38 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-structure-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-structure-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-services" aria-controls="fuel" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-services" aria-controls="fuel" role="tab" data-bs-toggle="tab">
                 {% translate "Services" %} <small>({{ services_count|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
 
-        <li role="presentation">
-            <a href="#tab-structure-fuel" aria-controls="fuel" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-fuel" aria-controls="fuel" role="tab" data-bs-toggle="tab">
                 {% translate "Fuel" %} <small>({{ fuel_blocks_total|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-ammo" aria-controls="ammo" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-ammo" aria-controls="ammo" role="tab" data-bs-toggle="tab">
                 {% translate "Ammo" %} <small>({{ ammo_total|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-modules" aria-controls="modules" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-modules" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "Modules" %} <small>({{ modules_count }})</small>
-            </a>
+            </button>
         </li>
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-structure-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-structure-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/partials/menu.html

@@ -5,8 +5,8 @@
 <nav class="navbar navbar-default">
     <div class="container-fluid">
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
-                data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+            <button type="button" class="navbar-toggle collapsed" data-bs-toggle="collapse"
+                data-bs-target="#bs-example-navbar-collapse-1" aria-expanded="false">
                 <span class="sr-only">{% translate "Toggle navigation" %}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>

structures/templates/structures/public.html

@@ -5,44 +5,41 @@
 
 {% block details %}
 
-    <span class="pull-right">
-        <form class="form-inline">
-            <select
-                class="form-control"
-                name="character_id"
-                style="height: auto;"
-                onchange="this.form.submit()"
-                title="Character for calculating access and tax">
-                    {% for character in characters %}
-                        <option
-                            value="{{ character.character_id }}"
-                            {% if character.character_id == selected_character.character_id %} selected{% endif %}>
-                                {{ character.character_name }}
-                        </option>
-                    {% endfor %}
-            </select>
-        </form>
-    </span>
 
     <!-- Nav tabs -->
-    <ul id="public-tabs" class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs" role="tablist">
 
-        <li role="presentation" class="active">
-            <a href="#pocos" aria-controls="orbitals" role="tab" data-toggle="tab">
+        <li role="presentation" class="nav-item me-auto">
+            <button class="nav-link active" aria-controls="orbitals" role="tab" data-bs-toggle="tab" data-bs-target="#pocos">
                 {% translate "Customs Offices" %} <small>({{ pocos_count|default:"-" }})</small>
-            </a>
+            </button>
         </li>
 
+        <li role="presentation" class="nav-item">
+            <form class="form-inline">
+                <select
+                    class="form-control"
+                    name="character_id"
+                    style="height: auto;"
+                    onchange="this.form.submit()"
+                    title="Character for calculating access and tax">
+                        {% for character in characters %}
+                            <option
+                                value="{{ character.character_id }}"
+                                {% if character.character_id == selected_character.character_id %} selected{% endif %}>
+                                    {{ character.character_name }}
+                            </option>
+                        {% endfor %}
+                </select>
+            </form>
+        </li>
     </ul>
 
-    <div class="panel panel-default panel-tabs">
-        <div class="panel-body">
-            <div class="tab-content">
-
-                <div role="tabpanel" class="tab-pane active" id="orbitals">
-                    {% include "structures/partials/public/poco_list.html" %}
-                </div>
+    <div class="card card-default card-tabs border-0">
+        <div class="card-body tab-content">
 
+            <div role="tabpanel" class="tab-pane show active" id="orbitals">
+                {% include "structures/partials/public/poco_list.html" %}
             </div>
 
             <p class="text-muted">
@@ -65,16 +62,13 @@
         type="application/javascript"
         src="{% static 'structures/vendor/datatables/plugins/dataTables.rowGroup.min.js' %}">
     </script>
-    <script
-        type="application/javascript"
-        src="{% static 'structures/vendor/datatables/plugins/filterDropDown.min.js' %}">
-    </script>
+    {% include "bundles/filterdropdown-js.html" %}
     <script type="application/javascript" src="{% static 'structures/js/global.js' %}"></script>
     <script type="application/javascript" src="{% static 'structures/js/public.js' %}"></script>
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 
     <link
         rel="stylesheet"