From 496ba24de32fd521834b1c3170b288e2ae906e94 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Tue, 12 Dec 2023 23:53:31 -0800 Subject: [PATCH 01/11] use 20px if safe-area-inset not detectable --- .../src/main/angular/src/app/app.component.scss | 10 +++++----- .../active-wildfire-map.component.scss | 6 +++--- .../draggable-panel/draggable-panel.component.scss | 2 +- .../report-of-fire/report-of-fire.component.scss | 6 +++--- .../notification-map/notification-map.component.scss | 4 ++-- .../wfnews-war/src/main/angular/src/styles/_base.scss | 4 ++-- .../wfnews-war/src/main/angular/src/styles/main.scss | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/app.component.scss b/client/wfnews-war/src/main/angular/src/app/app.component.scss index 943961cde6..0cb91af5a6 100644 --- a/client/wfnews-war/src/main/angular/src/app/app.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/app.component.scss @@ -6,8 +6,8 @@ right: 0; bottom: 0; background-color: #f2f2f2; - padding-top: env(safe-area-inset-top); - padding-bottom: env(safe-area-inset-bottom); + padding-top: env(safe-area-inset-top, 20px); + padding-bottom: env(safe-area-inset-bottom, 20px); padding-left: env(safe-area-inset-left); padding-right: env(safe-area-inset-right); } @@ -269,14 +269,14 @@ right: 0; bottom: 0; background-color: white; - padding-top: env(safe-area-inset-top); - padding-bottom: env(safe-area-inset-bottom); + padding-top: env(safe-area-inset-top, 20px); + padding-bottom: env(safe-area-inset-bottom, 20px); padding-left: env(safe-area-inset-left); padding-right: env(safe-area-inset-right); } .mobile-navigation-bar{ position: fixed; - bottom: env(safe-area-inset-bottom); + bottom: env(safe-area-inset-bottom, 20px); z-index: 1000000; width: 100%; background-color: #FCFCFC; diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss index 19c182e04c..5129774dbd 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss @@ -213,7 +213,7 @@ mat-panel-title { } .container { - height: calc(100vh - env(safe-area-inset-bottom) - env(safe-area-inset-top)) !important; + height: calc(100vh - env(safe-area-inset-bottom, 20px) - env(safe-area-inset-top, 20px)) !important; overflow: hidden; } @@ -305,7 +305,7 @@ mat-panel-title { // One value must always be a fixed value! // additionally, this is a vh calc, not a height%, otherwise heights will be different across // devices - height: calc(100vh - env(safe-area-inset-bottom) - env(safe-area-inset-top) - 90px) !important; + height: calc(100vh - env(safe-area-inset-bottom, 20px) - env(safe-area-inset-top, 20px) - 90px) !important; .identify-panel { height: 100% !important; @@ -480,7 +480,7 @@ mat-panel-title { } .drawer-footer { - margin-bottom: calc(24px + env(safe-area-inset-bottom)); + margin-bottom: calc(24px + env(safe-area-inset-bottom, 20px)); direction: rtl; button { diff --git a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.scss b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.scss index 2e0a018c07..59545103b2 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.scss @@ -1,6 +1,6 @@ .draggable-panel { background-color: #ffffff; - height: calc(40vh - env(safe-area-inset-bottom) - env(safe-area-inset-top) - 56px) !important; + height: calc(40vh - env(safe-area-inset-bottom, 20px) - env(safe-area-inset-top, 20px) - 56px) !important; min-height: 320px; width: 100%; position: absolute; diff --git a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.scss b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.scss index 653a7b3b05..a2bc9dbd83 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/report-of-fire/report-of-fire.component.scss @@ -109,7 +109,7 @@ margin: 0 auto; padding-top: 0em; padding-right: 0; - padding-bottom: calc(1em + env(safe-area-inset-bottom)); + padding-bottom: calc(1em + env(safe-area-inset-bottom, 20px)); padding-left: 0; list-style: none; display: flex; @@ -147,10 +147,10 @@ padding: 8px 0px; align-items: center; width: calc(100% - 64px); - bottom: calc(3em + env(safe-area-inset-bottom)); + bottom: calc(3em + env(safe-area-inset-bottom, 20px)); position: fixed; @media (max-height: 699px){ - bottom: calc(2em + env(safe-area-inset-bottom)); + bottom: calc(2em + env(safe-area-inset-bottom, 20px)); } .rof-button { padding:0 32px; diff --git a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/notification-map/notification-map.component.scss b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/notification-map/notification-map.component.scss index 7d268c57d0..ce5f090b91 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/notification-map/notification-map.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/notification-map/notification-map.component.scss @@ -1,6 +1,6 @@ .content{ - padding-top: env(safe-area-inset-top); - padding-bottom: env(safe-area-inset-bottom); + padding-top: env(safe-area-inset-top, 20px); + padding-bottom: env(safe-area-inset-bottom, 20px); padding-left: env(safe-area-inset-left); padding-right: env(safe-area-inset-right); } diff --git a/client/wfnews-war/src/main/angular/src/styles/_base.scss b/client/wfnews-war/src/main/angular/src/styles/_base.scss index e7e3634c99..e1c3a02a02 100644 --- a/client/wfnews-war/src/main/angular/src/styles/_base.scss +++ b/client/wfnews-war/src/main/angular/src/styles/_base.scss @@ -7,9 +7,9 @@ body { } :root { - --sat: env(safe-area-inset-top); + --sat: env(safe-area-inset-top, 20px); --sar: env(safe-area-inset-right); - --sab: env(safe-area-inset-bottom); + --sab: env(safe-area-inset-bottom, 20px); --sal: env(safe-area-inset-left); } diff --git a/client/wfnews-war/src/main/angular/src/styles/main.scss b/client/wfnews-war/src/main/angular/src/styles/main.scss index eff8c1e2c0..dd599d2af4 100644 --- a/client/wfnews-war/src/main/angular/src/styles/main.scss +++ b/client/wfnews-war/src/main/angular/src/styles/main.scss @@ -686,7 +686,7 @@ wf-admin-incident-desktop{ mat-snack-bar-container{ height: 100%; @media (max-width: 768px) { - margin-bottom: calc(12vh + env(safe-area-inset-bottom)) !important + margin-bottom: calc(12vh + env(safe-area-inset-bottom, 20px)) !important } .mdc-snackbar__surface { box-shadow: none !important; From ca02ca91793233c3c850dad97b4e9cc35d1478c3 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 09:18:00 -0800 Subject: [PATCH 02/11] typo on notification title --- .../api/v1/impl/WildfirePushNotificationServiceV2Impl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java index fdf68016a3..dd57989252 100644 --- a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java +++ b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java @@ -78,7 +78,7 @@ private static class ProcessingCount { result.put(NotificationTopics.BRITISH_COLUMBIA_BANS_AND_PROHIBITION_AREAS, "There is a new burn prohibition in [%s] Fire Centre near your saved location [%s]. Tap for more info."); result.put(NotificationTopics.EVACUATION_ORDERS_AND_ALERTS, "There is a new evacuation order or alert issued by [%s] near your saved location [%s]. Tap for more info."); result.put(NotificationTopics.BRITISH_COLUMBIA_AREA_RESTRICTIONS, "There is a new area restriction for [%s] near your saved location [%s]. Tap for more info."); - result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire [%s]) near your saved location [%s]. Tap for more info."); + result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire [%s] near your saved location [%s]. Tap for more info."); TOPIC_MESSAGE_BODIES = Collections.unmodifiableMap(result); } From 9492550a8831021c729ee628eddd905efa7d63f0 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 10:20:40 -0800 Subject: [PATCH 03/11] commented out in-app notification section --- .../add-saved-location/add-saved-location.component.html | 8 ++++---- .../add-saved-location/add-saved-location.component.scss | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.html b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.html index 4b00582b42..54044884f4 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.html @@ -68,12 +68,12 @@
-
+
Notification Settings
-
+
Push notifications
@@ -88,7 +88,7 @@
-
+
diff --git a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.scss b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.scss index dad5f8afcc..e0bafe1c37 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/saved/add-saved-location/add-saved-location.component.scss @@ -218,6 +218,14 @@ width: -webkit-fill-available; } +.divider-with-margin{ + background: #DEDEDE; + height: 1px; + width: -webkit-fill-available; + margin-top: 16px; + margin-bottom: 32px; +} + .large-divider{ background: #F1F1F1; height: 8px; From bfaecc8942330fcae725ef6eaadcf22bf2378a7f Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 10:29:56 -0800 Subject: [PATCH 04/11] remove bracket from notifiation message body --- .../v1/impl/WildfirePushNotificationServiceV2Impl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java index dd57989252..232812e074 100644 --- a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java +++ b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java @@ -75,10 +75,10 @@ private static class ProcessingCount { static { Map result = new HashMap<>(); - result.put(NotificationTopics.BRITISH_COLUMBIA_BANS_AND_PROHIBITION_AREAS, "There is a new burn prohibition in [%s] Fire Centre near your saved location [%s]. Tap for more info."); - result.put(NotificationTopics.EVACUATION_ORDERS_AND_ALERTS, "There is a new evacuation order or alert issued by [%s] near your saved location [%s]. Tap for more info."); - result.put(NotificationTopics.BRITISH_COLUMBIA_AREA_RESTRICTIONS, "There is a new area restriction for [%s] near your saved location [%s]. Tap for more info."); - result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire [%s] near your saved location [%s]. Tap for more info."); + result.put(NotificationTopics.BRITISH_COLUMBIA_BANS_AND_PROHIBITION_AREAS, "There is a new burn prohibition in %s Fire Centre near your saved location %s. Tap for more info."); + result.put(NotificationTopics.EVACUATION_ORDERS_AND_ALERTS, "There is a new evacuation order or alert issued by %s near your saved location %s. Tap for more info."); + result.put(NotificationTopics.BRITISH_COLUMBIA_AREA_RESTRICTIONS, "There is a new area restriction for %s near your saved location %s. Tap for more info."); + result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire %s near your saved location %s. Tap for more info."); TOPIC_MESSAGE_BODIES = Collections.unmodifiableMap(result); } From 743302c23bcc030fb61494ac2480ae4ecdc052b3 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 13:26:34 -0800 Subject: [PATCH 05/11] try out --- .../active-wildfire-map.component.html | 8 ++++++++ .../active-wildfire-map.component.scss | 2 +- .../active-wildfire-map.component.ts | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html index 0fbc7547e6..0c403d6f08 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html @@ -4,6 +4,14 @@
+
+
+ Value of safe-area-inset-bottom: {{ safeAreaInsetBottomValue }} +
+
+ Value of safe-area-inset-top: {{ safeAreaInsetTopValue }} +
+
diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss index 5129774dbd..955c05f84a 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss @@ -305,7 +305,7 @@ mat-panel-title { // One value must always be a fixed value! // additionally, this is a vh calc, not a height%, otherwise heights will be different across // devices - height: calc(100vh - env(safe-area-inset-bottom, 20px) - env(safe-area-inset-top, 20px) - 90px) !important; + height: calc(100vh - env(safe-area-inset-bottom, 90px) - env(safe-area-inset-top, 90px) - 90px) !important; .identify-panel { height: 100% !important; diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts index 200d96e438..4892a0851d 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts @@ -108,7 +108,8 @@ export class ActiveWildfireMapComponent implements OnInit, AfterViewInit { notificationState = 0; wildfireYear = new Date().getFullYear().toString(); - + safeAreaInsetTopValue + safeAreaInsetBottomValue: string; public searchData: SearchResult @@ -417,6 +418,13 @@ export class ActiveWildfireMapComponent implements OnInit, AfterViewInit { } ngOnInit() { + // Get the value of env(safe-area-inset-bottom) + const safeAreaInsetBottom = parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-inset-bottom")); + const safeAreaInsetTop= parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-inset-top")); + + // Set the value in the component property + this.safeAreaInsetBottomValue = isNaN(safeAreaInsetBottom) ? 'N/A' : `${safeAreaInsetBottom}px`; + this.safeAreaInsetTopValue = isNaN(safeAreaInsetTop) ? 'N/A' : `${safeAreaInsetTop}px`; this.url = this.appConfigService.getConfig().application.baseUrl.toString() + this.router.url.slice(1) this.snowPlowHelper(this.url) this.showAccordion = true; From dd05e8844831fc1235ef605d2530af33f6ba89fb Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 14:49:35 -0800 Subject: [PATCH 06/11] safe-area in map screen got ignored --- .../active-wildfire-map.component.html | 10 +--------- .../active-wildfire-map.component.scss | 4 ++++ .../active-wildfire-map.component.ts | 13 ++++++------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html index 0c403d6f08..388940cefc 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html @@ -3,15 +3,7 @@
-
-
-
- Value of safe-area-inset-bottom: {{ safeAreaInsetBottomValue }} -
-
- Value of safe-area-inset-top: {{ safeAreaInsetTopValue }} -
-
+
diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss index 955c05f84a..7b5144ccf9 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss @@ -313,6 +313,10 @@ mat-panel-title { display: none; } } + .map01 { + height: calc(100vh - 130px - 90px) !important; + + } } .divider { diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts index 4892a0851d..d03ae010ac 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.ts @@ -419,12 +419,6 @@ export class ActiveWildfireMapComponent implements OnInit, AfterViewInit { ngOnInit() { // Get the value of env(safe-area-inset-bottom) - const safeAreaInsetBottom = parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-inset-bottom")); - const safeAreaInsetTop= parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--safe-area-inset-top")); - - // Set the value in the component property - this.safeAreaInsetBottomValue = isNaN(safeAreaInsetBottom) ? 'N/A' : `${safeAreaInsetBottom}px`; - this.safeAreaInsetTopValue = isNaN(safeAreaInsetTop) ? 'N/A' : `${safeAreaInsetTop}px`; this.url = this.appConfigService.getConfig().application.baseUrl.toString() + this.router.url.slice(1) this.snowPlowHelper(this.url) this.showAccordion = true; @@ -1053,7 +1047,12 @@ export class ActiveWildfireMapComponent implements OnInit, AfterViewInit { return layerButtons?.scrollLeft < (layerButtons.scrollWidth - mapContainer.scrollWidth) } - + isSafeAreaNotDetectable() { + const deviceInfo = navigator.userAgent + if (this.capacitorService.isWebPlatform && /iPhone|Pixel/.test(deviceInfo) && /Chrome|Safari/.test(deviceInfo)) { + return true + } + } onPushNotificationClick() { let n = this.testNotifications[ this.notificationState % this.testNotifications.length ] From b6e0c0c82a9011511facd36101924c073ede19a7 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 15:25:29 -0800 Subject: [PATCH 07/11] change notification message again. set 10 sec apperance time for notification snackbar --- .../src/main/angular/src/app/services/capacitor-service.ts | 2 +- .../api/v1/impl/WildfirePushNotificationServiceV2Impl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts b/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts index b0b32258a8..26c648c1aa 100644 --- a/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts +++ b/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts @@ -315,7 +315,7 @@ export class CapacitorService { showNotificationSnackbar( title: string, body: string ) { let cfg: MatSnackBarConfig = { data: { title, body }, - // duration: 20 * 1000, + duration: 10 * 1000, verticalPosition: 'top' } diff --git a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java index 232812e074..ed6ec426f6 100644 --- a/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java +++ b/server/wfone-notification-push-api/wfone-notification-push-service-api/src/main/java/ca/bc/gov/nrs/wfone/notification/push/service/api/v1/impl/WildfirePushNotificationServiceV2Impl.java @@ -78,7 +78,7 @@ private static class ProcessingCount { result.put(NotificationTopics.BRITISH_COLUMBIA_BANS_AND_PROHIBITION_AREAS, "There is a new burn prohibition in %s Fire Centre near your saved location %s. Tap for more info."); result.put(NotificationTopics.EVACUATION_ORDERS_AND_ALERTS, "There is a new evacuation order or alert issued by %s near your saved location %s. Tap for more info."); result.put(NotificationTopics.BRITISH_COLUMBIA_AREA_RESTRICTIONS, "There is a new area restriction for %s near your saved location %s. Tap for more info."); - result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire %s near your saved location %s. Tap for more info."); + result.put(NotificationTopics.BCWF_ACTIVEFIRES_PUBLIVIEW, "There is a new wildfire (incident #%s) near your saved location %s. Tap for more info."); TOPIC_MESSAGE_BODIES = Collections.unmodifiableMap(result); } From 97759b89fb719c1340f5e4090925b0fd5d06d229 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 15:59:39 -0800 Subject: [PATCH 08/11] more styling tweak --- .../active-wildfire-map.component.html | 4 ++-- .../active-wildfire-map.component.scss | 2 +- .../notification-snackbar.component.scss | 4 ++-- .../src/assets/images/logo/BC-Wildfire-Icon.png | Bin 0 -> 20571 bytes 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 client/wfnews-war/src/main/angular/src/assets/images/logo/BC-Wildfire-Icon.png diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html index 388940cefc..9437b0fa6f 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html @@ -54,9 +54,9 @@ Legend - + diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss index 7b5144ccf9..c6d3e3a813 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.scss @@ -314,7 +314,7 @@ mat-panel-title { } } .map01 { - height: calc(100vh - 130px - 90px) !important; + height: calc(100vh - 110px - 90px) !important; } } diff --git a/client/wfnews-war/src/main/angular/src/app/components/notification-snackbar/notification-snackbar.component.scss b/client/wfnews-war/src/main/angular/src/app/components/notification-snackbar/notification-snackbar.component.scss index bbcedd63eb..0d5b9dbfab 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/notification-snackbar/notification-snackbar.component.scss +++ b/client/wfnews-war/src/main/angular/src/app/components/notification-snackbar/notification-snackbar.component.scss @@ -1,7 +1,7 @@ @import '../../../styles/variables'; :host { - display: flex; + display: block; font-family: $font-family-main; font-size: 0.8rem; @@ -13,7 +13,7 @@ position: relative; .icon { - background-image: url( '../../../assets/images/logo/wildfire-one-logo.png' ); + background-image: url( '../../../assets/images/logo/BC-Wildfire-Icon.png' ); background-repeat: no-repeat; background-size: 40px; background-position: center; diff --git a/client/wfnews-war/src/main/angular/src/assets/images/logo/BC-Wildfire-Icon.png b/client/wfnews-war/src/main/angular/src/assets/images/logo/BC-Wildfire-Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7669e45aad5d752c0997057fde77f787439d4736 GIT binary patch literal 20571 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 R+(#VJUL*6JIfjlG{~r#iP?G=v literal 0 HcmV?d00001 From 376080d1eda8771ac0f04c47cf2ce1c30babae00 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 16:41:57 -0800 Subject: [PATCH 09/11] remove test --- .../active-wildfire-map/active-wildfire-map.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html index 9437b0fa6f..388940cefc 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/active-wildfire-map/active-wildfire-map.component.html @@ -54,9 +54,9 @@ Legend - From 59d13e403a46cbafd8ab41decc23c53c6909d8bd Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Wed, 13 Dec 2023 17:35:15 -0800 Subject: [PATCH 10/11] emit location notification if click in app notification --- .../src/main/angular/src/app/services/capacitor-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts b/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts index 26c648c1aa..2a46da944a 100644 --- a/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts +++ b/client/wfnews-war/src/main/angular/src/app/services/capacitor-service.ts @@ -245,7 +245,7 @@ export class CapacitorService { let sb = this.showNotificationSnackbar( notification.title, notification.body ) sb.onAction().subscribe( () => { - this.emitRofNotification( notification.title, notification.body ) + this.emitLocationNotification(notification.body ) } ) sb.afterDismissed().subscribe( () => { From 1faf88654ade25e5984c8f570fb29071d0121ac1 Mon Sep 17 00:00:00 2001 From: Lucas Li Date: Fri, 19 Apr 2024 16:02:10 -0700 Subject: [PATCH 11/11] view full map in dashboard --- .../overview-widget/overview-widget.component.html | 4 ++-- .../widgets/overview-widget/overview-widget.component.ts | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.html b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.html index e8f851b76d..b15152231d 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.html @@ -18,9 +18,9 @@ Under ControlUnder Control
- diff --git a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.ts b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.ts index 82ead15916..a60249ccb0 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/overview-widget/overview-widget.component.ts @@ -8,6 +8,8 @@ import { import * as L from 'leaflet'; import { AppConfigService } from '@wf1/core-ui'; import { HttpClient } from '@angular/common/http'; +import { Router } from '@angular/router'; +import { ResourcesRoutes } from '@app/utils'; @Component({ selector: 'overview-widget', @@ -24,6 +26,7 @@ export class OverviewWidget implements OnInit, AfterViewInit { private cdr: ChangeDetectorRef, private httpClient: HttpClient, private el: ElementRef, + private router: Router, ) {} ngOnInit(): void { @@ -165,4 +168,9 @@ export class OverviewWidget implements OnInit, AfterViewInit { console.error('Feature data not loaded. No data found.'); } } + + toggleMapView(){ + this.showViewMapButton = !this.showViewMapButton; + this.router.navigate([ResourcesRoutes.ACTIVEWILDFIREMAP]); + } }