aa-fleetfinder 2.7.0__py3-none-any.whl → 2.7.1__py3-none-any.whl

fleetfinder/locale/zh_Hans/LC_MESSAGES/django.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Fleet Finder 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-fleetfinder/issues\n"
-"POT-Creation-Date: 2025-08-21 15:11+0200\n"
+"POT-Creation-Date: 2025-08-23 16:51+0200\n"
 "PO-Revision-Date: 2025-08-21 13:16+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Chinese (Simplified Han script) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-fleetfinder/zh_Hans/>\n"
@@ -21,8 +21,8 @@ msgstr ""
 "X-Generator: Weblate 5.13\n"
 
 #: fleetfinder/__init__.py:9 fleetfinder/models.py:24
-#: fleetfinder/templates/fleetfinder/base.html:6
-#: fleetfinder/templates/fleetfinder/base.html:10
+#: fleetfinder/templates/fleetfinder/base.html:7
+#: fleetfinder/templates/fleetfinder/base.html:11
 #: fleetfinder/templates/fleetfinder/create-fleet.html:7
 #: fleetfinder/templates/fleetfinder/edit-fleet.html:7
 #: fleetfinder/templates/fleetfinder/fleet-details.html:7
@@ -125,47 +125,47 @@ msgstr "编辑舰队"
 msgid "Fleet details"
 msgstr "舰队细节"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:16
+#: fleetfinder/templates/fleetfinder/fleet-details.html:20
 msgid "Fleet composition"
 msgstr "舰队组成"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:25
-#: fleetfinder/templates/fleetfinder/fleet-details.html:51
+#: fleetfinder/templates/fleetfinder/fleet-details.html:29
+#: fleetfinder/templates/fleetfinder/fleet-details.html:55
 msgid "Ship class"
 msgstr "舰船等级"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:26
+#: fleetfinder/templates/fleetfinder/fleet-details.html:30
 msgid "Count"
 msgstr "计数"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:41
+#: fleetfinder/templates/fleetfinder/fleet-details.html:45
 msgid "Fleet members"
 msgstr "舰队成员"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:50
+#: fleetfinder/templates/fleetfinder/fleet-details.html:54
 msgid "Name"
 msgstr "名字"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:52
+#: fleetfinder/templates/fleetfinder/fleet-details.html:56
 msgid "System"
 msgstr "星系"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:53
+#: fleetfinder/templates/fleetfinder/fleet-details.html:57
 msgid "Action"
 msgstr "行动"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:79
+#: fleetfinder/templates/fleetfinder/fleet-details.html:80
 #, fuzzy
 #| msgid "Fleet members"
 msgid "Fleet boss"
 msgstr "舰队成员"
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:80
+#: fleetfinder/templates/fleetfinder/fleet-details.html:81
 #: fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html:10
 msgid "Kick member from fleet"
 msgstr ""
 
-#: fleetfinder/templates/fleetfinder/fleet-details.html:81
+#: fleetfinder/templates/fleetfinder/fleet-details.html:82
 msgid "An unknown error occurred."
 msgstr ""
 
@@ -259,7 +259,7 @@ msgstr "编辑舰队宣传信息"
 msgid "<h4>Error!</h4><p>There was an error creating the fleet: {error_detail}</p>"
 msgstr "<h4>错误!</h4><p>ESI返回如下错误:{esi_error_message}</p>"
 
-#: fleetfinder/views.py:284
+#: fleetfinder/views.py:284 fleetfinder/views.py:474
 msgid "<h4>Error!</h4><p>Fleet does not exist or is no longer available.</p>"
 msgstr ""
 
@@ -274,25 +274,35 @@ msgstr "<h4>错误!</h4><p>ESI返回如下错误:{esi_error_message}</p>"
 msgid "<h4>Error!</h4><p>There was an error creating the fleet: {ex}</p>"
 msgstr ""
 
-#: fleetfinder/views.py:517
+#: fleetfinder/views.py:510
+#, python-brace-format
+msgid "Fleet with ID {fleet_id} does not exist."
+msgstr ""
+
+#: fleetfinder/views.py:516
+#, python-brace-format
+msgid "Error retrieving fleet composition: {ex}"
+msgstr ""
+
+#: fleetfinder/views.py:546
 msgid "Method not allowed"
 msgstr ""
 
