Skip to content

Commit 6347d2d

Browse files
renemadsenrenemadsen
committed
More merge fixes.
1 parent 9b27131 commit 6347d2d

File tree

4 files changed

+70
-99
lines changed

4 files changed

+70
-99
lines changed

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-create-modal/property-create-modal.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ <h3 mat-dialog-title>{{ 'New property' | translate }}</h3>
1515
<mat-label>{{'CHR name' | translate}}</mat-label>
1616
<input matInput type="text" formControlName="name">
1717
</mat-form-field>
18+
1819
<mat-form-field>
1920
<mat-label>{{'CHR Number' | translate}}</mat-label>
2021
<input matInput type="text" formControlName="chr" (input)="onChrNumberChanged($event.target.value)">

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-create-modal/property-create-modal.component.ts‎

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -70,48 +70,44 @@ export class PropertyCreateModalComponent implements OnInit, OnDestroy {
7070
this.propertyCreate.emit(newProperty);
7171
}
7272
onNameFilterChanged(number: string) {
73-
this.newProperty.cvr = number;
74-
// if (+number === 0) {
75-
// this.propertyIsFarm = false;
76-
// }
77-
// if (+number === 1111111) {
73+
this.newPropertyForm.patchValue({ cvr: number });
74+
75+
if (+number === 0) {
76+
this.propertyIsFarm = false;
77+
this.newPropertyForm.patchValue({ isFarm: false });
78+
}
79+
80+
if (+number === 1111111) {
7881
this.propertyIsFarm = true;
79-
this.newProperty.isFarm = true;
80-
// }
81-
// if (+number > 1111111) {
82-
// if (number.toString().length > 7) {
83-
// this.getCompanyTypeSub$ = this.propertiesService.getCompanyType(+number)
84-
// .subscribe((data) => {
85-
// if (data && data.success) {
86-
// if (data.model.industrycode.toString().slice(0, 2) === '01') {
87-
// this.propertyIsFarm = true;
88-
// this.newProperty.isFarm = true;
89-
// if (data.model.error !== 'NOT_FOUND') {
90-
// this.newProperty.address = data.model.address + ', ' + data.model.city;
91-
// this.newProperty.name = data.model.name;
92-
// this.newProperty.industryCode = data.model.industrycode;
93-
// }
94-
// } else {
95-
// if (data.model.error === 'REQUIRES_PAID_SUBSCRIPTION') {
96-
// this.propertyIsFarm = true;
97-
// this.newProperty.isFarm = true;
98-
// } else {
99-
// this.propertyIsFarm = false;
100-
// this.newProperty.isFarm = false;
101-
// if (data.model.error !== 'NOT_FOUND') {
102-
// this.newProperty.address = data.model.address + ', ' + data.model.city;
103-
// this.newProperty.name = data.model.name;
104-
// this.newProperty.industryCode = data.model.industrycode;
105-
// }
106-
// }
107-
// }
108-
// }
109-
// });
110-
// }
111-
// } else {
112-
// this.newProperty.name = '';
113-
// this.newProperty.address = '';
114-
// }
82+
this.newPropertyForm.patchValue({ isFarm: true });
83+
}
84+
85+
if (+number > 1111111 && number.toString().length > 7) {
86+
this.getCompanyTypeSub$ = this.propertiesService.getCompanyType(+number)
87+
.subscribe((data) => {
88+
if (data?.success) {
89+
if (data.model.industrycode.toString().slice(0, 2) === '01') {
90+
this.propertyIsFarm = true;
91+
this.newPropertyForm.patchValue({
92+
isFarm: true,
93+
name: data.model.name,
94+
address: `${data.model.address}, ${data.model.city}`,
95+
industryCode: data.model.industrycode
96+
});
97+
} else {
98+
this.propertyIsFarm = data.model.error === 'REQUIRES_PAID_SUBSCRIPTION';
99+
this.newPropertyForm.patchValue({
100+
isFarm: this.propertyIsFarm,
101+
name: data.model.name || '',
102+
address: data.model.address ? `${data.model.address}, ${data.model.city}` : '',
103+
industryCode: data.model.industrycode || ''
104+
});
105+
}
106+
}
107+
});
108+
} else {
109+
this.newPropertyForm.patchValue({ name: '', address: '' });
110+
}
115111
}
116112

