Skip to content

Commit 5c82e51

Browse files
cameronpettitcameronpettit
authored
NRPT-813 fixing error preventing record add/edit (#912)
1 parent a372cb4 commit 5c82e51

File tree

18 files changed

+47
-102
lines changed

18 files changed

+47
-102
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,9 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy
534534
}
535535

536536
this.myForm.controls.location.dirty && (administrativePenalty['location'] = this.myForm.controls.location.value);
537-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
537+
administrativePenalty['centroid'] = [];
538+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
538539
(administrativePenalty['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
539-
540-
// Properly unset centroid if lon/lat are deleted
541-
if (!administrativePenalty['centroid'][0] || !administrativePenalty['centroid'][1]) {
542-
administrativePenalty['centroid'] = [];
543540
}
544541

545542
// tslint:disable-next-line:max-line-length

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,15 +446,12 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy
446446
}
447447

448448
this.myForm.controls.location.dirty && (administrativeSanction['location'] = this.myForm.controls.location.value);
449-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
449+
administrativeSanction['centroid'] = [];
450+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
450451
(administrativeSanction['centroid'] = [
451452
this.myForm.controls.longitude.value,
452453
this.myForm.controls.latitude.value
453454
]);
454-
455-
// Properly unset centroid if lon/lat are deleted
456-
if (!administrativeSanction['centroid'][0] || !administrativeSanction['centroid'][1]) {
457-
administrativeSanction['centroid'] = [];
458455
}
459456

460457
// tslint:disable-next-line:max-line-length

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy {
202202
* @returns {FormGroup[]} array of legislations FormGroup elements
203203
* @memberof AnnualReportAddEditComponent
204204
*/
205-
getLegislationsFormGroups(): FormGroup[] {
205+
getLegislationsFormGroups(): FormGroup[] {
206206
if (!this.currentRecord || !this.currentRecord.legislation || !this.currentRecord.legislation.length) {
207207
return [];
208208
}
@@ -248,7 +248,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy {
248248
* @returns {object[]} array of legislations objects
249249
* @memberof AnnualReportAddEditComponent
250250
*/
251-
parseLegislationsFormGroups(): object[] {
251+
parseLegislationsFormGroups(): object[] {
252252
const legislationsFormArray = this.myForm.get('legislations');
253253

254254
if (!legislationsFormArray || !legislationsFormArray.value || !legislationsFormArray.value.length) {
@@ -328,12 +328,9 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy {
328328
}
329329

330330
this.myForm.controls.location.dirty && (annualReport['location'] = this.myForm.controls.location.value);
331-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
331+
annualReport['centroid'] = [];
332+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
332333
(annualReport['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
333-
334-
// Properly unset centroid if lon/lat are deleted
335-
if (!annualReport['centroid'][0] || !annualReport['centroid'][1]) {
336-
annualReport['centroid'] = [];
337334
}
338335

339336
// BCMI flavour

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,9 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy {
372372
}
373373

374374
this.myForm.controls.location.dirty && (certificateAmendment['location'] = this.myForm.controls.location.value);
375-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
375+
certificateAmendment['centroid'] = [];
376+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
376377
(certificateAmendment['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
377-
378-
// Properly unset centroid if lon/lat are deleted
379-
if (!certificateAmendment['centroid'][0] || !certificateAmendment['centroid'][1]) {
380-
certificateAmendment['centroid'] = [];
381378
}
382379

383380
// tslint:disable-next-line:max-line-length

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,9 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy {
286286
}
287287

288288
this.myForm.controls.location.dirty && (certificate['location'] = this.myForm.controls.location.value);
289-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
289+
certificate['centroid'] = [];
290+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
290291
(certificate['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
291-
292-
// Properly unset centroid if lon/lat are deleted
293-
if (!certificate['centroid'][0] || !certificate['centroid'][1]) {
294-
certificate['centroid'] = [];
295292
}
296293

297294
// tslint:disable-next-line:max-line-length

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy {
5050
private loadingScreenService: LoadingScreenService,
5151
private utils: Utils,
5252
private _changeDetectionRef: ChangeDetectorRef
53-
) {}
53+
) { }
5454

5555
ngOnInit() {
5656
this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => {
@@ -211,12 +211,9 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy {
211211
}
212212

213213
this.myForm.controls.location.dirty && (constructionPlan['location'] = this.myForm.controls.location.value);
214-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
214+
constructionPlan['centroid'] = [];
215+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
215216
(constructionPlan['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
216-
217-
// Properly unset centroid if lon/lat are deleted
218-
if (!constructionPlan['centroid'][0] || !constructionPlan['centroid'][1]) {
219-
constructionPlan['centroid'] = [];
220217
}
221218

222219
// LNG flavour

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Component, OnInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
22
import { ActivatedRoute, Router } from '@angular/router';
33
import { takeUntil } from 'rxjs/operators';
44
import { Subject } from 'rxjs';
5-
import { FormGroup, FormControl, FormArray} from '@angular/forms';
5+
import { FormGroup, FormControl, FormArray } from '@angular/forms';
66
import { Picklists, EpicProjectIds } from '../../../../../../common/src/app/utils/record-constants';
77
import { FactoryService } from '../../../services/factory.service';
88
import { Utils } from 'nrpti-angular-components';
@@ -367,12 +367,9 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy {
367367
}
368368

369369
this.myForm.controls.location.dirty && (correspondence['location'] = this.myForm.controls.location.value);
370-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
370+
correspondence['centroid'] = [];
371+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
371372
(correspondence['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
372-
373-
// Properly unset centroid if lon/lat are deleted
374-
if (!correspondence['centroid'][0] || !correspondence['centroid'][1]) {
375-
correspondence['centroid'] = [];
376373
}
377374

378375
// tslint:disable-next-line:max-line-length

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy {
5757
protected _changeDetectionRef: ChangeDetectorRef,
5858
// @ts-ignore used by record-association component
5959
protected storeService: StoreService
60-
) {}
60+
) { }
6161

6262
ngOnInit() {
6363
this.route.data.pipe(takeUntil(this.ngUnsubscribe)).subscribe((res: any) => {
@@ -516,12 +516,9 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy {
516516
}
517517

518518
this.myForm.controls.location.dirty && (courtConviction['location'] = this.myForm.controls.location.value);
519-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
519+
courtConviction['centroid'] = [];
520+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
520521
(courtConviction['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
521-
522-
// Properly unset centroid if lon/lat are deleted
523-
if (!courtConviction['centroid'][0] || !courtConviction['centroid'][1]) {
524-
courtConviction['centroid'] = [];
525522
}
526523

527524
// tslint:disable-next-line:max-line-length

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,9 @@ export class DamSafetyInspectionAddEditComponent implements OnInit, OnDestroy {
369369
}
370370

371371
this.myForm.controls.location.dirty && (damSafetyInspection['location'] = this.myForm.controls.location.value);
372-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
372+
damSafetyInspection['centroid'] = [];
373+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
373374
(damSafetyInspection['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
374-
375-
// Properly unset centroid if lon/lat are deleted
376-
if (!damSafetyInspection['centroid'][0] || !damSafetyInspection['centroid'][1]) {
377-
damSafetyInspection['centroid'] = [];
378375
}
379376

380377
// tslint:disable-next-line:max-line-length

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy {
216216
((this.nrcedFlavour && this.nrcedFlavour.summary) ||
217217
(!this.nrcedFlavour && this.currentRecord.description))) ||
218218
'',
219-
disabled: !this.factoryService.isFlavourEditEnabled(flavourEditRequiredRoles.NRCED)
219+
disabled: !this.factoryService.isFlavourEditEnabled(flavourEditRequiredRoles.NRCED)
220220
}),
221221
publishNrced: new FormControl({
222222
value: (this.currentRecord && this.nrcedFlavour && this.nrcedFlavour.read.includes('public')) || false,
@@ -227,7 +227,7 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy {
227227
lngDescription: new FormControl({
228228
value: (this.currentRecord &&
229229
((this.lngFlavour && this.lngFlavour.description) || (!this.lngFlavour && this.currentRecord.description))) ||
230-
'',
230+
'',
231231
disabled: !this.factoryService.isFlavourEditEnabled(flavourEditRequiredRoles.LNG)
232232
}),
233233
publishLng: new FormControl({
@@ -398,12 +398,9 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy {
398398
}
399399

400400
this.myForm.controls.location.dirty && (inspection['location'] = this.myForm.controls.location.value);
401-
(this.myForm.controls.latitude.dirty || this.myForm.controls.longitude.dirty) &&
401+
inspection['centroid'] = [];
402+
if (this.myForm.controls.latitude.value && this.myForm.controls.longitude.value) {
402403
(inspection['centroid'] = [this.myForm.controls.longitude.value, this.myForm.controls.latitude.value]);
403-
404-
// Properly unset centroid if lon/lat are deleted
405-
if (!inspection['centroid'][0] || !inspection['centroid'][1]) {
406-
inspection['centroid'] = [];
407404
}
408405

409406
this.myForm.controls.outcomeStatus.dirty &&

0 commit comments

Comments
 (0)