-#: fleetfinder/views.py:527
+#: fleetfinder/views.py:556
 msgid "Member ID required"
 msgstr ""
 
-#: fleetfinder/views.py:546
+#: fleetfinder/views.py:575
 #, fuzzy
 #| msgid "Fleet invitation"
 msgid "Fleet not found"
 msgstr "舰队邀请"
 
-#: fleetfinder/views.py:550
+#: fleetfinder/views.py:579
 msgid "Invalid request data"
 msgstr ""
 
-#: fleetfinder/views.py:554
+#: fleetfinder/views.py:583
 msgid "Member not found in fleet"
 msgstr ""
 

fleetfinder/static/fleetfinder/js/fleetfinder-dashboard.js

@@ -0,0 +1,86 @@
+/* global aaFleetFinderSettings, aaFleetFinderSettingsOverride, objectDeepMerge, fetchGet, fleetfinderBootstrapTooltip, DataTable */
+
+$(document).ready(() => {
+    'use strict';
+
+    const fleetFinderSettings = objectDeepMerge(aaFleetFinderSettings, aaFleetFinderSettingsOverride);
+
+    const table_fleet_overview = $('#table_available-fleets');
+    let dataTable = null;
+
+    /**
+     * Initialize or update the datatable.
+     * If the table already exists, it will be updated with new data.
+     * If it does not exist, a new DataTable will be created.
+     *
+     * @param {Object} data - The fleet data to populate the table.
+     */
+    const initializeOrUpdateTable = (data) => {
+        if (dataTable) {
+            // Update existing table
+            dataTable.clear().rows.add(data).draw();
+        } else {
+            // Initialize new table
+            dataTable = table_fleet_overview.DataTable({
+                language: {
+                    url: fleetFinderSettings.dataTables.languageUrl
+                },
+                data: data,
+                columns: [
+                    {
+                        data: 'fleet_commander',
+                        render: {
+                            _: 'html',
+                            sort: 'sort'
+                        }
+                    },
+                    {
+                        data: 'fleet_name'
+                    },
+                    {
+                        data: 'created_at',
+                    },
+                    {
+                        data: 'actions',
+                        className: 'text-end',
+                    },
+                ],
+                columnDefs: [
+                    {
+                        targets: 2,
+                        render: DataTable.render.date(
+                            fleetFinderSettings.dataTables.datetimeFormat
+                        )
+                    },
+                    {
+                        orderable: false,
+                        targets: [3]
+                    },
+                ],
+                order: [[0, 'asc']],
+                paging: false,
+                initComplete: () => {
+                    // Initialize Bootstrap tooltips
+                    fleetfinderBootstrapTooltip({selector: '#table_available-fleets'});
+                }
+            });
+        }
+    };
+
+    /**
+     * Fetch and update fleet data
+     */
+    const fetchFleetData = () => {
+        fetchGet({url: fleetFinderSettings.dataTables.url.dashboard})
+            .then(initializeOrUpdateTable)
+            .catch((error) => {
+                console.error('Error fetching fleet data:', error);
+            });
+    };
+
+    // Initial load
+    fetchFleetData();
+
+    // Refresh every 30 seconds
+    setInterval(fetchFleetData, 30000);
+});

fleetfinder/static/fleetfinder/js/fleetfinder-dashboard.min.js

@@ -0,0 +1,2 @@
+$(document).ready(()=>{'use strict';const e=objectDeepMerge(aaFleetFinderSettings,aaFleetFinderSettingsOverride),a=$('#table_available-fleets');let t=null;const r=r=>{t?t.clear().rows.add(r).draw():t=a.DataTable({language:{url:e.dataTables.languageUrl},data:r,columns:[{data:'fleet_commander',render:{_:'html',sort:'sort'}},{data:'fleet_name'},{data:'created_at'},{data:'actions',className:'text-end'}],columnDefs:[{targets:2,render:DataTable.render.date(e.dataTables.datetimeFormat)},{orderable:!1,targets:[3]}],order:[[0,'asc']],paging:!1,initComplete:()=>{fleetfinderBootstrapTooltip({selector:'#table_available-fleets'})}})},l=()=>{fetchGet({url:e.dataTables.url.dashboard}).then(r).catch(e=>{console.error('Error fetching fleet data:',e)})};l(),setInterval(l,3e4)});
+//# sourceMappingURL=fleetfinder-dashboard.min.js.map

