[NRPTI-1045][FEATURE] - issuing agency update

angular/projects/admin-nrpti/src/app/agencies/agencies.component.ts

@@ -41,13 +41,13 @@ export class AgenciesComponent implements OnInit {
     this.factoryService.applicationAgencyService.refreshAgencies().subscribe();
   }
   updateSelectedAgency(): void {
+    const index = this.agencyList.indexOf(this.selectedAgency);
     try {
-      if (this.newAgency.trim() !== '') {
+      if (this.newAgency.trim() !== '' && index !== -1) {
         // Find the agency code that matches the selected agency name
         const matchingCode = Object.keys(this.agencies).find(key => this.agencies[key] === this.selectedAgency);
         if (matchingCode) {
           // Update the agencyList with the new value at the same index
-          const index = this.agencyList.indexOf(this.selectedAgency);
           if (index !== -1) {
             this.agencyList[index] = this.newAgency;
           }
@@ -65,9 +65,12 @@ export class AgenciesComponent implements OnInit {
           this.updatedData.agencies = [];
         }
         this.toastService.addMessage('Agency Successfully Updated', 'Success Updated', Constants.ToastTypes.SUCCESS);
+        setTimeout(() => {
+          location.reload();
+        }, 1500);
       } else {
         this.toastService.addMessage(
-          'Updated Agency Name Cannot be Empty',
+          'Updating/Updated Agency Name Cannot be Empty',
           'Save unsuccessful',
           Constants.ToastTypes.ERROR
         );

angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.html

@@ -74,7 +74,7 @@ <h2 class="border-0 mb-0">{{ (isEditing && 'Edit') || (!isEditing && 'Add') }} C
           <label for="collectionAgency">Agency</label>
           <select name="collectionAgency" id="collectionAgency" formControlName="collectionAgency" class="form-control">
             <option *ngFor="let collectionAgency of collectionAgencies" [ngValue]="collectionAgency">
-              {{ this.convertAcronyms(collectionAgency) }}
+              {{ this.displayName(collectionAgency) }}
             </option>
           </select>
         </div>
@@ -243,4 +243,4 @@ <h3 class="border-0 mb-0">Associated Records</h3>
       </div>
     </div>
   </div>
-</main>
+</main>

angular/projects/admin-nrpti/src/app/mines/mines-collections-add-edit/mines-collections-add-edit.component.ts

@@ -14,6 +14,7 @@ import { ConfirmComponent } from '../../confirm/confirm.component';
 import { FactoryService } from '../../services/factory.service';
 import { RecordUtils } from '../../records/utils/record-utils';
 import { Constants } from '../../utils/constants/misc';
+import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-collections-add-edit',
@@ -39,7 +40,7 @@ export class MinesCollectionsAddEditComponent implements OnInit, OnDestroy {
 
   // Pick lists
   public collectionTypes = Picklists.collectionTypePicklist;
-  public collectionAgencies = Picklists.collectionAgencyPicklist;
+  public collectionAgencies = Picklists.collectionAgencyCodePicklist;
 
   // collection add edit state
   public collectionState = null;
@@ -541,6 +542,11 @@ export class MinesCollectionsAddEditComponent implements OnInit, OnDestroy {
     return Utils.convertAcronyms(acronym);
   }
 
+  displayName(agency) {
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
+  }
+
   ngOnDestroy(): void {
     // When the component is destroying, if collectionAddEdit state exists, but the user hadn't clicked the
     // 'addRecordsToCollection' button, then remove the collection state from the store.

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.html

@@ -60,7 +60,7 @@ <h4>Basic Information</h4>
             name="issuingAgency"
             id="issuingAgency"
             type="text"
-            value="{{ this.convertAcronyms(defaultAgency) }}"
+            value="{{ this.displayName(defaultAgency) }}"
             class="form-control" />
         </div>
         <div class="label-pair">

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-add-edit/mines-administrative-penalty-add-edit.component.ts

@@ -7,6 +7,7 @@ import { LoadingScreenService, LoggerService } from 'nrpti-angular-components';
 import { Utils, StoreService } from 'nrpti-angular-components';
 import { ChangeDetectorRef } from '@angular/core';
 import { takeUntil } from 'rxjs/operators';
+import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-administrative-penalty-add-edit',
@@ -16,7 +17,7 @@ import { takeUntil } from 'rxjs/operators';
 export class MinesAdministrativePenaltyAddEditComponent extends AdministrativePenaltyAddEditComponent
   implements OnInit {
   public componentTitle = 'BCMI Administrative Penalty Record';
-  public defaultAgency = 'Ministry of Energy Mines and Low Carbon Innovation';
+  public defaultAgency = 'AGENCY_EMLI';
   public defaultAuthor = 'BC Government';
   public currentRecord = null;
 
@@ -103,7 +104,8 @@ export class MinesAdministrativePenaltyAddEditComponent extends AdministrativePe
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   cancel() {

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-administrative-penalty-detail/mines-administrative-penalty-detail.component.ts

@@ -5,7 +5,8 @@ import { takeUntil } from 'rxjs/operators';
 import { AdministrativePenaltyDetailComponent } from '../../../records/administrative-penalties/administrative-penalty-detail/administrative-penalty-detail.component';
 import { RecordUtils } from '../../../records/utils/record-utils';
 import { FactoryService } from '../../../services/factory.service';
-import { StoreService, Utils } from 'nrpti-angular-components';
+import { StoreService } from 'nrpti-angular-components';
+import { AgencyDataService } from '../../../../../../global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-administrative-penalty-detail',
@@ -65,7 +66,8 @@ export class MinesAdministrativePenaltyDetailComponent extends AdministrativePen
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   navigateToEditPage() {

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.html

@@ -60,7 +60,7 @@ <h4>Basic Information</h4>
             name="recordType"
             id="recordType"
             type="text"
-            [value]="this.convertAcronyms(this.myForm.get('issuingAgency').value)"
+            [value]="this.displayName(this.myForm.get('issuingAgency').value)"
             class="form-control"
           />
         </div>

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-add-edit/mines-court-convictions-add-edit.component.ts

@@ -7,6 +7,7 @@ import { LoadingScreenService, LoggerService } from 'nrpti-angular-components';
 import { Utils, StoreService } from 'nrpti-angular-components';
 import { ChangeDetectorRef } from '@angular/core';
 import { takeUntil } from 'rxjs/operators';
+import { AgencyDataService } from '../../../../../../../global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-court-convictions-add-edit',
@@ -17,7 +18,7 @@ import { takeUntil } from 'rxjs/operators';
 })
 export class MinesCourtConvictionsAddEditComponent extends CourtConvictionAddEditComponent implements OnInit {
   public componentTitle = 'BCMI Administrative Penalty Record';
-  public defaultAgency = 'Ministry of Energy Mines and Low Carbon Innovation';
+  public defaultAgency = 'AGENCY_EMLI';
   public defaultAuthor = 'BC Government';
   public currentRecord = null;
 
@@ -152,6 +153,11 @@ export class MinesCourtConvictionsAddEditComponent extends CourtConvictionAddEdi
     }
   }
 
+  displayName(agency) {
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
+  }
+
   cancel() {
     const shouldCancel = confirm(
       'Leaving this page will discard unsaved changes. Are you sure you would like to continue?'

angular/projects/admin-nrpti/src/app/mines/mines-enforcement-actions/mines-court-convictions/mines-court-convictions-detail/mines-court-convictions-detail.component.ts

@@ -5,7 +5,8 @@ import { takeUntil } from 'rxjs/operators';
 import { CourtConvictionDetailComponent } from '../../../../records/court-convictions/court-conviction-detail/court-conviction-detail.component';
 import { RecordUtils } from '../../../../records/utils/record-utils';
 import { FactoryService } from '../../../../services/factory.service';
-import { StoreService, Utils } from 'nrpti-angular-components';
+import { StoreService } from 'nrpti-angular-components';
+import { AgencyDataService } from '../../../../../../../global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-court-convictions-detail',
@@ -64,7 +65,8 @@ export class MinesCourtConvictionsDetailComponent extends CourtConvictionDetailC
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   navigateToEditPage() {

angular/projects/admin-nrpti/src/app/mines/mines-record-add/mines-record-add.component.ts

@@ -6,6 +6,7 @@ import { Picklists } from '../../../../../common/src/app/utils/record-constants'
 import { FactoryService } from '../../services/factory.service';
 import { RecordUtils } from '../../records/utils/record-utils';
 import { Constants } from '../../utils/constants/misc';
+import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-record-add',
@@ -38,7 +39,7 @@ export class MinesRecordAddComponent implements OnInit, OnDestroy {
   );
 
   // Pick lists
-  public recordAgencies = Picklists.collectionAgencyPicklist;
+  public recordAgencies = Picklists.collectionAgencyCodePicklist;
   public recordTypeNamesBCMI = Object.values(Picklists.bcmiRecordTypePicklist).map(item => {
     return item.displayName;
   }).sort();
@@ -176,7 +177,8 @@ export class MinesRecordAddComponent implements OnInit, OnDestroy {
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   ngOnDestroy(): void {

angular/projects/admin-nrpti/src/app/mines/mines-records-detail/mines-records-detail.component.ts

@@ -4,8 +4,8 @@ import { Subject } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import moment from 'moment';
 import { CollectionBCMI } from '../../../../../common/src/app/models/bcmi';
-import { Utils } from 'nrpti-angular-components';
-
+import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service';
+import { FactoryService } from '../../services/factory.service';
 @Component({
   selector: 'app-mines-records-detail',
   templateUrl: './mines-records-detail.component.html',
@@ -22,7 +22,8 @@ export class MinesRecordDetailComponent implements OnInit, OnDestroy {
   constructor(
     public route: ActivatedRoute,
     public router: Router,
-    public changeDetectionRef: ChangeDetectorRef
+    public changeDetectionRef: ChangeDetectorRef,
+    public factoryService: FactoryService
   ) { }
 
   isDisableEdit() {
@@ -73,7 +74,8 @@ export class MinesRecordDetailComponent implements OnInit, OnDestroy {
   }
 
   displayName(agency) {
-    return Utils.displayNameAcronym(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   ngOnDestroy() {

angular/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts

@@ -12,6 +12,7 @@ import { ConfirmComponent } from '../../confirm/confirm.component';
 import { takeUntil, catchError } from 'rxjs/operators';
 import { Constants } from '../../utils/constants/misc';
 import { ToastService } from '../../services/toast.service';
+import { AgencyDataService } from '../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-mines-records-edit',
@@ -49,7 +50,7 @@ export class MinesRecordsEditComponent implements OnInit {
   }).sort();
   public permitTypes = ['OGP', 'AMD'];
 
-  public recordAgencies = Picklists.collectionAgencyPicklist;
+  public recordAgencies = Picklists.collectionAgencyCodePicklist;;
 
   // record add edit state
   public recordState = null;
@@ -286,7 +287,8 @@ export class MinesRecordsEditComponent implements OnInit {
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   /**

angular/projects/admin-nrpti/src/app/mines/mines-records-list/mines-records-list.component.ts

@@ -19,6 +19,8 @@ import { FilterObject, FilterType, DateFilterDefinition, CheckOrRadioFilterDefin
 import { SubsetsObject, SubsetOption } from '../../../../../common/src/app/search-filter-template/subset-object';
 import { Mine } from '../../../../../common/src/app/models/bcmi/mine';
 import { MiscUtils } from '../../utils/constants/misc';
+import { FactoryService } from '../../services/factory.service';
+import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service';
 
 /**
  * Mine list page component.
@@ -121,7 +123,8 @@ export class MinesRecordsListComponent implements OnInit, OnDestroy {
     public storeService: StoreService,
     private loadingScreenService: LoadingScreenService,
     private tableTemplateUtils: TableTemplateUtils,
-    private _changeDetectionRef: ChangeDetectorRef
+    private _changeDetectionRef: ChangeDetectorRef,
+    private factoryService: FactoryService
   ) {
     // setup the subset configuration
     const subsetOptions = [
@@ -155,10 +158,16 @@ export class MinesRecordsListComponent implements OnInit, OnDestroy {
       'agency',
       FilterType.MultiSelect,
       'Responsible Agency',
-      new MultiSelectDefinition(Picklists.agencyPicklist.map(value => {
-        const displayValue = Utils.displayNameFull(value);
-        return { value: value, displayValue: displayValue, selected: false, display: true };
-      }), 'Begin typing to filter agencies...', '')
+      new MultiSelectDefinition(
+        Picklists.getAgencyNames(this.factoryService).map(value => {
+          const agencyDataService = new AgencyDataService(this.factoryService);
+          const displayValue = agencyDataService.displayNameFull(value);
+          const picklistCodes = Picklists.getAgencyCode(this.factoryService, value)
+          return { value: picklistCodes, displayValue: displayValue, selected: false, display: true };
+        }),
+        'Begin typing to filter agencies...',
+        ''
+      )
     );
 
     const sourceSystemFilter = new FilterObject(

angular/projects/admin-nrpti/src/app/mines/mines-records-rows/mines-records-table-row.component.ts

@@ -3,7 +3,7 @@ import { FactoryService } from '../../services/factory.service';
 import { TableRowComponent } from 'nrpti-angular-components';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Entity } from '../../../../../common/src/app/models/master/common-models/entity';
-import { Utils } from 'nrpti-angular-components';
+import { AgencyDataService } from '../../../../../global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'tr[app-mines-records-table-row]',
@@ -39,7 +39,8 @@ export class MinesRecordsTableRowComponent extends TableRowComponent implements
   }
 
   displayName(agency) {
-    return Utils.displayNameAcronym(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   private isDisableEdit() {

angular/projects/admin-nrpti/src/app/records/administrative-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts

@@ -33,7 +33,7 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy
   public nrcedPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
   public authors = Picklists.authorPicklist;
   private defaultAgency = '';
 

angular/projects/admin-nrpti/src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts

@@ -31,7 +31,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy {
   public bcmiPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
 
   public datepickerMinDate = Constants.DatepickerMinDate;
   public datepickerMaxDate = Constants.DatepickerMaxDate;

angular/projects/admin-nrpti/src/app/records/certificate-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts

@@ -34,7 +34,7 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy {
 
   // Pick lists
   public certificateSubtypes = Picklists.certificateSubtypePicklist;
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
 
   public datepickerMinDate = Constants.DatepickerMinDate;
   public datepickerMaxDate = Constants.DatepickerMaxDate;

angular/projects/admin-nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts

@@ -32,7 +32,7 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy {
 
   // Pick lists
   public certificateSubtypes = Picklists.certificateSubtypePicklist;
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
 
   public datepickerMinDate = Constants.DatepickerMinDate;
   public datepickerMaxDate = Constants.DatepickerMaxDate;

angular/projects/admin-nrpti/src/app/records/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts

@@ -31,7 +31,7 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy {
   public lngPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
 
   // Documents
   public documents = [];

angular/projects/admin-nrpti/src/app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts

@@ -33,7 +33,7 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy {
   public bcmiPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
 
   // Documents
   public documents = [];

angular/projects/admin-nrpti/src/app/records/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts

@@ -34,7 +34,7 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy {
   public bcmiPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyCodePicklist;
+  public agencies = Picklists.getAgencyCodes(this.factoryService);
   public authors = Picklists.authorPicklist;
   public courtConvictionSubtypes = Picklists.courtConvictionSubtypePicklist;
   protected defaultAgency = '';