aa-fleetfinder 2.5.1__tar.gz → 2.6.0__tar.gz

{aa_fleetfinder-2.5.1 → aa_fleetfinder-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-fleetfinder
-Version: 2.5.1
+Version: 2.6.0
 Summary: Fleet finder plugin for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-fleetfinder/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-fleetfinder/blob/master/README.md
@@ -701,7 +701,7 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.10
 Requires-Dist: allianceauth-app-utils>=1.14.2
-Requires-Dist: allianceauth<5,>=4.6
+Requires-Dist: allianceauth<5,>=4.9
 Requires-Dist: django-esi>=7.0.1
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'

{aa_fleetfinder-2.5.1 → aa_fleetfinder-2.6.0}/fleetfinder/__init__.py

@@ -5,7 +5,7 @@ Initialize the app
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.5.1"
+__version__ = "2.6.0"
 __title__ = _("Fleet Finder")
 __verbose_name__ = "Fleet Finder for Alliance Auth"
 

{aa_fleetfinder-2.5.1 → aa_fleetfinder-2.6.0}/fleetfinder/templates/fleetfinder/dashboard.html

@@ -51,52 +51,57 @@
             const DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
             const table_fleet_overview = $('#table_available-fleets');
 
-            const fleetfinderFleetsTable = table_fleet_overview.DataTable({
-                language: {
-                    url: '{{ DT_LANG_PATH }}'
-                },
-                ajax: {
-                    url: "{% url 'fleetfinder:ajax_dashboard' %}",
-                    dataSrc: '',
-                    cache: false
-                },
-                columns: [
-                    {
-                        data: 'fleet_commander',
-                        render: {
-                            _: 'html',
-                            sort: 'sort'
-                        }
-                    },
-                    {data: 'fleet_name'},
-                    {
-                        data: 'created_at',
-                    },
-                    {data: 'join'},
-                    {% if perms.fleetfinder.manage_fleets %}
-                        {data: 'details'},
-                        {data: 'edit'},
-                    {% endif %}
-                ],
-                columnDefs: [
-                    {
-                        targets: 2,
-                        render: DataTable.render.date(DATETIME_FORMAT)
-                    },
-                    {
-                        orderable: false,
-                        targets: [3]
-                    },
-                    {% if perms.fleetfinder.manage_fleets %}
-                        {
-                            orderable: false,
-                            targets: [4, 5]
+            /**
+             * Initialize the datatable for fleet overview
+             */
+            fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
+                .then((data) => {
+                    table_fleet_overview.DataTable({
+                        language: {
+                            url: '{{ DT_LANG_PATH }}'
                         },
-                    {% endif %}
-                ],
-                order: [[0, 'asc']],
-                paging: false
-            });
+                        data: data,
+                        columns: [
+                            {
+                                data: 'fleet_commander',
+                                render: {
+                                    _: 'html',
+                                    sort: 'sort'
+                                }
+                            },
+                            {data: 'fleet_name'},
+                            {
+                                data: 'created_at',
+                            },
+                            {data: 'join'},
+                            {% if perms.fleetfinder.manage_fleets %}
+                                {data: 'details'},
+                                {data: 'edit'},
+                            {% endif %}
+                        ],
+                        columnDefs: [
+                            {
+                                targets: 2,
+                                render: DataTable.render.date(DATETIME_FORMAT)
+                            },
+                            {
+                                orderable: false,
+                                targets: [3]
+                            },
+                            {% if perms.fleetfinder.manage_fleets %}
+                                {
+                                    orderable: false,
+                                    targets: [4, 5]
+                                },
+                            {% endif %}
+                        ],
+                        order: [[0, 'asc']],
+                        paging: false
+                    });
+                })
+                .catch((error) => {
+                    console.error('Error fetching fleet data:', error);
+                });
 
             /**
              * Refresh the datatable information every 30 seconds
@@ -108,7 +113,7 @@
              * reload datatable "fleetfinderFleetsTable"
              */
             const reloadDataTable = () => {
-                let dt = Date.now() - expectedReloadDatatable; // The drift (positive for overshooting)
+                const dt = Date.now() - expectedReloadDatatable; // The drift (positive for overshooting)
 
                 if (dt > intervalReloadDatatable) {
                     // Something awful happened. Maybe the browser (tab) was inactive?
@@ -120,7 +125,15 @@
                     );
                 }
 
-                fleetfinderFleetsTable.ajax.reload();
+                fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
+                    .then((newData) => {
+                        const dataTable = table_fleet_overview.DataTable();
+
+                        dataTable.clear().rows.add(newData).draw();
+                    })
+                    .catch((error) => {
+                        console.error('Error fetching updated data:', error);
+                    });
 
                 expectedReloadDatatable += intervalReloadDatatable;
 

{aa_fleetfinder-2.5.1 → aa_fleetfinder-2.6.0}/fleetfinder/templates/fleetfinder/fleet-details.html

@@ -78,7 +78,10 @@
             const tabe_fleet_composition = $('#table_fleet_composition');
 
             const populateDatatables = () => {
-                $.get('{% url "fleetfinder:ajax_fleet_details" fleet_id %}', (data) => {
+                fetchGet({
+                    url: '{% url "fleetfinder:ajax_fleet_details" fleet_id %}'
+                })
+                .then((data) => {
                     table_fleet_members.DataTable({
                         language: {
                             url: '{{ DT_LANG_PATH }}'
@@ -106,6 +109,9 @@
                         ],
                         order: [[1, 'desc']]
                     });
+                })
+                .catch((error) => {
+                    console.error('Error fetching fleet details:', error);
                 });
             };
 

{aa_fleetfinder-2.5.1 → aa_fleetfinder-2.6.0}/pyproject.toml

@@ -38,7 +38,7 @@ dynamic = [
     "version",
 ]
 dependencies = [
-    "allianceauth>=4.6,<5",
+    "allianceauth>=4.9,<5",
     "allianceauth-app-utils>=1.14.2",
     "django-esi>=7.0.1",
 ]