fleetfinder/static/fleetfinder/js/fleetfinder-dashboard.min.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["$","document","ready","fleetFinderSettings","objectDeepMerge","aaFleetFinderSettings","aaFleetFinderSettingsOverride","table_fleet_overview","dataTable","initializeOrUpdateTable","data","clear","rows","add","draw","DataTable","language","url","dataTables","languageUrl","columns","render","_","sort","className","columnDefs","targets","date","datetimeFormat","orderable","order","paging","initComplete","fleetfinderBootstrapTooltip","selector","fetchFleetData","fetchGet","dashboard","then","catch","error","console","setInterval"],"sources":["fleetfinder-dashboard.js"],"mappings":"AAEAA,EAAEC,UAAUC,MAAM,KACd,aAEA,MAAMC,EAAsBC,gBAAgBC,sBAAuBC,+BAE7DC,EAAuBP,EAAE,2BAC/B,IAAIQ,EAAY,KAShB,MAAMC,EAA2BC,IACzBF,EAEAA,EAAUG,QAAQC,KAAKC,IAAIH,GAAMI,OAGjCN,EAAYD,EAAqBQ,UAAU,CACvCC,SAAU,CACNC,IAAKd,EAAoBe,WAAWC,aAExCT,KAAMA,EACNU,QAAS,CACL,CACIV,KAAM,kBACNW,OAAQ,CACJC,EAAG,OACHC,KAAM,SAGd,CACIb,KAAM,cAEV,CACIA,KAAM,cAEV,CACIA,KAAM,UACNc,UAAW,aAGnBC,WAAY,CACR,CACIC,QAAS,EACTL,OAAQN,UAAUM,OAAOM,KACrBxB,EAAoBe,WAAWU,iBAGvC,CACIC,WAAW,EACXH,QAAS,CAAC,KAGlBI,MAAO,CAAC,CAAC,EAAG,QACZC,QAAQ,EACRC,aAAc,KAEVC,4BAA4B,CAACC,SAAU,gCASjDC,EAAiB,KACnBC,SAAS,CAACnB,IAAKd,EAAoBe,WAAWD,IAAIoB,YAC7CC,KAAK7B,GACL8B,MAAOC,IACJC,QAAQD,MAAM,6BAA8BA,MAKxDL,IAGAO,YAAYP,EAAgB","ignoreList":[]}

fleetfinder/static/fleetfinder/js/fleetfinder-fleet-details.js

