From 4c1f5b19421883f64cff295d06d64cd0642f0fad Mon Sep 17 00:00:00 2001
From: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Fri, 12 Nov 2021 14:17:33 +0100
Subject: [PATCH] fix activities validation

---
 .../slutredovisning-form-step1.component.html |  4 +-
 .../slutredovisning-form-step1.component.ts   |  8 +--
 .../slutredovisning-form-step3.component.html |  2 +-
 .../slutredovisning-form.component.html       | 70 +++++++++----------
 4 files changed, 42 insertions(+), 42 deletions(-)

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"
       ></ui-textarea>
     </div>
     <!--    TODO: If something is required at the top of the form it will be hard to see when at the bottom and clicking next -->
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 @@
     </footer>
   </ng-template>
 </div>
-<pre>{{slutredovisning$|async|json}}</pre>
+<!--<pre>{{slutredovisning$|async|json}}</pre>-->
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 @@
       </ng-template>
     </div>
 
-    <h2>Step 0 valueChanges:</h2>
-    <pre>
-          {{ step0FormGroup.valueChanges | async | json}}
-        </pre
-    >
-    <h2>Step 1 valueChanges:</h2>
-    <pre>
-          {{ step1FormGroup.valueChanges | async | json}}
-        </pre
-    >
-    <h2>Step 2 valueChanges:</h2>
-    <pre>
-          {{ step2FormGroup.valueChanges | async | json}}
-        </pre
-    >
+    <!--    <h2>Step 0 valueChanges:</h2>-->
+    <!--    <pre>-->
+    <!--          {{ step0FormGroup.valueChanges | async | json}}-->
+    <!--        </pre-->
+    <!--    >-->
+    <!--    <h2>Step 1 valueChanges:</h2>-->
+    <!--    <pre>-->
+    <!--          {{ step1FormGroup.valueChanges | async | json}}-->
+    <!--        </pre-->
+    <!--    >-->
+    <!--    <h2>Step 2 valueChanges:</h2>-->
+    <!--    <pre>-->
+    <!--          {{ step2FormGroup.valueChanges | async | json}}-->
+    <!--        </pre-->
+    <!--    >-->
 
-    <h2>Step 0 data:</h2>
-    <pre>
-              {{step0FormData$ | async | json}}
-            </pre
-    >
+    <!--    <h2>Step 0 data:</h2>-->
+    <!--    <pre>-->
+    <!--              {{step0FormData$ | async | json}}-->
+    <!--            </pre-->
+    <!--    >-->
 
-    <h2>Step 1 data:</h2>
-    <pre>
-              {{step1FormData$ | async | json}}
-            </pre
-    >
-    <h2>Step 2 data:</h2>
-    <pre>
-              {{step2FormData$ | async | json}}
-            </pre
-    >
-    <h2>slutredovisningFormData$ data:</h2>
-    <pre>
-              {{slutredovisningFormData$ | async | json}}
-            </pre
-    >
+    <!--    <h2>Step 1 data:</h2>-->
+    <!--    <pre>-->
+    <!--              {{step1FormData$ | async | json}}-->
+    <!--            </pre-->
+    <!--    >-->
+    <!--    <h2>Step 2 data:</h2>-->
+    <!--    <pre>-->
+    <!--              {{step2FormData$ | async | json}}-->
+    <!--            </pre-->
+    <!--    >-->
+    <!--    <h2>slutredovisningFormData$ data:</h2>-->
+    <!--    <pre>-->
+    <!--              {{slutredovisningFormData$ | async | json}}-->
+    <!--            </pre-->
+    <!--    >-->
   </msfa-report-layout>
 </msfa-layout>
 <ng-template #skeletonRef>