NOBUG fixing legislation autopopulate in record add/edit

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

@@ -94,6 +94,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'AdministrativePenalty'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -94,6 +94,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'CourtConviction'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/administrative-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html

@@ -89,6 +89,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'AdministrativePenalty'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -81,6 +81,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'AdministrativeSanction'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -68,6 +68,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'AnnualReport'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -74,6 +74,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'CertificateAmendment'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -74,6 +74,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Certificate'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -68,6 +68,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Correspondence'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -112,6 +112,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'CourtConviction'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/dam-safety-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.html

@@ -68,6 +68,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'DamSafetyInspection'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.html

@@ -74,6 +74,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Inspection'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.html

@@ -80,6 +80,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Order'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.html

@@ -70,6 +70,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Permit'"
       ></app-legislation-list-add-edit>
     </section>
 

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

@@ -68,6 +68,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Report'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/restorative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.html

@@ -80,6 +80,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'RestorativeJustice'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.html

@@ -80,6 +80,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'SelfReport'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/tickets/ticket-add-edit/ticket-add-edit.component.html

@@ -74,6 +74,7 @@ <h4>Contravention</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="true"
+        [recordType]="'Ticket'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/admin-nrpti/src/app/records/warnings/warning-add-edit/warning-add-edit.component.html

@@ -74,6 +74,7 @@ <h4>Legislation</h4>
         [formArray]="this.myForm.controls.legislations"
         [sourceSystemRef]="this.currentRecord && this.currentRecord.sourceSystemRef"
         [hasOffence]="false"
+        [recordType]="'Warning'"
       ></app-legislation-list-add-edit>
     </section>
 

angular/projects/common/src/app/legislation/legislation-add-edit/legislation-add-edit.component.ts

