From 4af466253f683bdb0514984987e10b5dd99e9f7c Mon Sep 17 00:00:00 2001 From: Sean Sylver Date: Thu, 11 Jul 2024 12:44:53 -0700 Subject: [PATCH] Update displayDangerRatingDescription function name --- .../draggable-panel/draggable-panel.component.html | 2 +- .../components/draggable-panel/draggable-panel.component.ts | 4 ++-- .../danger-rating-full-details.component.ts | 6 +++--- .../danger-rating-preview.component.html | 2 +- .../danger-rating-preview.component.ts | 4 ++-- .../danger-rating-header/danger-rating-header.component.ts | 6 +++--- .../saved-location-full-details.component.html | 2 +- .../saved-location-full-details.component.ts | 4 ++-- client/wfnews-war/src/main/angular/src/app/utils/index.ts | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.html b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.html index 22d9baa142..6ea8210707 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.html @@ -488,7 +488,7 @@
{{identifyItem.properties.DANGER_RATING_DESC}} Fire Danger
- {{displayDangerRatingDes(identifyItem.properties.DANGER_RATING_DESC)}} + {{displayDangerRatingDescription(identifyItem.properties.DANGER_RATING_DESC)}}
diff --git a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.ts b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.ts index 8f02c70c13..cfabceb671 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.ts @@ -25,7 +25,7 @@ import { addMarker, getStageOfControlDescription, hidePanel, - displayDangerRatingDes + displayDangerRatingDescription } from '@app/utils'; import * as L from 'leaflet'; import { LocationData } from '../wildfires-list-header/filter-by-location/filter-by-location-dialog.component'; @@ -83,7 +83,7 @@ export class DraggablePanelComponent implements OnInit, OnChanges, OnDestroy { displayItemTitle = displayItemTitle; addMarker = addMarker; getStageOfControlDescription = getStageOfControlDescription; - displayDangerRatingDes = displayDangerRatingDes; + displayDangerRatingDescription = displayDangerRatingDescription; removeIdentity = false; diff --git a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts index d4a548b18c..8765c934ef 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/full-details/danger-rating-full-details/danger-rating-full-details.component.ts @@ -4,7 +4,7 @@ import { LocationData } from '@app/components/wildfires-list-header/filter-by-lo import { PublishedIncidentService } from '@app/services/published-incident-service'; import { AppConfigService } from '@wf1/core-ui'; import * as L from 'leaflet'; -import { ResourcesRoutes, setDisplayColor, displayDangerRatingDes } from '@app/utils'; +import { ResourcesRoutes, setDisplayColor, displayDangerRatingDescription } from '@app/utils'; import { AGOLService } from '@app/services/AGOL-service'; import { CommonUtilityService } from '@app/services/common-utility.service'; @@ -20,7 +20,7 @@ export class DangerRatingFullDetailsComponent implements OnInit { public map: any; - displayDangerRatingDes = displayDangerRatingDes; + displayDangerRatingDescription = displayDangerRatingDescription; constructor( private cdr: ChangeDetectorRef, @@ -36,7 +36,7 @@ export class DangerRatingFullDetailsComponent implements OnInit { } dangerDescription() { - return displayDangerRatingDes(this.rating); + return displayDangerRatingDescription(this.rating); } async initMap() { diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.html b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.html index 52618f780d..330c4de3ba 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.html @@ -11,7 +11,7 @@
{{data.DANGER_RATING_DESC}} Fire Danger
- {{displayDangerRatingDes(data.DANGER_RATING_DESC)}} + {{displayDangerRatingDescription(data.DANGER_RATING_DESC)}}
diff --git a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.ts b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.ts index a5e42743e1..f826d4af85 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/preview-panels/danger-rating-preview/danger-rating-preview.component.ts @@ -4,7 +4,7 @@ import { MapUtilityService } from '@app/components/preview-panels/map-share-serv import { AGOLService } from '@app/services/AGOL-service'; import { CapacitorService } from '@app/services/capacitor-service'; import { CommonUtilityService } from '@app/services/common-utility.service'; -import { ResourcesRoutes, formatDate, hidePanel, showPanel, displayDangerRatingDes } from '@app/utils'; +import { ResourcesRoutes, formatDate, hidePanel, showPanel, displayDangerRatingDescription } from '@app/utils'; @Component({ selector: 'wfnews-danger-rating-preview', @@ -15,7 +15,7 @@ export class DangerRatingPreviewComponent { public data; formatDate = formatDate; - displayDangerRatingDes = displayDangerRatingDes; + displayDangerRatingDescription = displayDangerRatingDescription; constructor( private router: Router, diff --git a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.ts b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.ts index 799d633b83..68f3ca5a55 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-header/danger-rating-header/danger-rating-header.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ViewEncapsulation } from '@angular/core'; import { Router } from '@angular/router'; -import { ResourcesRoutes, convertToDateTimeTimeZone, displayDangerRatingDes} from '@app/utils'; +import { ResourcesRoutes, convertToDateTimeTimeZone, displayDangerRatingDescription} from '@app/utils'; @Component({ selector: 'wfnews-danger-rating-header', @@ -12,7 +12,7 @@ export class DangerRatingHeaderComponent { @Input() dangerRating: any; convertToDateTimeTimeZone = convertToDateTimeTimeZone; - displayDangerRatingDes = displayDangerRatingDes; + displayDangerRatingDescription = displayDangerRatingDescription; constructor( private router: Router, @@ -31,7 +31,7 @@ export class DangerRatingHeaderComponent { } dangerDescription() { - return displayDangerRatingDes(this.dangerRating?.attributes?.DANGER_RATING_DESC); + return displayDangerRatingDescription(this.dangerRating?.attributes?.DANGER_RATING_DESC); } } diff --git a/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.html b/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.html index 71e3392242..699e8582fb 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.html +++ b/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.html @@ -139,7 +139,7 @@ alt="Fire Danger"> {{dangerRatingLabel}} Fire Danger - {{displayDangerRatingDes(dangerRatingLabel)}} + {{displayDangerRatingDescription(dangerRatingLabel)}} diff --git a/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.ts b/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.ts index c0e2328209..272fc14313 100644 --- a/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.ts +++ b/client/wfnews-war/src/main/angular/src/app/components/saved/saved-location-full-details/saved-location-full-details.component.ts @@ -7,7 +7,7 @@ import { ResourcesRoutes, convertToDateTimeTimeZone, convertToDateYear, - displayDangerRatingDes, + displayDangerRatingDescription, getStageOfControlIcon, getStageOfControlLabel, isMobileView, @@ -44,7 +44,7 @@ export class SavedLocationFullDetailsComponent implements OnInit { public userAllNotificationsPreferences: any; public evacsPopulated: boolean; - displayDangerRatingDes = displayDangerRatingDes; + displayDangerRatingDescription = displayDangerRatingDescription; convertToDateYear = convertToDateYear; getStageOfControlIcon = getStageOfControlIcon; getStageOfControlLabel = getStageOfControlLabel; diff --git a/client/wfnews-war/src/main/angular/src/app/utils/index.ts b/client/wfnews-war/src/main/angular/src/app/utils/index.ts index c2645b4305..7977d5fcdc 100644 --- a/client/wfnews-war/src/main/angular/src/app/utils/index.ts +++ b/client/wfnews-war/src/main/angular/src/app/utils/index.ts @@ -752,7 +752,7 @@ export function openLink(link: string) { ); } -export function displayDangerRatingDes(danger) { +export function displayDangerRatingDescription(danger) { switch (danger) { case 'Extreme': return 'Extremely dry forest fuels and the fire risk is very serious. New fires will start easily, spread rapidly, and challenge fire suppression efforts. General forest activities may be restricted, including open burning, industrial activities and campfires.';