@@ -0,0 +1,154 @@
+/* global objectDeepMerge, aaFleetFinderSettings, aaFleetFinderSettingsOverride, fetchGet, fetchPost, fleetfinderBootstrapTooltip */
+
+$(document).ready(() => {
+    'use strict';
+
+    const fleetFinderSettings = objectDeepMerge(aaFleetFinderSettings, aaFleetFinderSettingsOverride);
+
+    /* DataTables
+    ------------------------------------------------------------------------- */
+    const elements = {
+        tableFleetMembers: $('#table-fleet-members'),
+        tableFleetComposition: $('#table-fleet-composition'),
+        kickFleetMemberModal: $('#kick-fleet-member'),
+        kickFleetMemberCharacterName: $('#kick-fleet-member-character-name'),
+        modalButtonConfirmKickFleetMember: $('#modal-button-confirm-kick-fleet-member'),
+        warning: $('#fleetfinder-fleet-details-warning')
+    };
+    const dataTableConfig = {
+        language: {
+            url: fleetFinderSettings.dataTables.languageUrl
+        },
+        paging: false,
+        destroy: true
+    };
+
+    const populateDatatables = () => {
+        fetchGet({
+            url: fleetFinderSettings.dataTables.url.fleetDetails,
+        })
+            .then((data) => {
+                if (data.error) {
+                    elements.warning.removeClass('d-none').text(data.error);
+
+                    return;
+                }
+
+                elements.warning.addClass('d-none');
+
+                elements.tableFleetMembers.DataTable({
+                    ...dataTableConfig,
+                    data: data.fleet_member,
+                    columns: [
+                        {
+                            render: (data, type, row) => {
+                                const fwIcon = '<i class="fa-solid fa-star"></i>';
+
+                                return row.is_fleet_boss ? `${row.character_name} <sup data-bs-tooltip="aa-fleetfinder" title="${fleetFinderSettings.l10n.fleetBoss}"><small>${fwIcon}</small></sup>` : row.character_name;
+                            }
+                        },
+                        {data: 'ship_type_name'},
+                        {data: 'solar_system_name'},
+                        {
+                            render: (data, type, row) => {
+                                const fwIcon = '<i class="fa-solid fa-user-minus"></i>';
+                                const dataAttributes = Object.entries({
+                                    'data-character-id': row.character_id,
+                                    'data-character-name': row.character_name,
+                                    'data-bs-toggle': 'modal',
+                                    'data-bs-target': '#kick-fleet-member',
+                                    'data-bs-tooltip': 'aa-fleetfinder'
+                                }).map(([key, value]) => {
+                                    return `${key}="${value}"`;
+                                }).join(' ');
+
+                                return row.is_fleet_boss ? '' : `<button type="button" class="btn btn-sm btn-danger" ${dataAttributes} title="${fleetFinderSettings.l10n.kickMemberFromFleet}">${fwIcon}</button>`;
+                            },
+                            orderable: false,
+                            searchable: false,
+                            width: '50px',
+                            className: 'text-end'
+                        }
+                    ],
+                    createdRow: (row, data, rowIndex) => {
+                        $(row).attr('data-row-id', rowIndex);
+                        $(row).attr('data-character-id', data.character_id);
+                    },
+                    initComplete: () => {
+                        // Initialize Bootstrap tooltips
+                        fleetfinderBootstrapTooltip({selector: '#table-fleet-members'});
+                    }
+                });
+
+                elements.tableFleetComposition.DataTable({
+                    ...dataTableConfig,
+                    data: data.fleet_composition,
+                    columns: [
+                        {data: 'ship_type_name'},
+                        {data: 'number', className: 'text-right', width: '100px'}
+                    ],
+                    order: [[1, 'desc']]
+                });
+            })
+            .catch((error) => {
+                console.error('Error fetching fleet details:', error);
+            });
+    };
+
+    populateDatatables();
+
+    setInterval(populateDatatables, 30000);
+
+    /* Modals
+    ------------------------------------------------------------------------- */
+    // Handle the kick fleet member modal
+    elements.kickFleetMemberModal
+        .on('show.bs.modal', (event) => {
+            const button = $(event.relatedTarget);
+            const characterId = button.data('character-id');
+            const characterName = button.data('character-name');
+            const link = fleetFinderSettings.dataTables.url.kickFleetMember;
+
+            // Populate the modal content
+            $('#kick-fleet-member-character-name').text(characterName);
+
+            $('#modal-button-confirm-kick-fleet-member')
+                // Remove any previous click handlers to avoid multiple bindings
+                .off('click.kickMember')
+                // Bind the click event for the confirmation button
+                .on('click.kickMember', () => {
+                    fetchPost({
+                        url: link,
+                        csrfToken: fleetFinderSettings.csrfToken,
+                        payload: {
+                            memberId: characterId
+                        },
+                        responseIsJson: true
+                    })
+                        .then(() => {
+                            populateDatatables();
+
+                            $('#kick-fleet-member').modal('hide');
+                        })
+                        .catch((error) => {
+                            console.error('Error kicking fleet member:', error);
+
+                            $('#kick-fleet-member .modal-kick-fleet-member-error')
+                                .removeClass('d-none')
+                                .find('.modal-kick-fleet-member-error-message')
+                                .text(error || fleetFinderSettings.l10n.unknownError);
+                        });
+                });
+        })
+        .on('hide.bs.modal', () => {
+            // Reset modal content
+            $('#kick-fleet-member-character-name').empty();
+            $('#kick-fleet-member .modal-kick-fleet-member-error')
+                .addClass('d-none')
+                .find('.modal-kick-fleet-member-error-message')
+                .empty();
+
+            // Clean up event handler
+            $('#modal-button-confirm-kick-fleet-member').off('click.kickMember');
+        });
+});

fleetfinder/static/fleetfinder/js/fleetfinder-fleet-details.min.js

