aa-ledger 0.9.8__py3-none-any.whl → 0.9.9.1__py3-none-any.whl

ledger/tests/testdata/esi.json

@@ -353,8 +353,7 @@
                "owner_id":1002,
                "planet_id":4001,
                "solar_system_id":30004783,
-               "upgrade_level":5,
-               "type_id":13
+               "upgrade_level":5
             }
          ]
       },

ledger/tests/testdata/eveuniverse.json

@@ -44,6 +44,12 @@
             "name": "Arkonor",
             "published": true
         },
+        {
+            "eve_category_id": 25,
+            "id": 465,
+            "name": "Ice",
+            "published": true
+        },
         {
             "eve_category_id": 42,
             "id": 1033,
@@ -176,30 +182,30 @@
             "radius": 1,
             "volume": 16
         },
-         {
-            "id":2268,
-            "name":"Aqueous Liquids",
-            "last_updated":"2025-01-02 16:22:40.192442",
-            "capacity":0,
-            "icon_id":"10012",
+        {
+            "id": 2268,
+            "name": "Aqueous Liquids",
+            "last_updated": "2025-03-10 21:17:24.708968",
+            "capacity": 0,
+            "icon_id": 10012,
             "mass": 0,
             "packaged_volume": 0.005,
             "portion_size": 1,
             "radius": 1,
             "published": 1,
             "volume": 0.005,
-            "eve_graphic_id":null,
+            "eve_graphic_id": null,
             "eve_group_id": 1033,
             "eve_market_group_id": null,
-            "enabled_sections": 13,
-            "description":"The abundance of water on terrestrial planets is often a misconception: What many refer to offhandedly as \"water\" is often an amalgamation of many liquids, microscopic particles, and saturated compounds combined with water and other liquids. Aqueous liquids represent those liquids from which pure water can be separated easily from waste or hazardous particles, but only using the proper equipment."
-         },
-         {
+            "enabled_sections": 29,
+            "description": "The abundance of water on terrestrial planets is often a misconception: What many refer to offhandedly as \"water\" is often an amalgamation of many liquids, microscopic particles, and saturated compounds combined with water and other liquids. Aqueous liquids represent those liquids from which pure water can be separated easily from waste or hazardous particles, but only using the proper equipment."
+        },
+        {
             "id": 2309,
             "name":"Ionic Solutions",
             "last_updated":"2025-01-02 16:22:40.805952",
             "capacity": 0,
-            "icon_id":"10014",
+            "icon_id":10014,
             "mass": 0,
             "packaged_volume": 0.005,
             "portion_size": 1,
@@ -211,13 +217,13 @@
             "eve_market_group_id": null,
             "enabled_sections": 13,
             "description":"An electrolyte found in a raw, natural form is called an ionic solution, especially in terms of planetary astronomy. Only after a lengthy process of extraction and refining can the resulting fluid go on to be used for medical, industrial, or nutritive applications."
-         },
-         {
+        },
+        {
             "id": 2390,
             "name":"Electrolytes",
             "last_updated":"2024-09-27 14:25:56.675992",
             "capacity": 0.0,
-            "icon_id":"10019",
+            "icon_id": 10019,
             "mass": 0,
             "packaged_volume": 0.19,
             "portion_size": 1,
@@ -229,13 +235,13 @@
             "eve_market_group_id": null,
             "enabled_sections": 0,
             "description":"This conductive liquid is able to carry an electrical current due to its unique ionic properties, making it ideal for use as a reactive coolant, a high-energy fuel, or a transference medium for power plants."
-         },
-         {
+        },
+        {
             "id": 2534,
             "name":"Gas Launchpad",
             "last_updated":"2024-09-27 14:25:56.675992",
             "capacity": 0.0,
-            "icon_id":"10019",
+            "icon_id": 10019,
             "mass": 0,
             "packaged_volume": 0.19,
             "portion_size": 1,
@@ -245,10 +251,10 @@
             "eve_graphic_id": null,
             "eve_group_id": 7,
             "eve_market_group_id": null,
-            "enabled_sections": 0,
+            "enabled_sections": 29,
             "description":"."
-         },
-         {
+        },
+        {
             "id": 2557,
             "name":"Storm Launchpad",
             "last_updated":"2024-09-27 14:25:56.675992",
@@ -265,8 +271,8 @@
             "eve_market_group_id": null,
             "enabled_sections": 0,
             "description":"."
-         },
-         {
+        },
+        {
             "id": 3060,
             "name":"Gas Extractor Control Unit",
             "last_updated":"2024-09-27 14:25:56.675992",
@@ -281,15 +287,15 @@
             "eve_graphic_id": null,
             "eve_group_id": 7,
             "eve_market_group_id": null,
-            "enabled_sections": 0,
+            "enabled_sections": 29,
             "description":"."
-         },
-         {
+        },
+        {
             "id": 3645,
             "name":"Water",
             "last_updated":"2025-01-02 16:16:50.272300",
             "capacity": 0,
-            "icon_id":"1178",
+            "icon_id": 1178,
             "mass": 0,
             "packaged_volume": 0.19,
             "portion_size": 1,
@@ -301,47 +307,83 @@
             "eve_market_group_id": null,
             "enabled_sections": 13,
             "description":"Water is one of the basic conditional elements of human survival. Most worlds have this compound in relative short supply and hence must rely on starship freight."
-         },
-         {
+        },
+        {
             "id": 9832,
             "name":"Coolant",
             "last_updated":"2025-01-02 16:16:34.532296",
             "capacity": 0,
-            "icon_id":"1360",
+            "icon_id": 1360,
             "mass": 0,
             "packaged_volume":0.75,
             "portion_size": 1,
             "radius": 1,
             "published": 1,
-            "volume":0.75,
+            "volume": 0.75,
             "eve_graphic_id":null,
             "eve_group_id": 1034,
             "eve_market_group_id": null,
             "enabled_sections": 13,
             "description":"This specially blended fluid is ideal for transferring thermal energy away from sensitive machinery or computer components, rerouting it to heat sinks so it can be eliminated from the system."
-         }
+        },
+        {
+            "id": 16268,
+            "name": "Gelidus",
+            "last_updated": "2025-03-09 18:51:27.959352",
+            "capacity": 0,
+            "icon_id": 2558,
+            "mass": 1000,
+            "packaged_volume": 1000,
+            "portion_size": 1,
+            "radius": 1,
+            "published": 1,
+            "volume": 1000,
+            "eve_graphic_id": null,
+            "eve_group_id": 465,
+            "eve_market_group_id": null,
+            "enabled_sections": 24,
+            "description": "Fairly rare and very valuable, Gelidus-type ice formations are a large-scale source of strontium clathrates, one of the rarest ice solids found in the universe, in addition to which they contain unusually large concentrations of heavy water and liquid ozone.\r\n\r\nAvailable in <color='0xFFFF0000'>0.0<\/color> security status solar systems or lower."
+        },
+        {
+            "id": 28437,
+            "name": "Compressed Gelidus",
+            "last_updated": "2025-03-09 18:51:34.183513",
+            "capacity": 0,
+            "icon_id": 3328,
+            "mass": 1000,
+            "packaged_volume": 100,
+            "portion_size": 1,
+            "radius": 1,
+            "published": 1,
+            "volume": 100,
+            "eve_graphic_id": null,
+            "eve_group_id": 465,
+            "eve_market_group_id": null,
+            "enabled_sections": 24,
+            "description": "Fairly rare and very valuable, Gelidus-type ice formations are a large-scale source of strontium clathrates, one of the rarest ice solids found in the universe, in addition to which they contain unusually large concentrations of heavy water and liquid ozone.\r\n\r\nThis material is compressed and a much more compact form of the original material."
+        }
     ],
     "EvePlanet": [
         {
-            "id":"4001",
-            "name":"Test Planet I",
-            "last_updated":"2024-02-14 22:38:23.813892",
-            "position_x":"1539254041784",
-            "position_y":"-233186718285",
-            "position_z":"-634258364444",
-            "eve_solar_system_id":"30004783",
-            "eve_type_id":"13",
+            "id": 4001,
+            "name": "Test Planet I",
+            "last_updated": "2024-02-14 22:38:23.813892",
+            "position_x": 1539254041784,
+            "position_y": -233186718285,
+            "position_z": -634258364444,
+            "eve_solar_system_id": 30004783,
+            "eve_type_id": 13,
             "enabled_sections": 0
         },
         {
-            "id":"4002",
-            "name":"Test Planet I",
-            "last_updated":"2024-02-14 22:38:23.813892",
-            "position_x":"1539254041784",
-            "position_y":"-233186718285",
-            "position_z":"-634258364444",
-            "eve_solar_system_id":"30004783",
-            "eve_type_id":"13",
+            "id": 4002,
+            "name": "Test Planet I",
+            "last_updated": "2024-02-14 22:38:23.813892",
+            "position_x": 1539254041784,
+            "position_y": -233186718285,
+            "position_z": -634258364444,
+            "eve_solar_system_id": 30004783,
+            "eve_type_id": 13,
             "enabled_sections": 0
         }
     ]

