moved permitName to utils and refactored to support

bcgov · Jun 20, 2024 · 05d5ce7 · 05d5ce7
1 parent 4b0711c
commit 05d5ce7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 26 deletions.
diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.html b/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.html
@@ -45,8 +45,8 @@
             <span class="red-asterisk">*</span>
           </label>
           <select name="typeCode" id="typeCode" formControlName="typeCode" class="form-control">
-            <option *ngFor="let typeCode of permitTypes" [ngValue]="typeCode">
-              {{ this.permitType(record) }}
+            <option *ngFor="let typeCode of recordUtils.minePermitTypes" [ngValue]="typeCode">
+              {{ recordUtils.permitType(record) }}
             </option>
           </select>
         </div>

diff --git a/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts b/angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts
@@ -179,17 +179,6 @@ export class MinesRecordAddComponent implements OnInit, OnDestroy {
     return agencyDataService.displayNameFull(agency);
   }
 
-  permitName(typeCode) {
-    switch (typeCode) {
-      case 'OGP':
-        return 'Permit';
-      case 'ALG':
-        return 'Amalgamated Permit';
-      default:
-        return 'Permit Amendment' //AMD
-    }
-  }
-
   ngOnDestroy(): void {
     this.ngUnsubscribe.next();
     this.ngUnsubscribe.complete();

diff --git a/...r/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.html b/...r/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.html
@@ -67,8 +67,8 @@ <h2 class="border-0 mb-0">Edit record</h2>
         <div class="label-pair" *ngIf="myForm.get('recordType').value === 'Permit'">
           <label for="typeCode">Permit Type</label>
           <select name="typeCode" id="typeCode" formControlName="typeCode" class="form-control">
-            <option *ngFor="let typeCode of permitTypes" [ngValue]="typeCode">
-              {{ this.permitName(typeCode) }}
+            <option *ngFor="let typeCode of recordUtils.minePermitTypes" [ngValue]="typeCode">
+              {{ recordUtils.permitName(typeCode) }}
             </option>
           </select>
         </div>

diff --git a/...lar/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts b/...lar/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts
@@ -304,17 +304,6 @@ export class MinesRecordsEditComponent implements OnInit {
     return agencyDataService.displayNameFull(agency);
   }
 
-  permitName(typeCode) {
-    switch (typeCode) {
-      case 'OGP':
-        return 'Permit';
-      case 'ALG':
-        return 'Amalgamated Permit';
-      default:
-        return 'Permit Amendment' //AMD
-    }
-  }
-
   /**
    * Cancel editing.
    *

diff --git a/angular/projects/admin-nrpti/src/app/records/utils/record-utils.ts b/angular/projects/admin-nrpti/src/app/records/utils/record-utils.ts
@@ -287,4 +287,15 @@ export class RecordUtils {
     const actTitle = dataservice.displayActTitleFull(actCode);
     return actTitle;
   }
+
+  permitName(typeCode: string): string {
+    switch (typeCode) {
+      case 'OGP':
+        return 'Permit';
+      case 'ALG':
+        return 'Amalgamated Permit';
+      default:
+        return 'Permit Amendment'; // AMD
+    }
+  }
 }