@@ -0,0 +1,2 @@
+$(document).ready(()=>{'use strict';const e=objectDeepMerge(aaFleetFinderSettings,aaFleetFinderSettingsOverride),t={tableFleetMembers:$('#table-fleet-members'),tableFleetComposition:$('#table-fleet-composition'),kickFleetMemberModal:$('#kick-fleet-member'),kickFleetMemberCharacterName:$('#kick-fleet-member-character-name'),modalButtonConfirmKickFleetMember:$('#modal-button-confirm-kick-fleet-member'),warning:$('#fleetfinder-fleet-details-warning')},a={language:{url:e.dataTables.languageUrl},paging:!1,destroy:!0},r=()=>{fetchGet({url:e.dataTables.url.fleetDetails}).then(r=>{r.error?t.warning.removeClass('d-none').text(r.error):(t.warning.addClass('d-none'),t.tableFleetMembers.DataTable({...a,data:r.fleet_member,columns:[{render:(t,a,r)=>{const l='<i class="fa-solid fa-star"></i>';return r.is_fleet_boss?`${r.character_name} <sup data-bs-tooltip="aa-fleetfinder" title="${e.l10n.fleetBoss}"><small>${l}</small></sup>`:r.character_name}},{data:'ship_type_name'},{data:'solar_system_name'},{render:(t,a,r)=>{const l='<i class="fa-solid fa-user-minus"></i>',m=Object.entries({'data-character-id':r.character_id,'data-character-name':r.character_name,'data-bs-toggle':'modal','data-bs-target':'#kick-fleet-member','data-bs-tooltip':'aa-fleetfinder'}).map(([e,t])=>`${e}="${t}"`).join(' ');return r.is_fleet_boss?'':`<button type="button" class="btn btn-sm btn-danger" ${m} title="${e.l10n.kickMemberFromFleet}">${l}</button>`},orderable:!1,searchable:!1,width:'50px',className:'text-end'}],createdRow:(e,t,a)=>{$(e).attr('data-row-id',a),$(e).attr('data-character-id',t.character_id)},initComplete:()=>{fleetfinderBootstrapTooltip({selector:'#table-fleet-members'})}}),t.tableFleetComposition.DataTable({...a,data:r.fleet_composition,columns:[{data:'ship_type_name'},{data:'number',className:'text-right',width:'100px'}],order:[[1,'desc']]}))}).catch(e=>{console.error('Error fetching fleet details:',e)})};r(),setInterval(r,3e4),t.kickFleetMemberModal.on('show.bs.modal',t=>{const a=$(t.relatedTarget),l=a.data('character-id'),m=a.data('character-name'),o=e.dataTables.url.kickFleetMember;$('#kick-fleet-member-character-name').text(m),$('#modal-button-confirm-kick-fleet-member').off('click.kickMember').on('click.kickMember',()=>{fetchPost({url:o,csrfToken:e.csrfToken,payload:{memberId:l},responseIsJson:!0}).then(()=>{r(),$('#kick-fleet-member').modal('hide')}).catch(t=>{console.error('Error kicking fleet member:',t),$('#kick-fleet-member .modal-kick-fleet-member-error').removeClass('d-none').find('.modal-kick-fleet-member-error-message').text(t||e.l10n.unknownError)})})}).on('hide.bs.modal',()=>{$('#kick-fleet-member-character-name').empty(),$('#kick-fleet-member .modal-kick-fleet-member-error').addClass('d-none').find('.modal-kick-fleet-member-error-message').empty(),$('#modal-button-confirm-kick-fleet-member').off('click.kickMember')})});
+//# sourceMappingURL=fleetfinder-fleet-details.min.js.map

