agency code updated

bcgov · Sep 29, 2023 · 0b51cf1 · 0b51cf1
1 parent 612536c
commit 0b51cf1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/...nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts b/...nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts
@@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti
 import { RecordUtils } from '../../utils/record-utils';
 import { LoadingScreenService, LoggerService } from 'nrpti-angular-components';
 import { Constants } from '../../../utils/constants/misc';
+import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-self-report-add-edit',
@@ -30,7 +31,7 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy {
   public lngPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyPicklist;
+  public agencies = Picklists.agencyCodePicklist;
   public authors = Picklists.authorPicklist;
 
   // Documents
@@ -358,7 +359,8 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy {
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   cancel() {

diff --git a/...min-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts b/...min-nrpti/src/app/records/self-reports/self-report-detail/self-report-detail.component.ts
@@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component';
 import { RecordUtils } from '../../utils/record-utils';
 import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils';
 import { FactoryService } from '../../../services/factory.service';
-import { Utils } from 'nrpti-angular-components';
+import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-self-report-detail',
@@ -64,7 +64,8 @@ export class SelfReportDetailComponent extends RecordDetailComponent implements
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   ngOnDestroy() {

diff --git a/...projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts b/...projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.ts
@@ -10,6 +10,7 @@ import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/uti
 import { RecordUtils } from '../../utils/record-utils';
 import { LoadingScreenService, LoggerService } from 'nrpti-angular-components';
 import { Constants } from '../../../utils/constants/misc';
+import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-ticket-add-edit',
@@ -32,7 +33,7 @@ export class TicketAddEditComponent implements OnInit, OnDestroy {
   public nrcedPublishSubtext = 'Not published';
 
   // Pick lists
-  public agencies = Picklists.agencyPicklist;
+  public agencies = Picklists.agencyCodePicklist;
   public authors = Picklists.authorPicklist;
   private defaultAgency = '';
 
@@ -541,7 +542,8 @@ export class TicketAddEditComponent implements OnInit, OnDestroy {
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   cancel() {

diff --git a/...lar/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts b/...lar/projects/admin-nrpti/src/app/records/tickets/ticket-detail/ticket-detail.component.ts
@@ -7,7 +7,7 @@ import { RecordDetailComponent } from '../../utils/record-component';
 import { RecordUtils } from '../../utils/record-utils';
 import { Utils as CommonUtils } from '../../../../../../common/src/app/utils/utils';
 import { FactoryService } from '../../../services/factory.service';
-import { Utils } from 'nrpti-angular-components';
+import { AgencyDataService } from '../../../../../../../projects/global/src/lib/utils/agency-data-service';
 
 @Component({
   selector: 'app-ticket-detail',
@@ -64,7 +64,8 @@ export class TicketDetailComponent extends RecordDetailComponent implements OnIn
   }
 
   displayName(agency) {
-    return Utils.displayNameFull(agency);
+    const agencyDataService = new AgencyDataService(this.factoryService);
+    return agencyDataService.displayNameFull(agency);
   }
 
   ngOnDestroy() {