ledger/urls.py

@@ -48,33 +48,33 @@ urlpatterns = [
     path(
         "alliance/<int:alliance_id>/<int:year>/",
         alliance_ledger.alliance_ledger,
-        name="alliance_ledger_year",
+        name="alliance_ledger",
     ),
     path(
         "alliance/<int:alliance_id>/<int:year>/<int:month>/",
         alliance_ledger.alliance_ledger,
-        name="alliance_ledger_year_month",
+        name="alliance_ledger",
     ),
     path(
         "alliance/<int:alliance_id>/<int:year>/<int:month>/<int:day>/",
         alliance_ledger.alliance_ledger,
-        name="alliance_ledger_year_month_day",
+        name="alliance_ledger",
     ),
     # -- -- Alliance Details
     path(
         "alliance/<int:alliance_id>/<int:year>/view/details/<int:entity_id>/",
         alliance_ledger.alliance_details,
-        name="alliance_details_year",
+        name="alliance_details",
     ),
     path(
         "alliance/<int:alliance_id>/<int:year>/<int:month>/view/details/<int:entity_id>/",
         alliance_ledger.alliance_details,
-        name="alliance_details_year_month",
+        name="alliance_details",
     ),
     path(
         "alliance/<int:alliance_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/",
         alliance_ledger.alliance_details,
-        name="alliance_details_year_month_day",
+        name="alliance_details",
     ),
     path(
         "alliance/<int:alliance_id>/view/administration/",
@@ -99,35 +99,80 @@ urlpatterns = [
         name="corporation_ledger",
     ),
     path(
-        "corporation/<int:corporation_id>/<int:year>/",
+        "corporation/<int:corporation_id>/date/<int:year>/",
+        corporation_ledger.corporation_ledger,
+        name="corporation_ledger",
+    ),
+    path(
+        "corporation/<int:corporation_id>/date/<int:year>/<int:month>/",
+        corporation_ledger.corporation_ledger,
+        name="corporation_ledger",
+    ),
+    path(
+        "corporation/<int:corporation_id>/date/<int:year>/<int:month>/<int:day>/",
+        corporation_ledger.corporation_ledger,
+        name="corporation_ledger",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/",
         corporation_ledger.corporation_ledger,
-        name="corporation_ledger_year",
+        name="corporation_ledger",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/date/<int:year>/",
+        corporation_ledger.corporation_ledger,
+        name="corporation_ledger",
     ),
     path(
-        "corporation/<int:corporation_id>/<int:year>/<int:month>/",
+        "corporation/<int:corporation_id>/division/<int:division_id>/date/<int:year>/<int:month>/",
         corporation_ledger.corporation_ledger,
-        name="corporation_ledger_year_month",
+        name="corporation_ledger",
     ),
     path(
-        "corporation/<int:corporation_id>/<int:year>/<int:month>/<int:day>/",
+        "corporation/<int:corporation_id>/division/<int:division_id>/date/<int:year>/<int:month>/<int:day>/",
         corporation_ledger.corporation_ledger,
-        name="corporation_ledger_year_month_day",
+        name="corporation_ledger",
     ),
     # -- -- Corporation Details
+    path(
+        "corporation/<int:corporation_id>/view/details/<int:entity_id>/",
+        corporation_ledger.corporation_details,
+        name="corporation_details",
+    ),
     path(
         "corporation/<int:corporation_id>/<int:year>/view/details/<int:entity_id>/",
         corporation_ledger.corporation_details,
-        name="corporation_details_year",
+        name="corporation_details",
     ),
     path(
         "corporation/<int:corporation_id>/<int:year>/<int:month>/view/details/<int:entity_id>/",
         corporation_ledger.corporation_details,
-        name="corporation_details_year_month",
+        name="corporation_details",
     ),
     path(
         "corporation/<int:corporation_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/",
         corporation_ledger.corporation_details,
-        name="corporation_details_year_month_day",
+        name="corporation_details",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/view/details/<int:entity_id>/",
+        corporation_ledger.corporation_details,
+        name="corporation_details",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/view/details/<int:entity_id>/",
+        corporation_ledger.corporation_details,
+        name="corporation_details",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/<int:month>/view/details/<int:entity_id>/",
+        corporation_ledger.corporation_details,
+        name="corporation_details",
+    ),
+    path(
+        "corporation/<int:corporation_id>/division/<int:division_id>/<int:year>/<int:month>/<int:day>/view/details/<int:entity_id>/",
+        corporation_ledger.corporation_details,
+        name="corporation_details",
     ),
     path(
         "corporation/<int:corporation_id>/view/administration/",
@@ -148,33 +193,33 @@ urlpatterns = [
     path(
         "character/<int:character_id>/<int:year>/",
         character_ledger.character_ledger,
-        name="character_ledger_year",
+        name="character_ledger",
     ),
     path(
         "character/<int:character_id>/<int:year>/<int:month>/",
         character_ledger.character_ledger,
-        name="character_ledger_year_month",
+        name="character_ledger",
     ),
     path(
         "character/<int:character_id>/<int:year>/<int:month>/<int:day>/",
         character_ledger.character_ledger,
-        name="character_ledger_year_month_day",
+        name="character_ledger",
     ),
     # -- -- Character Details
     path(
         "character/<int:character_id>/<int:year>/view/details/",
         character_ledger.character_details,
-        name="character_details_year",
+        name="character_details",
     ),
     path(
         "character/<int:character_id>/<int:year>/<int:month>/view/details/",
         character_ledger.character_details,
-        name="character_details_year_month",
+        name="character_details",
     ),
     path(
         "character/<int:character_id>/<int:year>/<int:month>/<int:day>/view/details/",
         character_ledger.character_details,
-        name="character_details_year_month_day",
+        name="character_details",
     ),
     # -- -- Character Administration
     path(

ledger/views/alliance/alliance_ledger.py

@@ -61,7 +61,7 @@ def alliance_ledger(request, alliance_id, year=None, month=None, day=None):
         )
     # pylint: disable=duplicate-code
     if perms is None:
-        msg = _("Alliance not found")
+        msg = _("Alliance not found.")
         messages.info(request, msg)
         return render(
             request, "ledger/allyledger/alliance_ledger.html", context=context
@@ -108,7 +108,7 @@ def alliance_details(
         )
     # pylint: disable=duplicate-code
     if perms is None:
-        msg = _("Alliance not found")
+        msg = _("Alliance not found.")
         return render(
             request,
             "ledger/partials/information/view_character_content.html",
@@ -174,7 +174,7 @@ def alliance_administration(request, alliance_id):
         messages.error(request, msg)
         return redirect("ledger:alliance_ledger_index")
     if perm is None:
-        msg = _("Alliance not found")
+        msg = _("Alliance not found.")
         messages.info(request, msg)
         return redirect("ledger:alliance_ledger_index")
 
@@ -191,6 +191,7 @@ def alliance_administration(request, alliance_id):
     context = {
         "alliance_id": alliance_id,
         "title": "Alliance Administration",
+        "alliance": alliance,
         "corporations": corporations,
         "missing_corporations": missing_corporations,
     }

ledger/views/corporation/corporation_ledger.py

@@ -43,15 +43,20 @@ def corporation_ledger_index(request):
     )
 
 
+# pylint: disable=too-many-positional-arguments
 @login_required
 @permission_required("ledger.advanced_access")
 def corporation_ledger(
-    request: WSGIRequest, corporation_id, year=None, month=None, day=None
+    request: WSGIRequest,
+    corporation_id: int,
+    division_id: int = None,
+    year: int = None,
+    month: int = None,
+    day: int = None,
 ):
     """
     Corporation Ledger
     """
-
     perms, corporation = get_corporation(request, corporation_id)
 
     context = {
@@ -75,7 +80,12 @@ def corporation_ledger(
         )
 
     corporation_data = CorporationData(
-        request=request, corporation=corporation, year=year, month=month, day=day
+        request=request,
+        corporation=corporation,
+        division_id=division_id,
+        year=year,
+        month=month,
+        day=day,
     )
 
     # Create the Corporation ledger data
@@ -91,11 +101,12 @@ def corporation_ledger(
 @permission_required("ledger.advanced_access")
 def corporation_details(
     request: WSGIRequest,
-    corporation_id,
-    entity_id,
-    year=None,
-    month=None,
-    day=None,
+    corporation_id: int,
+    entity_id: int,
+    division_id: int = None,
+    year: int = None,
+    month: int = None,
+    day: int = None,
 ):
     """
     Corporation Details
@@ -131,7 +142,12 @@ def corporation_details(
         )
 
     corporation_data = CorporationData(
-        request=request, corporation=corporation, year=year, month=month, day=day
+        request=request,
+        corporation=corporation,
+        division_id=division_id,
+        year=year,
+        month=month,
+        day=day,
     )
 
     # Create the Entity for the ledger