diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.html index 1e1e1f1..9308dee 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.html @@ -14,8 +14,8 @@ [uiMaxLength]="2000" [uiMinLength]="1" [uiRequired]="true" - [uiValidationMessage]="activityFormGroup.get('description')?.errors?.required" - [uiInvalid]="activityFormGroup.get('description')?.touched && !!activityFormGroup.get('description')?.errors?.required" + [uiValidationMessage]="activityFormGroup.get('whatHasBeenDone')?.errors?.required" + [uiInvalid]="activityFormGroup.get('whatHasBeenDone')?.touched && !!activityFormGroup.get('whatHasBeenDone')?.errors?.required" > diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.ts index ed0f96d..55b55e4 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.ts @@ -31,11 +31,11 @@ export class SlutredovisningFormStep1Component implements OnInit { private changeDetectionRef: ChangeDetectorRef ) {} - private clearActivities(): void { + private _clearActivities(): void { this.activitiesFormArray.clear(); } - private addActivityToForm(activity: Activity): void { + private _addActivityToForm(activity: Activity): void { this.activitiesFormArray.push( new FormGroup({ name: new FormControl(activity.name), @@ -54,8 +54,8 @@ export class SlutredovisningFormStep1Component implements OnInit { .getAllChosenActivities(this.genomforandereferens) .pipe(take(1)) .subscribe(activities => { - this.clearActivities(); - activities.forEach(activity => this.addActivityToForm(activity)); + this._clearActivities(); + activities.forEach(activity => this._addActivityToForm(activity)); }); } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html index 5955313..7348282 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html @@ -37,4 +37,4 @@ -
{{slutredovisning$|async|json}}
+
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
index 4fc365c..9b38aac 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
@@ -51,43 +51,43 @@
-
- {{ step0FormGroup.valueChanges | async | json}}
-
-
- {{ step1FormGroup.valueChanges | async | json}}
-
-
- {{ step2FormGroup.valueChanges | async | json}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{step0FormData$ | async | json}}
-
+
+
+
+
+
-
- {{step1FormData$ | async | json}}
-
-
- {{step2FormData$ | async | json}}
-
-
- {{slutredovisningFormData$ | async | json}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+