117113
onChrNumberChanged(number: number) {

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-edit-modal/property-edit-modal.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ <h3 mat-dialog-title>{{ 'Edit property' | translate }}</h3>
3030
formControlName="name"
3131
/>
3232
</mat-form-field>
33+
3334
<mat-form-field>
34-
<mat-label>{{'CHR Number' | translate}}</mat-label>
35+
<mat-label>{{ 'CHR Number' | translate }}</mat-label>
3536
<input
3637
matInput
3738
type="text"
3839
formControlName="chr"
40+
(input)="onChrNumberChanged($event.target.value)"
3941
/>
4042
</mat-form-field>
4143

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/property-actions/property-edit-modal/property-edit-modal.component.ts‎

Lines changed: 29 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -75,65 +75,37 @@ export class PropertyEditModalComponent implements OnInit, OnDestroy {
7575
this.propertyUpdate.emit(updatedProperty);
7676
}
7777

78-
onNameFilterChanged(number: number) {
79-
// if (number === 0) {
80-
// this.propertyIsFarm = false;
81-
// }
82-
// if (number === 1111111) {
78+
onNameFilterChanged(number: string) {
79+
this.editPropertyForm.patchValue({ cvr: number });
80+
81+
if (+number === 0) {
82+
this.propertyIsFarm = false;
83+
this.editPropertyForm.patchValue({ isFarm: false });
84+
}
85+
86+
if (+number === 1111111) {
8387
this.propertyIsFarm = true;
84-
// }
85-
// if (number > 1111111) {
86-
// if (number.toString().length > 7) {
87-
// this.getCompanyTypeSub$ = this.propertiesService.getCompanyType(number)
88-
// .subscribe((data) => {
89-
// if (data && data.success) {
90-
// if (data.model.industrycode.toString().slice(0, 2) === '01') {
91-
// this.propertyIsFarm = true;
92-
// this.selectedProperty.isFarm = true;
93-
// if (data.model.error !== 'NOT_FOUND') {
94-
// this.selectedProperty.address = data.model.address + ', ' + data.model.city;
95-
// this.selectedProperty.name = data.model.name;
96-
// this.selectedProperty.industryCode = data.model.industrycode;
97-
// }
98-
// } else {
99-
// if (data.model.error === 'REQUIRES_PAID_SUBSCRIPTION') {
100-
// this.propertyIsFarm = true;
101-
// this.selectedProperty.isFarm = true;
102-
// } else {
103-
// this.propertyIsFarm = false;
104-
// this.selectedProperty.isFarm = false;
105-
// if (data.model.error !== 'NOT_FOUND') {
106-
// this.selectedProperty.address = data.model.address + ', ' + data.model.city;
107-
// this.selectedProperty.name = data.model.name;
108-
// this.selectedProperty.industryCode = data.model.industrycode;
109-
// }
110-
// }
111-
// }
112-
// }
113-
// });
114-
// }
115-
// } else {
116-
// // this.selectedProperty.name = '';
117-
// // this.selectedProperty.address = '';
118-
// }
119-
}
88+
this.editPropertyForm.patchValue({ isFarm: true });
89+
}
90+
91+
if (+number > 1111111 && number.toString().length > 7) {
92+
this.getCompanyTypeSub$ = this.propertiesService.getCompanyType(+number).subscribe((data) => {
93+
if (data?.success) {
94+
const industryPrefix = data.model.industrycode.toString().slice(0, 2);
95+
const isFarm = industryPrefix === '01' || data.model.error === 'REQUIRES_PAID_SUBSCRIPTION';
12096

121-
// addToArray(e: any, languageId: number) {
122-
// if (e.target.checked) {
123-
// this.selectedLanguages = [
124-
// ...this.selectedLanguages,
125-
// { id: languageId, checked: true },
126-
// ];
127-
// } else {
128-
// this.selectedLanguages = this.selectedLanguages.filter(
129-
// (x) => x.id !== languageId
130-
// );
131-
// }
132-
// }
133-
134-
getLanguageIsChecked(languageId: number): boolean {
135-
const language = this.selectedLanguages.find((x) => x.id === languageId);
136-
return language ? language.checked : false;
97+
this.propertyIsFarm = isFarm;
98+
this.editPropertyForm.patchValue({
99+
isFarm,
100+
name: data.model.name || '',
101+
address: data.model.address ? `${data.model.address}, ${data.model.city}` : '',
102+
industryCode: data.model.industrycode || '',
103+
});
104+
}
105+
});
106+
} else {
107+
this.editPropertyForm.patchValue({ name: '', address: '' });
108+
}
137109
}
138110

139111
onChrNumberChanged(number: number) {

0 commit comments

Comments
 (0)