fleetfinder/static/fleetfinder/js/fleetfinder-fleet-details.min.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["$","document","ready","fleetFinderSettings","objectDeepMerge","aaFleetFinderSettings","aaFleetFinderSettingsOverride","elements","tableFleetMembers","tableFleetComposition","kickFleetMemberModal","kickFleetMemberCharacterName","modalButtonConfirmKickFleetMember","warning","dataTableConfig","language","url","dataTables","languageUrl","paging","destroy","populateDatatables","fetchGet","fleetDetails","then","data","error","removeClass","text","addClass","DataTable","fleet_member","columns","render","type","row","fwIcon","is_fleet_boss","character_name","l10n","fleetBoss","dataAttributes","Object","entries","character_id","map","key","value","join","kickMemberFromFleet","orderable","searchable","width","className","createdRow","rowIndex","attr","initComplete","fleetfinderBootstrapTooltip","selector","fleet_composition","order","catch","console","setInterval","on","event","button","relatedTarget","characterId","characterName","link","kickFleetMember","off","fetchPost","csrfToken","payload","memberId","responseIsJson","modal","find","unknownError","empty"],"sources":["fleetfinder-fleet-details.js"],"mappings":"AAEAA,EAAEC,UAAUC,MAAM,KACd,aAEA,MAAMC,EAAsBC,gBAAgBC,sBAAuBC,+BAI7DC,EAAW,CACbC,kBAAmBR,EAAE,wBACrBS,sBAAuBT,EAAE,4BACzBU,qBAAsBV,EAAE,sBACxBW,6BAA8BX,EAAE,qCAChCY,kCAAmCZ,EAAE,2CACrCa,QAASb,EAAE,uCAETc,EAAkB,CACpBC,SAAU,CACNC,IAAKb,EAAoBc,WAAWC,aAExCC,QAAQ,EACRC,SAAS,GAGPC,EAAqB,KACvBC,SAAS,CACLN,IAAKb,EAAoBc,WAAWD,IAAIO,eAEvCC,KAAMC,IACCA,EAAKC,MACLnB,EAASM,QAAQc,YAAY,UAAUC,KAAKH,EAAKC,QAKrDnB,EAASM,QAAQgB,SAAS,UAE1BtB,EAASC,kBAAkBsB,UAAU,IAC9BhB,EACHW,KAAMA,EAAKM,aACXC,QAAS,CACL,CACIC,OAAQ,CAACR,EAAMS,EAAMC,KACjB,MAAMC,EAAS,mCAEf,OAAOD,EAAIE,cAAgB,GAAGF,EAAIG,+DAA+DnC,EAAoBoC,KAAKC,qBAAqBJ,kBAAyBD,EAAIG,iBAGpL,CAACb,KAAM,kBACP,CAACA,KAAM,qBACP,CACIQ,OAAQ,CAACR,EAAMS,EAAMC,KACjB,MAAMC,EAAS,yCACTK,EAAiBC,OAAOC,QAAQ,CAClC,oBAAqBR,EAAIS,aACzB,sBAAuBT,EAAIG,eAC3B,iBAAkB,QAClB,iBAAkB,qBAClB,kBAAmB,mBACpBO,IAAI,EAAEC,EAAKC,KACH,GAAGD,MAAQC,MACnBC,KAAK,KAER,OAAOb,EAAIE,cAAgB,GAAK,uDAAuDI,YAAyBtC,EAAoBoC,KAAKU,wBAAwBb,cAErKc,WAAW,EACXC,YAAY,EACZC,MAAO,OACPC,UAAW,aAGnBC,WAAY,CAACnB,EAAKV,EAAM8B,KACpBvD,EAAEmC,GAAKqB,KAAK,cAAeD,GAC3BvD,EAAEmC,GAAKqB,KAAK,oBAAqB/B,EAAKmB,eAE1Ca,aAAc,KAEVC,4BAA4B,CAACC,SAAU,4BAI/CpD,EAASE,sBAAsBqB,UAAU,IAClChB,EACHW,KAAMA,EAAKmC,kBACX5B,QAAS,CACL,CAACP,KAAM,kBACP,CAACA,KAAM,SAAU4B,UAAW,aAAcD,MAAO,UAErDS,MAAO,CAAC,CAAC,EAAG,cAGnBC,MAAOpC,IACJqC,QAAQrC,MAAM,gCAAiCA,MAI3DL,IAEA2C,YAAY3C,EAAoB,KAKhCd,EAASG,qBACJuD,GAAG,gBAAkBC,IAClB,MAAMC,EAASnE,EAAEkE,EAAME,eACjBC,EAAcF,EAAO1C,KAAK,gBAC1B6C,EAAgBH,EAAO1C,KAAK,kBAC5B8C,EAAOpE,EAAoBc,WAAWD,IAAIwD,gBAGhDxE,EAAE,qCAAqC4B,KAAK0C,GAE5CtE,EAAE,2CAEGyE,IAAI,oBAEJR,GAAG,mBAAoB,KACpBS,UAAU,CACN1D,IAAKuD,EACLI,UAAWxE,EAAoBwE,UAC/BC,QAAS,CACLC,SAAUR,GAEdS,gBAAgB,IAEftD,KAAK,KACFH,IAEArB,EAAE,sBAAsB+E,MAAM,UAEjCjB,MAAOpC,IACJqC,QAAQrC,MAAM,8BAA+BA,GAE7C1B,EAAE,qDACG2B,YAAY,UACZqD,KAAK,0CACLpD,KAAKF,GAASvB,EAAoBoC,KAAK0C,oBAI/DhB,GAAG,gBAAiB,KAEjBjE,EAAE,qCAAqCkF,QACvClF,EAAE,qDACG6B,SAAS,UACTmD,KAAK,0CACLE,QAGLlF,EAAE,2CAA2CyE,IAAI","ignoreList":[]}

