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

ledger/managers/character_mining_manager.py

@@ -4,7 +4,14 @@ from typing import TYPE_CHECKING
 
 # Django
 from django.db import models, transaction
-from django.db.models import DecimalField, ExpressionWrapper, F, Q, Sum, Value
+from django.db.models import (
+    DecimalField,
+    ExpressionWrapper,
+    F,
+    Q,
+    Sum,
+    Value,
+)
 from django.db.models.functions import Coalesce, Round
 from django.utils import timezone
 
@@ -17,6 +24,7 @@ from eveuniverse.models import EveSolarSystem, EveType
 
 # AA Ledger
 from ledger import __title__
+from ledger.app_settings import LEDGER_PRICE_PERCENTAGE
 from ledger.decorators import log_timing
 from ledger.helpers.etag import etag_results
 from ledger.providers import esi
@@ -31,33 +39,46 @@ if TYPE_CHECKING:
 logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
 
+def require_valid_price_percentage(func):
+    def wrapper(*args, **kwargs):
+        if not isinstance(LEDGER_PRICE_PERCENTAGE, (int, float)):
+            raise ValueError("LEDGER_PRICE_PERCENTAGE must be a number")
+        if LEDGER_PRICE_PERCENTAGE <= 0:
+            raise ValueError("LEDGER_PRICE_PERCENTAGE must be positive")
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 class CharacterMiningLedgerEntryQueryset(models.QuerySet):
+    @require_valid_price_percentage
     def annotate_pricing(self) -> models.QuerySet:
         """Annotate price and total columns."""
