From 5542809c067eccf0a6d0102fc8088c461877f75a Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 14:50:48 -0900 Subject: [PATCH 1/3] style: improve results list scene & file count --- .../scenes-list-header.component.html | 15 +++++++++------ src/assets/i18n/en.json | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index b3832c2b2..32d70e47f 100644 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html +++ b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html @@ -23,22 +23,25 @@ " class="mr-10 scene-count" > + + @let numberOfProducts = numberOfProducts$ | async; {{ numberOfScenes$ | async }} {{ 'SCENE' | translate }}{{ (numberOfScenes$ | async) === 1 ? '' : 's' }} + @if (numberOfProducts > 0) { + ({{ numberOfProducts }} {{ numberOfProducts == 1 ? 'FILE' : 'FILES' | translate }}) + }
@let virtualCount = totalVirtualProducts$ | async; - {{ (numberOfProducts$ | async) - virtualCount }} - @if (virtualCount > 0) { - ({{ virtualCount }} {{ 'ADDITIONAL' | translate }}) - } + + {{ numberOfProducts - virtualCount }} {{ 'OF' | translate }} {{ formatNumber(totalResultCount$ | async) }} - {{ 'FILE' | translate - }}{{ (numberOfProducts$ | async) === 1 ? '' : 's' }} + {{'TOTAL' | translate }} {{ numberOfProducts == 1 ? 'SCENE' : 'SCENES' | translate }} +
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index dd1df3e22..7ec239413 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -907,6 +907,7 @@ "TIMELINE": "timeline", "TITLE_HOW_CAN_WE_HELP_YOU": "title : \"How can we help you?\",", "TO": "to", + "TOTAL": "Total", "TO_A": "to a", "TO_A ": " to a", "TO_A_CSV_KML_OR_GEO_JSON_FILE_THE_KML_AND_GEO_JSON": "to a CSV, KML, or GeoJSON file. The KML and GeoJSON", From 99c36f24a4cd570d5c144cb2bb54541934f21b1c Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 15:26:32 -0900 Subject: [PATCH 2/3] bug: fix scene count for results with scenes grouped by groupID --- .../scenes-list-header.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index 32d70e47f..6d43826a6 100644 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html +++ b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html @@ -25,8 +25,10 @@ > @let numberOfProducts = numberOfProducts$ | async; - {{ numberOfScenes$ | async }} {{ 'SCENE' | translate - }}{{ (numberOfScenes$ | async) === 1 ? '' : 's' }} + @let virtualCount = totalVirtualProducts$ | async; + @let sceneCountDisplay = numberOfProducts - virtualCount; + {{ sceneCountDisplay }} {{ 'SCENE' | translate + }}{{ sceneCountDisplay === 1 ? '' : 's' }} @if (numberOfProducts > 0) { ({{ numberOfProducts }} {{ numberOfProducts == 1 ? 'FILE' : 'FILES' | translate }}) } @@ -35,9 +37,7 @@ style="font-size: small" >
- @let virtualCount = totalVirtualProducts$ | async; - - {{ numberOfProducts - virtualCount }} + {{ sceneCountDisplay }} {{ 'OF' | translate }} {{ formatNumber(totalResultCount$ | async) }} {{'TOTAL' | translate }} {{ numberOfProducts == 1 ? 'SCENE' : 'SCENES' | translate }} From f27553675c74db49c2cf950834151579a1bc8692 Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 15:35:14 -0900 Subject: [PATCH 3/3] style: improve template formatting --- .../scenes-list-header/scenes-list-header.component.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index 6d43826a6..3b7b804e1 100644 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html +++ b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html @@ -23,13 +23,12 @@ " class="mr-10 scene-count" > - @let numberOfProducts = numberOfProducts$ | async; @let virtualCount = totalVirtualProducts$ | async; @let sceneCountDisplay = numberOfProducts - virtualCount; - {{ sceneCountDisplay }} {{ 'SCENE' | translate - }}{{ sceneCountDisplay === 1 ? '' : 's' }} - @if (numberOfProducts > 0) { + {{ sceneCountDisplay }} {{ 'SCENE' | translate + }}{{ sceneCountDisplay === 1 ? '' : 's' }} + @if (numberOfProducts > 0) { ({{ numberOfProducts }} {{ numberOfProducts == 1 ? 'FILE' : 'FILES' | translate }}) }