fleetfinder/static/fleetfinder/js/fleetfinder.min.js

@@ -1,2 +1,2 @@
-const fleetfinderBootstrapTooltip=({selector:o="body",namespace:e="aa-fleetfinder"})=>{document.querySelectorAll(`${o} [data-bs-tooltip="${e}"]`).forEach(o=>new bootstrap.Tooltip(o))};
+'use strict';const fleetfinderBootstrapTooltip=({selector:t='body',namespace:e='aa-fleetfinder'})=>{document.querySelectorAll(`${t} [data-bs-tooltip="${e}"]`).forEach(t=>new bootstrap.Tooltip(t))};
 //# sourceMappingURL=fleetfinder.min.js.map

fleetfinder/static/fleetfinder/js/fleetfinder.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["fleetfinder.js"],"names":["fleetfinderBootstrapTooltip","selector","namespace","document","querySelectorAll","forEach","bootstrap","Tooltip","tooltipTriggerEl"],"mappings":"AAiBA,MAAMA,4BAA8B,CAAA,CAAEC,SAAAA,EAAW,OAAQC,UAAAA,EAAY,gBAAiB,KAClFC,SAASC,oBAAoBH,uBAA8BC,KAAa,EACnEG,QAAQ,GACE,IAAIC,UAAUC,QAAQC,CAAgB,CAChD,CACT"}
+{"version":3,"names":["fleetfinderBootstrapTooltip","selector","namespace","document","querySelectorAll","forEach","tooltipTriggerEl","bootstrap","Tooltip"],"sources":["fleetfinder.js"],"mappings":"AAGA,aAcA,MAAMA,4BAA8B,EAAEC,WAAW,OAAQC,YAAY,qBACjEC,SAASC,iBAAiB,GAAGH,uBAA8BC,OACtDG,QAASC,GACC,IAAIC,UAAUC,QAAQF","ignoreList":[]}

fleetfinder/tasks.py

@@ -306,10 +306,10 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
 
     try:
         fleet = Fleet.objects.get(fleet_id=fleet_id)
-    except Fleet.DoesNotExist:
+    except Fleet.DoesNotExist as exc:
         logger.error(f"Fleet with ID {fleet_id} not found")
 
-        return None
+        raise Fleet.DoesNotExist(f"Fleet with ID {fleet_id} not found.") from exc
 
     logger.info(
         f'Getting fleet composition for fleet "{fleet.name}" '
@@ -342,8 +342,14 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
             f"Found {len(all_ids)} unique IDs to fetch names for in fleet {fleet_id}"
         )
 
-        # Process IDs in chunks to avoid ESI limits
-        chunk_size = 500
+        # Process IDs in chunks of 1000 to avoid ESI limits.
+        # ESI has a limit of 1000 IDs per request, so we will chunk the requests,
+        # even though there is a theoretical limit of 768 unique IDs per fleet,
+        # so we never should hit the ESI limit.
+        # But to be on the safe side, we will chunk the requests in case CCP decides
+        # to change the fleet limit in the future, we will use a chunk size of 1000,
+        # which is the maximum allowed by ESI for the `post_universe_names` endpoint.
+        chunk_size = 1000
         ids_to_name = []
         all_ids_list = list(all_ids)
 
