Merge pull request #1204 from GemeenteUtrecht/fix/kownsl-config

Fix empty properties or docs
GemeenteUtrecht · Mar 1, 2024 · a82b713 · a82b713
2 parents fa932f5 + d3c89d4
commit a82b713
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/...ocessen/configuration-components/adviseren-accorderen/adviseren-accorderen.component.html b/...ocessen/configuration-components/adviseren-accorderen/adviseren-accorderen.component.html
@@ -11,20 +11,12 @@ <h2>{{taskContextData.task.name}} voor {{taskContextData.context.zaakInformatie.
 
   <p><u>Selecteer minimaal één document of zaakeigenschap.</u></p>
 
-  <ng-container *ngIf="(documentsData?.length === 0)">
-    <p class="p--danger"><i>Deze zaak heeft nog geen documenten. Voeg documenten toe in het tabblad "Documenten".</i></p>
-  </ng-container>
-
-  <ng-container *ngIf="(taskContextData.context.zaakeigenschappen?.length === 0)">
-    <p class="p--danger"><i>Deze zaak heeft nog geen geconfigureerde zaakeigenschappen.</i></p>
-  </ng-container>
-
-
   <form class="configuration-form" [formGroup]="assignUsersForm" *ngIf="documentsData?.length > 0 || taskContextData.context.zaakeigenschappen?.length > 0">
     <article class="configuration-details">
       <label class="h4 d-inline-block">Documenten</label>
-      <p>Over welke documenten gaat het?</p>
-      <div class="configuration-files">
+        <p *ngIf="(documentsData?.length === 0)" class="p--danger"><i>Deze zaak heeft nog geen documenten. Voeg documenten toe in het tabblad "Documenten".</i></p>
+      <div *ngIf="(documentsData?.length > 0)" class="configuration-files">
+        <p>Over welke documenten gaat het?</p>
         <div class="row pl-3">
           <div class="d-block">
             <gu-table *ngIf="(documentsData?.length > 0) && tableData"
@@ -44,18 +36,21 @@ <h2>{{taskContextData.task.name}} voor {{taskContextData.context.zaakInformatie.
     </article>
     <article class="configuration-details">
       <label class="h4 d-inline-block">Zaakinformatie</label>
-      <p>Over welke zaakeigenschap gaat het?</p>
-      <ul *ngIf="selectedProperties">
-        <li class="configuration-properties" *ngFor="let eigenschap of taskContextData.context.zaakeigenschappen">
-          <gu-checkbox (change)="updateSelectedProperties($event)"
-                       [value]="eigenschap.url"
-                       [checked]="isInSelectedProperties(eigenschap.url)"
-                       class="d-inline-block mr-1"
-          >
-            {{eigenschap.naam}}: {{eigenschap.waarde}}
-          </gu-checkbox>
-        </li>
-      </ul>
+      <p *ngIf="(taskContextData.context.zaakeigenschappen?.length === 0)" class="p--danger"><i>Deze zaak heeft nog geen geconfigureerde zaakeigenschappen.</i></p>
+      <ng-container *ngIf="(taskContextData.context.zaakeigenschappen?.length > 0)" >
+        <p>Over welke zaakeigenschap(pen) gaat het?</p>
+        <ul *ngIf="selectedProperties">
+          <li class="configuration-properties" *ngFor="let eigenschap of taskContextData.context.zaakeigenschappen">
+            <gu-checkbox (change)="updateSelectedProperties($event)"
+                         [value]="eigenschap.url"
+                         [checked]="isInSelectedProperties(eigenschap.url)"
+                         class="d-inline-block mr-1"
+            >
+              {{eigenschap.naam}}: {{eigenschap.waarde}}
+            </gu-checkbox>
+          </li>
+        </ul>
+      </ng-container>
     </article>
     <article class="configuration-details" *ngFor="let step of [].constructor(steps); let i = index">
       <label class="h4 d-inline-block">{{assignedUsersTitle[reviewType]}}</label>

diff --git a/...processen/configuration-components/adviseren-accorderen/adviseren-accorderen.component.ts b/...processen/configuration-components/adviseren-accorderen/adviseren-accorderen.component.ts
@@ -133,7 +133,7 @@ export class AdviserenAccorderenComponent implements OnChanges {
       this.selectedDocuments = this.taskContextData.context.previouslySelectedDocuments;
       this.selectedProperties = this.taskContextData.context.previouslySelectedZaakeigenschappen.length > 0 ?
         this.taskContextData.context.previouslySelectedZaakeigenschappen :
-        this.taskContextData.context.zaakeigenschappen.map(doc => doc.url) 
+        this.taskContextData.context.zaakeigenschappen.map(doc => doc.url)
       this.fetchDocuments();
       this.checkPredefinedAssignees();
       this.addPreviouslyAssignedUsersStep();