fixing additional missing SAname case (#321)

bcgov · Mar 6, 2024 · 603fc25 · 603fc25
1 parent 1b5f653
commit 603fc25
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/app/enter-data/enter-data.component.ts b/src/app/enter-data/enter-data.component.ts
@@ -41,14 +41,25 @@ export class EnterDataComponent implements OnInit, OnDestroy {
             event.url.split('?')[0] !== '/enter-data' ? true : false;
         })
     );
+    this.subscriptions.add(
+      this.dataService.watchItem(Constants.dataIds.ENTER_DATA_URL_PARAMS)
+        .subscribe((res) => {
+          if (res) {
+            this.urlParams = res;
+          }
+        })
+    );
   }
 
   ngOnInit(): void {
-    this.urlParams = this.urlService.getQueryParams();
+    this.dataService.setItemValue(Constants.dataIds.ENTER_DATA_URL_PARAMS, this.urlService.getQueryParams());
   }
 
   formatDate(date): string {
-    return DateTime.fromFormat(date, 'yyyyLL').toFormat('LLLL yyyy');
+    if (date) {
+      return DateTime.fromFormat(date, 'yyyyLL').toFormat('LLLL yyyy');
+    }
+    return '-';
   }
 
   ngOnDestroy() {

diff --git a/src/app/forms/cancel-button/cancel-button.component.ts b/src/app/forms/cancel-button/cancel-button.component.ts
@@ -30,6 +30,7 @@ export class CancelButtonComponent implements OnDestroy {
           if (res) {
             this.navParams['date'] = res.date;
             this.navParams['parkName'] = res.parkName;
+            this.navParams['subAreaName'] = res.subAreaName;
             this.navParams['subAreaId'] = res.subAreaId;
             this.navParams['orcs'] = res.orcs;
           }