@@ -376,4 +382,6 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
     except Exception as e:  # pylint: disable=broad-exception-caught
         logger.error(f"Failed to get fleet composition for fleet {fleet_id}: {e}")
 
-        return None
+        raise RuntimeError(
+            f"Failed to get fleet composition for fleet {fleet_id} : {str(e)}"
+        ) from e

fleetfinder/templates/fleetfinder/base.html

@@ -1,6 +1,7 @@
 {% extends "allianceauth/base-bs5.html" %}
 
 {% load i18n %}
+{% load aa_i18n %}
 
 {% block page_title %}
     {% translate "Fleet Finder" %}
@@ -22,6 +23,16 @@
 {% block content %}
     <div class="aa-fleetfinder">
         <div class="aa-fleetfinder-body">
+            {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
+            <script>
+                const aaFleetFinderSettings = {
+                    dataTables: {
+                        languageUrl: "{{ DT_LANG_PATH }}",
+                        datetimeFormat: 'YYYY-MM-DD, HH:mm',
+                    }
+                }
+            </script>
             {% block aa_fleetfinder_body %}{% endblock %}
         </div>
 

fleetfinder/templates/fleetfinder/bundles/js/fleetfinder-js.html

@@ -1,3 +1,9 @@
 {% load sri %}
 
 {% sri_static "fleetfinder/js/fleetfinder.min.js" %}
+
+{% if view %}
+    {% with "fleetfinder/js/fleetfinder-"|add:view|add:".min.js" as script_path %}
+        {% sri_static script_path %}
+    {% endwith %}
+{% endif %}

fleetfinder/templates/fleetfinder/dashboard.html

@@ -38,91 +38,16 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/moment-js.html" with locale=True %}
-    {% include "fleetfinder/bundles/js/fleetfinder-js.html" %}
-
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
 
     <script>
-        /* global fetchGet, fleetfinderBootstrapTooltip, DataTable */
-        'use strict';
-
-        $(document).ready(() => {
-            const DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
-            const table_fleet_overview = $('#table_available-fleets');
-            let dataTable = null;
-
-            /**
-             * Initialize or update the datatable.
-             * If the table already exists, it will be updated with new data.
-             * If it does not exist, a new DataTable will be created.
-             *
-             * @param {Object} data - The fleet data to populate the table.
-             */
-            const initializeOrUpdateTable = (data) => {
-                if (dataTable) {
-                    // Update existing table
-                    dataTable.clear().rows.add(data).draw();
-                } else {
-                    // Initialize new table
-                    dataTable = table_fleet_overview.DataTable({
-                        language: {
-                            url: '{{ DT_LANG_PATH }}'
-                        },
-                        data: data,
-                        columns: [
-                            {
-                                data: 'fleet_commander',
-                                render: {
-                                    _: 'html',
-                                    sort: 'sort'
-                                }
-                            },
-                            {
-                                data: 'fleet_name'
-                            },
-                            {
-                                data: 'created_at',
-                            },
-                            {
-                                data: 'actions',
-                                className: 'text-end',
-                            },
-                        ],
-                        columnDefs: [
-                            {
-                                targets: 2,
-                                render: DataTable.render.date(DATETIME_FORMAT)
-                            },
-                            {
-                                orderable: false,
-                                targets: [3]
-                            },
-                        ],
-                        order: [[0, 'asc']],
-                        paging: false
-                    });
+        const aaFleetFinderSettingsOverride = {
+            dataTables: {
+                url: {
+                    dashboard: '{% url "fleetfinder:ajax_dashboard" %}'
                 }
-
-                // Initialize Bootstrap tooltips
-                fleetfinderBootstrapTooltip({selector: '#table_available-fleets'});
-            };
-
-            /**
-             * Fetch and update fleet data
-             */
-            const fetchFleetData = () => {
-                fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
-                    .then(initializeOrUpdateTable)
-                    .catch((error) => {
-                        console.error('Error fetching fleet data:', error);
-                    });
-            };
-
-            // Initial load
-            fetchFleetData();
-
-            // Refresh every 30 seconds
-            setInterval(fetchFleetData, 30000);
-        });
+            }
+        };
     </script>
+
+    {% include "fleetfinder/bundles/js/fleetfinder-js.html" with view="dashboard" %}
 {% endblock %}