-        return self.annotate(price=F("type__market_price__average_price")).annotate(
+        return self.annotate(price=F("price_per_unit")).annotate(
             total=ExpressionWrapper(
-                F("type__market_price__average_price") * F("quantity"),
+                (F("price_per_unit") * F("quantity")) * LEDGER_PRICE_PERCENTAGE,
                 output_field=models.DecimalField(),
             ),
         )
 
-    def annotate_mining(self) -> models.QuerySet:
+    def annotate_mining(self, with_period: bool = False) -> models.QuerySet:
         """Annotate mining columns."""
-        return (
-            self.annotate_pricing()
-            .values(
-                "character__eve_character__character_id",
-                "character__eve_character__character_name",
-            )
-            .annotate(
-                total_amount=Round(
-                    Coalesce(
-                        Sum(F("total")),
-                        Value(0),
-                        output_field=DecimalField(),
-                    ),
-                    precision=2,
-                )
+        qs = self.annotate_pricing()
+        values_fields = [
+            "character__eve_character__character_id",
+            "character__eve_character__character_name",
+        ]
+        if with_period:
+            values_fields.append("period")
+
+        return qs.values(*values_fields).annotate(
+            mining_income=Round(
+                Coalesce(
+                    Sum(F("total")),
+                    Value(0),
+                    output_field=DecimalField(),
+                ),
+                precision=2,
             )
         )
 
@@ -186,6 +207,32 @@ class CharacterMiningLedgerEntryManagerBase(models.Manager):
         if old_events:
             self.bulk_update(old_events, fields=["quantity"])
 
+        self._update_mining_price(character)
+
+    def _update_mining_price(self, character: "CharacterAudit") -> None:
+        """Update prices for mining ledger entries."""
+        # Update EveMarketPrice on a Daily basis
+        self.model.update_evemarket_price()
+
+        mining_ledger = character.mining_ledger.filter(price_per_unit__isnull=True)
+        logger.debug(
+            f"Checking {mining_ledger.count()} mining ledger entries for missing prices."
+        )
+
+        updated_entries = []
+        for entry in mining_ledger:
+            npc_price = entry.get_npc_price()
+            if npc_price is not None:
+                entry.price_per_unit = npc_price
+                updated_entries.append(entry)
+
+        if updated_entries:
+            self.bulk_update(updated_entries, fields=["price_per_unit"])
+
+        logger.debug(
+            f"Updated prices for {len(updated_entries)}({character.character_name}) mining ledger entries."
+        )
+
 
 CharacterMiningLedgerEntryManager = CharacterMiningLedgerEntryManagerBase.from_queryset(
     CharacterMiningLedgerEntryQueryset

ledger/managers/character_planetary_manager.py

@@ -195,7 +195,7 @@ class PlanetaryDetailsQuerySet(models.QuerySet):
             ):
                 continue
             facility_info[pin_id] = {
-                "facility_id": item_type.id,
+                "facility_id": pin["type_id"],
                 "facility_name": item_type.name,
                 "resources": [],
                 "storage": {

ledger/migrations/0016_characterminingledger_price_per_unit.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.23 on 2025-08-28 05:19
+
+# Django
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ledger", "0015_rename_character_characteraudit_eve_character"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="characterminingledger",
+            name="price_per_unit",
+            field=models.DecimalField(
+                decimal_places=2, default=None, max_digits=20, null=True
+            ),
+        ),
+    ]

ledger/models/characteraudit.py

@@ -9,6 +9,7 @@ from collections.abc import Callable
 from bravado.exception import HTTPInternalServerError
 
 # Django
+from django.core.cache import cache
 from django.db import models
 from django.utils import timezone
 from django.utils.safestring import mark_safe
@@ -21,10 +22,11 @@ from esi.errors import TokenError
 
 # Alliance Auth (External Libs)
 from app_utils.logging import LoggerAddTag
-from eveuniverse.models import EveSolarSystem, EveType
+from eveuniverse.models import EveMarketPrice, EveSolarSystem, EveType
 
 # AA Ledger
 from ledger import __title__
+from ledger.app_settings import LEDGER_CACHE_KEY, LEDGER_USE_COMPRESSED
 from ledger.errors import HTTPGatewayTimeoutError, NotModifiedError, TokenDoesNotExist
 from ledger.managers.character_audit_manager import (
     CharacterAuditManager,
@@ -438,10 +440,39 @@ class CharacterMiningLedger(models.Model):
     )
     quantity = models.IntegerField()
 
+    price_per_unit = models.DecimalField(
+        max_digits=20, decimal_places=2, null=True, default=None
+    )
+
     @staticmethod
     def create_primary_key(character_id, mining_record):
         return f"{mining_record['date'].strftime('%Y%m%d')}-{mining_record['type_id']}-{character_id}-{mining_record['solar_system_id']}"
 
+    @staticmethod
+    def update_evemarket_price():  # Dont want to make a task only for this
+        """Update Prices for the EveMarketPrice."""
+        updated = 0
+        cached_update = cache.get(f"{LEDGER_CACHE_KEY}-eve-market-price", False)
+        if cached_update is False:
+            updated = EveMarketPrice.objects.update_from_esi()
+            cache.set(
+                f"{LEDGER_CACHE_KEY}-eve-market-price", None, (60 * 60 * 24)
+            )  # Cache for 24 hours
+            logger.debug(f"Updated {updated} for entries EveMarketPrice")
+        return updated
+
+    def get_npc_price(self):
+        """Get the NPC price for the type."""
+        try:
+            if LEDGER_USE_COMPRESSED:
+                type_name = f"Compressed {self.type.name}"
+                price = EveType.objects.get(name=type_name).market_price.average_price
+            else:
+                price = self.type.market_price.average_price
+        except (EveMarketPrice.DoesNotExist, EveType.DoesNotExist):
+            price = None
+        return price
+
     objects = CharacterMiningLedgerEntryManager()
 
     class Meta:

ledger/static/ledger/css/cards.css

@@ -45,7 +45,7 @@
         display: flex;
         flex-direction: column;
         min-width: 0;
-        word-wrap: break-word;
+        overflow-wrap: break-word;
         background-clip: border-box;
         background-color: rgb(100 100 100);
         border: 1px solid rgb(0 0 0 / 12.5%);

ledger/static/ledger/css/table.css

@@ -3,7 +3,7 @@
 @media all {
     #ratting {
         table-layout: fixed;
-        word-wrap: break-word;
+        overflow-wrap: break-word;
     }
 
     #ratting th,

ledger/static/ledger/js/charts.js

@@ -25,8 +25,6 @@ function load_or_create_Chart(div, data, chart) {
         return createRattingBarChart(root, data, div);
     } else if (chart === 'chart') {
         return createChordChart(root, data, div);
-    } else if (chart === 'gauge') {
-        return createWorkflowGaugeChart(root, data, div);
     }
 
     return true;
@@ -39,12 +37,10 @@ function initCharts(data) {
     // Dispose of existing Root instances with the same id if they exist
     const rootChartId = 'rattingChart';
     const rootBarId = 'rattingBar';
-    //const rootGaugeId = 'rattingworkGauge';
 
     // Create the chart
     const barChart = load_or_create_Chart(rootBarId, billboard.rattingbar, 'bar');
     const chart = load_or_create_Chart(rootChartId, billboard.charts, 'chart');
-    //const gaugeChart = load_or_create_Chart(rootGaugeId, billboard.workflowgauge, 'gauge');
 }
 
 function createChordChart(root, data, id) {
@@ -128,132 +124,6 @@ function createChordChart(root, data, id) {
     series.appear(1000, 100);
 }
 
-function createRattingChart(root, data, id) {
-    if (!data || !Array.isArray(data.series)) {
-        console.log('Data is not in the expected format:', data);
-        disposeRoot(id);
-        $('#ChartContainer').addClass('d-none');
-        $('#ChartContainer').removeClass('active');
-        return;
-    }
-
-    // Store the root object globally
-    window.chartsRoots = window.chartRoots || {};
-    window.chartsRoots[id] = root;
-
-    let chart = root.container.children.values.find(child => child instanceof am5xy.XYChart);
-    if (chart) {
-        // Update existing chart data
-        chart.series.values[0].data.setAll(data.series);
-    } else {
-        // Create a new chart
-        chart = root.container.children.push(am5percent.PieChart.new(root, {
-            innerRadius: am5.percent(50),
-            layout: root.verticalLayout
-        }));
-
-        const series = chart.series.push(am5percent.PieSeries.new(root, {
-            valueField: 'value',
-            categoryField: 'category',
-            alignLabels: false,
-        }));
-
-        const colorSet = am5.ColorSet.new(root, {
-            colors: [series.get('colors').getIndex(0)], passOptions: { lightness: -0.05, hue: 0 }
-        });
-
-        series.states.create('hidden', { startAngle: 180, endAngle: 180 });
-
-        series.slices.template.setAll({
-            templateField: 'sliceSettings',
-            strokeOpacity: 0,
-            tooltipText: '{category}: {valuePercentTotal.formatNumber("0.00")}% ({value} ISK)',
-        });
-
-        // Labels for category names outside the pie chart
-        series.labels.template.setAll({
-            textType: 'circular',
-            centerX: 0,
-            centerY: 0,
-            text: '' // Display only the category name
-        });
-
-        // Transform the data to the required format
-        var transformedData = [];
-        var seriesData = data.series[0];
-        for (var category in seriesData) {
-            if (category !== 'date') {
-                transformedData.push({
-                    category: category,
-                    value: seriesData[category].value,
-                    percentage: seriesData[category].percentage,
-                    mode: seriesData[category].mode
-                });
-            }
-        }
-
-        const legend = chart.children.push(am5.Legend.new(root, {
-            centerX: am5.percent(50),
-            x: am5.percent(50),
-            centerY: am5.percent(100),
-            y: am5.percent(100),
-            layout: am5.GridLayout.new(root, {
-                maxColumns: 5,
-                fixedWidthGrid: true
-            })
-        }));
-
-        // Increase the spacing between legend items
-        legend.itemContainers.template.setAll({
-            paddingTop: 10,
-            paddingBottom: 10,
-            paddingLeft: 10,
-            paddingRight: 10
-        });
-
-        series.data.setAll(transformedData);
-
-        legend.labels.template.setAll({
-            text: '{category}', // Display the category name and mode symbol in the legend
-        });
-
-        legend.valueLabels.template.setAll({
-            text: '' // Hide the percentage values in the legend
-        });
-
-        // Set custom markers for legend items
-        legend.markers.template.setup = function(marker) {
-            marker.events.on('dataitemchanged', function() {
-                var dataItem = marker._dataItem;
-                var series = dataItem.dataContext;
-                var iconColor = series.dataContext.mode === 'income' ? 'income' : 'cost';
-                marker.children.push(am5.Picture.new(root, {
-                    width: 64,
-                    height: 64,
-                    src: '/static/ledger/images/' + iconColor + '.png',
-                    centerX: am5.percent(35),
-                    centerY: am5.percent(35),
-                    x: am5.percent(-50),
-                }));
-
-                dataItem.on('markerRectangle', function(rectangle) {
-                    rectangle.set('forceHidden', true);
-                });
-            });
-        };
-
-        legend.data.setAll(series.dataItems);
-
-        // Remove Hide the chart container
-        $('#ChartContainer').removeClass('d-none');
-        $('#ChartContainer').addClass('active');
-
-        series.appear();
-        chart.appear(1000, 100);
-    }
-    return chart;
-}
-
 function createRattingBarChart(root, data, id) {
     if (!data || !Array.isArray(data.series)) {
         console.debug('Data is not in the expected format:', data);
@@ -333,8 +203,13 @@ function createRattingBarChart(root, data, id) {
             legend.data.push(series);
         }
 
-        // Use categories from the data
-        data.categories.forEach((name, i) => makeSeries(name, name.toLowerCase()));
+        // Use categories from the data (now as array of dicts: {name, label})
+        if (Array.isArray(data.categories) && typeof data.categories[0] === 'object') {
+            data.categories.forEach((cat) => makeSeries(cat.label || cat.label, cat.name));
+        } else {
+            // fallback for old format (array of strings)
+            data.categories.forEach((name) => makeSeries(name, name));
+        }
 
         // Remove Hide the chart container
         $('#rattingBarContainer').removeClass('d-none');
@@ -344,98 +219,3 @@ function createRattingBarChart(root, data, id) {
     }
     return chart;
 }
-
-function createWorkflowGaugeChart(root, data, id) {
-    if (!data || !Array.isArray(data.series)) {
-        console.debug('Data is not in the expected format:', data);
-        disposeRoot(id);
-        $('#workGaugeContainer').addClass('d-none');
-        $('#workGaugeContainer').removeClass('active');
-        return;
-    }
-
-    // Store the root object globally
-    window.gaugesRoots = window.gaugesRoots || {};
-    window.gaugesRoots[id] = root;
-
-    const chart = root.container.children.push(am5percent.PieChart.new(root, {
-        startAngle: 160, endAngle: 380
-    }));
-
-    const series = chart.series.push(am5percent.PieSeries.new(root, {
-        valueField: 'value',
-        categoryField: 'category',
-        startAngle: 180,
-        endAngle: 360,
-        radius: am5.percent(95),
-        innerRadius: am5.percent(50),
-        alignLabels: false,
-    }));
-
-    const colorSet = am5.ColorSet.new(root, {
-        colors: [series.get('colors').getIndex(0)], passOptions: { lightness: -0.05, hue: 0 }
-    });
-
-    series.states.create('hidden', { startAngle: 180, endAngle: 180 });
-
-    const legend = chart.children.push(am5.Legend.new(root, {
-        centerX: am5.percent(50),
-        x: am5.percent(50),
-        centerY: am5.percent(100),
-        y: am5.percent(100),
-        marginTop: 15,
-        marginBottom: 15
-    }));
-
-    series.slices.template.setAll({
-        templateField: 'sliceSettings',
-        strokeOpacity: 0
-    });
-
-    series.labels.template.setAll({
-        textType: 'circular',
-        text: '',
-        radius: am5.percent(-30),
-        inside: false,
-        centerX: am5.percent(50),
-        centerY: am5.percent(50),
-    });
-
-    series.labels.template.adapters.add('radius', function (radius, target) {
-        var dataItem = target.dataItem;
-        var slice = dataItem.get('slice');
-        return -(slice.get('radius') - slice.get('innerRadius')) / 2 - 10;
-    });
-
-    // Transform the data to the required format
-    var transformedData = [];
-    var seriesData = data.series[0];
-    for (var category in seriesData) {
-        if (category !== 'date') {
-            transformedData.push({
-                category: category,
-                value: seriesData[category].value,
-                mode: seriesData[category].mode
-            });
-        }
-    }
-
-    series.data.setAll(transformedData);
-
-    legend.labels.template.setAll({
-        text: '{category}', // Display the category name and mode symbol in the legend
-    });
-
-    legend.valueLabels.template.setAll({
-        text: '' // Hide the percentage values in the legend
-    });
-
-    legend.data.setAll(series.dataItems);
-
-    $('#workGaugeContainer').removeClass('d-none');
-    $('#workGaugeContainer').addClass('active');
-
-    series.appear();
-    chart.appear(1000, 100);
-    return chart;
-}

ledger/static/ledger/js/planetary.js

@@ -129,6 +129,7 @@ $(document).ready(() => {
             $('[data-tooltip-toggle="ledger"]').tooltip({
                 trigger: 'hover',
             });
+            $('#ledger-index').addClass('show');
         },
         drawCallback: function() {
             $('[data-tooltip-toggle="ledger"]').tooltip({

ledger/tasks.py

@@ -209,7 +209,6 @@ def update_character(character_pk: int, force_refresh=False):
 
 
 @shared_task(**_update_ledger_char_params)
-@when_esi_is_available
 def update_char_wallet_journal(character_pk: int, force_refresh: bool):
     return _update_character_section(
         character_pk,
@@ -219,7 +218,6 @@ def update_char_wallet_journal(character_pk: int, force_refresh: bool):
 
 
 @shared_task(**_update_ledger_char_params)
-@when_esi_is_available
 def update_char_mining_ledger(character_pk: int, force_refresh: bool):
     return _update_character_section(
         character_pk,
@@ -229,7 +227,6 @@ def update_char_mining_ledger(character_pk: int, force_refresh: bool):
 
 
 @shared_task(**_update_ledger_char_params)
-@when_esi_is_available
 def update_char_planets(character_pk: int, force_refresh: bool):
     logger.debug("Updating Planet Data for %s", character_pk)
     return _update_character_section(
@@ -240,7 +237,6 @@ def update_char_planets(character_pk: int, force_refresh: bool):
 
 
 @shared_task(**_update_ledger_char_params)
-@when_esi_is_available
 def update_char_planets_details(character_pk: int, force_refresh: bool):
     logger.debug("Updating Planet Details for %s", character_pk)
     return _update_character_section(
@@ -371,7 +367,6 @@ def update_corporation(
 
 
 @shared_task(**_update_ledger_corp_params)
-@when_esi_is_available
 def update_corp_wallet_division_names(corporation_pk: int, force_refresh: bool):
     return _update_corporation_section(
         corporation_pk,
@@ -381,7 +376,6 @@ def update_corp_wallet_division_names(corporation_pk: int, force_refresh: bool):
 
 
 @shared_task(**_update_ledger_corp_params)
-@when_esi_is_available
 def update_corp_wallet_division(corporation_pk: int, force_refresh: bool):
     return _update_corporation_section(
         corporation_pk,
@@ -391,7 +385,6 @@ def update_corp_wallet_division(corporation_pk: int, force_refresh: bool):
 
 
 @shared_task(**_update_ledger_corp_params)
-@when_esi_is_available
 def update_corp_wallet_journal(corporation_pk: int, force_refresh: bool):
     return _update_corporation_section(
         corporation_pk,
@@ -440,7 +433,7 @@ def clear_all_etags():
 
         default_cache = caches["default"]
         _client = default_cache.get_master_client()
-    keys = _client.keys(":?:ledger-*")
+    keys = _client.keys(f":?:{app_settings.LEDGER_CACHE_KEY}-*")
     logger.info("Deleting %s etag keys", len(keys))
     if keys:
         deleted = _client.delete(*keys)

ledger/templates/ledger/allyledger/admin/alliance_administration.html

@@ -17,15 +17,24 @@
             <h3 class="me-3">{% translate "Administration" %}</h3>
         </div>
         <!-- Content -->
-        <div class="card-body">
-            {% include 'ledger/partials/administration/dashboard.html' %}
-        </div>
-        <div class="card-body">
-            <div class="card-header bg-primary rounded-top d-flex align-items-center mt-4">
-                <h3 class="text-white">{% translate "Corporations" %}</h3>
+        <div id="ledger-index" class="card-body rounded-bottom fade">
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-lg-6 col-md-12">
+                        {% include 'ledger/partials/administration/dashboard.html' %}
+                    </div>
+                    <div class="col-lg-6 col-md-12">
+                        {% include 'ledger/partials/administration/alliance.html' %}
+                    </div>
+                </div>
             </div>
-            <div class="card-body bg-secondary">
-                {% include 'ledger/partials/administration/alliance.html' %}
+            <div class="card-body">
+                <div class="card-header bg-primary rounded-top d-flex align-items-center mt-4">
+                    <h3 class="text-white">{% translate "Corporations" %}</h3>
+                </div>
+                <div class="card-body bg-secondary">
+                    {% include 'ledger/partials/administration/alliance_corporations.html' %}
+                </div>
             </div>
         </div>
     </div>