From 8e821c1c2874ab0b720e3b8d87aa6f44c54da1cf Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Thu, 13 Aug 2026 19:55:05 +0200 Subject: [PATCH] [CHANGE] Show ADM with always 1 decimal --- CHANGELOG.md | 4 ++++ sovtimer/tests/test_views.py | 2 +- sovtimer/views.py | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f534bd35..0146b246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,10 @@ Section Order: +### Changed + +- Show ADM with always 1 decimal + ## [5.1.0] - 2026-08-04 > [!IMPORTANT] diff --git a/sovtimer/tests/test_views.py b/sovtimer/tests/test_views.py index 28bec5f3..5fee1666 100644 --- a/sovtimer/tests/test_views.py +++ b/sovtimer/tests/test_views.py @@ -238,7 +238,7 @@ def test_dashboard_data_handles_missing_vulnerability_levels( self.assertEqual(response.status_code, HTTPStatus.OK) self.assertEqual(len(response.json()), 1) - self.assertEqual(response.json()[0]["adm"], 1) + self.assertEqual(response.json()[0]["adm"], "1.0") @patch("sovtimer.views.Campaign.Type") @patch("sovtimer.views.timezone.now") diff --git a/sovtimer/views.py b/sovtimer/views.py index 13a55396..0f9a0be7 100644 --- a/sovtimer/views.py +++ b/sovtimer/views.py @@ -123,8 +123,10 @@ def dashboard_data( # pylint: disable=too-many-statements too-many-locals region_name = region.name region_name_html = f'{region_name}' - # Activity defense multiplier (fast lookup) - structure_adm = occupancy_by_system.get(campaign.structure.solar_system_id, 1) + # Activity defense multiplier (fast lookup) formatted with one decimal + structure_adm = ( + f"{occupancy_by_system.get(campaign.structure.solar_system_id, 1):.1f}" + ) # Start time and remaining seconds (use timezone-aware now) start_time = campaign.start_time