From 32c8d6d428e25ecb4e5adb19297772c23bd3ec1b Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Fri, 24 Apr 2026 19:16:16 -0500 Subject: [PATCH 1/2] use new prop main_layer_ct to display mm completeness --- ohmg/api/schemas.py | 1 + ohmg/core/admin.py | 1 + ohmg/core/migrations/0011_map_main_layer_ct.py | 18 ++++++++++++++++++ ohmg/core/models/map.py | 5 +++++ .../src/components/tables/Maps.svelte | 2 +- 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ohmg/core/migrations/0011_map_main_layer_ct.py diff --git a/ohmg/api/schemas.py b/ohmg/api/schemas.py index e03aae15..fa1f9eff 100644 --- a/ohmg/api/schemas.py +++ b/ohmg/api/schemas.py @@ -96,6 +96,7 @@ class MapListSchema2(Schema): region_ct: int prepared_ct: int layer_ct: int + main_layer_ct: int skip_ct: int nonmap_ct: int completion_pct: int diff --git a/ohmg/core/admin.py b/ohmg/core/admin.py index 31e9282e..96660f5b 100644 --- a/ohmg/core/admin.py +++ b/ohmg/core/admin.py @@ -23,6 +23,7 @@ class MapAdmin(admin.ModelAdmin): "region_ct", "prepared_ct", "layer_ct", + "main_layer_ct", "skip_ct", "nonmap_ct", "completion_pct", diff --git a/ohmg/core/migrations/0011_map_main_layer_ct.py b/ohmg/core/migrations/0011_map_main_layer_ct.py new file mode 100644 index 00000000..794f318c --- /dev/null +++ b/ohmg/core/migrations/0011_map_main_layer_ct.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.27 on 2026-04-24 19:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0010_remove_layerset_multimask'), + ] + + operations = [ + migrations.AddField( + model_name='map', + name='main_layer_ct', + field=models.IntegerField(default=0), + ), + ] diff --git a/ohmg/core/models/map.py b/ohmg/core/models/map.py index cb0cdd43..50345a0b 100644 --- a/ohmg/core/models/map.py +++ b/ohmg/core/models/map.py @@ -150,6 +150,9 @@ class Meta: layer_ct = models.IntegerField( default=0, ) + main_layer_ct = models.IntegerField( + default=0, + ) skip_ct = models.IntegerField( default=0, ) @@ -404,6 +407,7 @@ def update_item_lookup(self): self.region_ct = region_ct self.prepared_ct = prepared_ct self.layer_ct = layer_ct + self.main_layer_ct = main_lyrs_ct self.skip_ct = skip_ct self.nonmap_ct = nonmap_ct self.completion_pct = completion_pct @@ -418,6 +422,7 @@ def update_item_lookup(self): "region_ct", "prepared_ct", "layer_ct", + "main_layer_ct", "skip_ct", "nonmap_ct", "completion_pct", diff --git a/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte b/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte index edfb7d38..10cb3810 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte @@ -249,7 +249,7 @@ {s.skip_ct} {s.nonmap_ct}
- {s.multimask_ct}/{s.layer_ct} + {s.multimask_ct}/{s.main_layer_ct} {#if s.gt_exists} From 9abb277222d6827896764d9748c97406315d579d Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Sat, 25 Apr 2026 00:53:13 +0000 Subject: [PATCH 2/2] update item lookup on map after mask save --- ohmg/core/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ohmg/core/views.py b/ohmg/core/views.py index 4fa9f65d..36950987 100644 --- a/ohmg/core/views.py +++ b/ohmg/core/views.py @@ -475,6 +475,7 @@ def post(self, request): logger.debug(f"removing mask from layer {layer.slug} ({layer.pk})") layer.mask = None layer.save(set_extent=False, skip_map_lookup_update=True) + layerset.map.update_item_lookup() return JsonResponseSuccess()