@@ -14,6 +14,7 @@ import { Utils } from 'nrpti-angular-components';
 export class LegislationAddEditComponent implements OnInit {
   @Input() formGroup: FormGroup;
   @Input() hasOffence: boolean;
+  @Input() recordType: string;
 
   @Input() hideSection = false;
   @Input() hideSubSection = false;
@@ -43,7 +44,7 @@ export class LegislationAddEditComponent implements OnInit {
   constructor(
     public utils: Utils,
     protected _changeDetectionRef: ChangeDetectorRef
-  ) {}
+  ) { }
 
   ngOnInit(): void {
     if (this.formGroup.controls.act.value && this.formGroup.controls.regulation.value) {
@@ -94,14 +95,14 @@ export class LegislationAddEditComponent implements OnInit {
       paragraph: this.formGroup.get('paragraph').value
     });
 
-    if ( this.hasOffence ) {
+    if (this.hasOffence) {
       this.formGroup.get('offence').setValue(
-        Picklists.getLegislationDescription('AdministrativePenalty', legislation)
+        Picklists.getLegislationDescription(this.recordType, legislation)
       );
       this.formGroup.get('offence').markAsDirty();
     } else {
       this.formGroup.get('legislationDescription').setValue(
-        Picklists.getLegislationDescription('AdministrativePenalty', legislation)
+        Picklists.getLegislationDescription(this.recordType, legislation)
       );
       this.formGroup.get('legislationDescription').markAsDirty();
     }

angular/projects/common/src/app/legislation/legislation-list-add-edit/legislation-list-add-edit.component.html

@@ -12,6 +12,7 @@
   <app-legislation-add-edit
     [formGroup]="formGroup"
     [hasOffence]="hasOffence"
+    [recordType]="recordType"
   ></app-legislation-add-edit>
   <button *ngIf="sourceSystemRef==='nrpti' && idx !== 0 && hasOffence" class="btn btn-outline-primary delete-btn" type="button" title="Delete this contravention" (click)="removeLegislation(idx)">
     <i class="material-icons"></i>

angular/projects/common/src/app/legislation/legislation-list-add-edit/legislation-list-add-edit.component.ts

@@ -10,6 +10,7 @@ export class LegislationListAddEditComponent implements OnInit {
   @Input() formArray: FormArray;
   @Input() sourceSystemRef: string;
   @Input() hasOffence: boolean;
+  @Input() recordType: string;
 
   ngOnInit(): void {}
 

angular/projects/common/src/app/record-association/record-association-edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { FactoryService } from '../../../../admin-nrpti/src/app/services/factory.service';
-import { StoreService} from 'nrpti-angular-components';
+import { StoreService } from 'nrpti-angular-components';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { Utils } from 'nrpti-angular-components';
@@ -33,7 +33,7 @@ export class RecordAssociationEditComponent implements OnInit {
     public factoryService: FactoryService,
     private storeService: StoreService,
     private utils: Utils
-    ) {}
+  ) { }
 
   ngOnInit() {
     this.storeService.stateChange.subscribe((state: object) => {
@@ -49,7 +49,7 @@ export class RecordAssociationEditComponent implements OnInit {
     });
     this.updateMineMeta();
     this.subscribeToFormControlChanges();
-   }
+  }
 
   private subscribeToFormControlChanges() {
     const debouncedMineMeta = this.utils.debounced(500, () => this.updateMineMeta());
@@ -64,11 +64,15 @@ export class RecordAssociationEditComponent implements OnInit {
   private updateMineMeta() {
     const mineGuid = this.formGroup.get('mineGuid').value;
     const unlistedMineType = this.formGroup.get('unlistedMineType').value;
+    let mine = null;
 
-    const mine = this.mines.filter( elem => {
-      if (elem._sourceRefId === mineGuid ) {
-        return elem;
-    } });
+    if (this.mines) {
+      mine = this.mines.filter(elem => {
+        if (elem._sourceRefId === mineGuid) {
+          return elem;
+        }
+      });
+    }
 
     if (!mineGuid && !unlistedMineType) {
       this.mineType = '';

angular/projects/common/src/app/utils/record-constants.ts

@@ -799,7 +799,7 @@ export class Picklists {
    * @memberof Picklists
    * @returns {string[]} sorted array of acts
    */
-  public static getAllActs = function(): string[] {
+  public static getAllActs = function (): string[] {
     return Object.keys(this.legislationActsMappedToRegulations).sort();
   };
 
@@ -810,7 +810,7 @@ export class Picklists {
    * @memberof Picklists
    * @returns {string[]} sorted array of regulations
    */
-  public static getAllRegulations = function(): string[] {
+  public static getAllRegulations = function (): string[] {
     const regulations = [];
 
     Object.keys(this.legislationActsMappedToRegulations).forEach(act =>
@@ -834,7 +834,7 @@ export class Picklists {
    * @memberof Picklists
    * @returns {{ [key: string]: string[] }}
    */
-  public static getLegislationRegulationsMappedToActs = function(): { [key: string]: string[] } {
+  public static getLegislationRegulationsMappedToActs = function (): { [key: string]: string[] } {
     const regulations = {};
 
     Object.keys(this.legislationActsMappedToRegulations).forEach(act =>
@@ -2561,16 +2561,16 @@ export class Picklists {
                 description: 'Fail to implement a food safety plan'
               },
               c: {
-                  description: 'Fail to keep records of monitoring activities or corrective actions'
+                description: 'Fail to keep records of monitoring activities or corrective actions'
               },
               d: {
-                  description: 'Fail to keep food safety plan in a conspicuous location'
+                description: 'Fail to keep food safety plan in a conspicuous location'
               },
               e: {
-                  description: 'Fail to make food safety plan available'
+                description: 'Fail to make food safety plan available'
               },
               f: {
-                  description: 'Fail to review food safety plan annually or if required'
+                description: 'Fail to review food safety plan annually or if required'
               },
             },
             '3': {
@@ -5119,8 +5119,9 @@ export class Picklists {
    * @static
    * @returns {string} legislation description or null
    */
-  public static getLegislationDescription = function(recordType: string, legislation: Legislation): string {
-    if (!recordType || !legislation || !legislation.act || !legislation.section) {
+  public static getLegislationDescription = function (recordType: string, legislation: Legislation): string {
+
+    if (!recordType || (!legislation && !legislation.act && !legislation.section)) {
       return null;
     }
 
@@ -5174,7 +5175,7 @@ export class Picklists {
    * @param {string[]} paths properties to descend, in order, through the object.
    * @returns the value found at the end of the path, or null
    */
-  public static traverseObject = function(obj: object, paths: string[]) {
+  public static traverseObject = function (obj: object, paths: string[]) {
     if (!obj || !paths || !paths.length) {
       return null;
     }