fix decision condition layout and form submission for application and NOI

Author: Abradat

alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html

@@ -14,26 +14,24 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
     <app-no-data *ngIf="!condition.componentLabelsStr"></app-no-data>
   </div>
 
-  <div *ngIf="showSecurityAmountField">
-    <div class="subheading2">Security Amount</div>
-    {{ condition.securityAmount }}
-    <app-no-data *ngIf="condition.securityAmount === null || condition.securityAmount === undefined"></app-no-data>
-  </div>
-
   <div *ngIf="showAdmFeeField">
-    <div class="subheading2">Admin Fee</div>
+    <div class="subheading2">Administrative Fee Amount</div>
     {{ condition.administrativeFee }}
     <app-no-data
       *ngIf="condition.administrativeFee === null || condition.administrativeFee === undefined"
     ></app-no-data>
   </div>
 
+  <div *ngIf="showSecurityAmountField">
+    <div class="subheading2">Security Amount</div>
+    {{ condition.securityAmount }}
+    <app-no-data *ngIf="condition.securityAmount === null || condition.securityAmount === undefined"></app-no-data>
+  </div>
+
   <div *ngIf="showSingleDateField">
     <div class="subheading2">{{ singleDateLabel }}</div>
     {{ singleDateFormated }}
-    <app-no-data
-      *ngIf="condition.singleDate === null || condition.singleDate === undefined"
-    ></app-no-data>
+    <app-no-data *ngIf="condition.singleDate === null || condition.singleDate === undefined"></app-no-data>
   </div>
 
   <div>

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html

@@ -5,7 +5,10 @@ <h5>{{ data.type?.label }}</h5>
 
 <form [formGroup]="form">
   <div class="condition">
-    <mat-form-field appearance="outline" [class.condition-full-width]="numberOfSelectedConditions === 2">
+    <mat-form-field
+      appearance="outline"
+      [class.condition-full-width]="numberOfSelectedConditions === 2 || numberOfSelectedConditions === 0"
+    >
       <mat-label>Component to Condition</mat-label>
       <mat-select [formControl]="componentsToCondition" multiple>
         <mat-option *ngFor="let component of selectableComponents" [value]="component.tempId">{{

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts

@@ -34,7 +34,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
   minDate = new Date(0);
 
   form = new FormGroup({
-    approvalDependant: this.approvalDependant,
     securityAmount: this.securityAmount,
     singleDate: this.singleDate,
     administrativeFee: this.administrativeFee,
@@ -54,7 +53,9 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
         this.isShowSingleDateRequired = false;
       }
 
-      this.showAdmFeeField = this.data.type?.isAdministrativeFeeAmountChecked ? this.data.type?.isAdministrativeFeeAmountChecked : false;
+      this.showAdmFeeField = this.data.type?.isAdministrativeFeeAmountChecked
+        ? this.data.type?.isAdministrativeFeeAmountChecked
+        : false;
       if (this.data.type?.isAdministrativeFeeAmountRequired) {
         this.administrativeFee.addValidators(Validators.required);
         this.isAdmFeeFieldRequired = true;
@@ -63,7 +64,9 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
         this.isAdmFeeFieldRequired = false;
       }
 
-      this.showSecurityAmountField = this.data.type?.isSecurityAmountChecked ? this.data.type?.isSecurityAmountChecked : false;
+      this.showSecurityAmountField = this.data.type?.isSecurityAmountChecked
+        ? this.data.type?.isSecurityAmountChecked
+        : false;
       if (this.data.type?.isSecurityAmountRequired) {
         this.securityAmount.addValidators(Validators.required);
         this.isSecurityAmountFieldRequired = true;
@@ -93,9 +96,10 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
       this.componentsToCondition.setValue(selectedOptions.map((e) => e.tempId) ?? null);
 
       this.form.patchValue({
-        approvalDependant: this.data.approvalDependant,
         securityAmount: this.data.securityAmount?.toString() ?? null,
-        administrativeFee: this.data.administrativeFee ? this.data.administrativeFee?.toString() : this.data.type?.administrativeFeeAmount?.toString(),
+        administrativeFee: this.data.administrativeFee
+          ? this.data.administrativeFee?.toString()
+          : this.data.type?.administrativeFeeAmount?.toString(),
         description: this.data.description ?? null,
         singleDate: this.data.singleDate ? new Date(this.data.singleDate) : undefined,
       });

alcs-frontend/src/app/features/notice-of-intent/decision/conditions/condition/condition.component.html

@@ -14,26 +14,24 @@ <h4 *ngIf="condition.type">{{ condition.type.label }}</h4>
     <app-no-data *ngIf="!condition.componentLabelsStr"></app-no-data>
   </div>
 
-  <div *ngIf="showSecurityAmountField">
-    <div class="subheading2">Security Amount</div>
-    {{ condition.securityAmount }}
-    <app-no-data *ngIf="condition.securityAmount === null || condition.securityAmount === undefined"></app-no-data>
-  </div>
-
   <div *ngIf="showAdmFeeField">
-    <div class="subheading2">Admin Fee</div>
+    <div class="subheading2">Administrative Fee Amount</div>
     {{ condition.administrativeFee }}
     <app-no-data
       *ngIf="condition.administrativeFee === null || condition.administrativeFee === undefined"
     ></app-no-data>
   </div>
 
+  <div *ngIf="showSecurityAmountField">
+    <div class="subheading2">Security Amount</div>
+    {{ condition.securityAmount }}
+    <app-no-data *ngIf="condition.securityAmount === null || condition.securityAmount === undefined"></app-no-data>
+  </div>
+
   <div *ngIf="showSingleDateField">
     <div class="subheading2">{{ singleDateLabel }}</div>
     {{ singleDateFormated }}
-    <app-no-data
-      *ngIf="condition.singleDate === null || condition.singleDate === undefined"
-    ></app-no-data>
+    <app-no-data *ngIf="condition.singleDate === null || condition.singleDate === undefined"></app-no-data>
   </div>
 
   <div>

alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.html

@@ -5,7 +5,10 @@ <h5>{{ data.type?.label }}</h5>
 
 <form [formGroup]="form">
   <div class="condition">
-    <mat-form-field appearance="outline" [class.condition-full-width]="numberOfSelectedConditions === 2">
+    <mat-form-field
+      appearance="outline"
+      [class.condition-full-width]="numberOfSelectedConditions === 2 || numberOfSelectedConditions === 0"
+    >
       <mat-label>Component to Condition</mat-label>
       <mat-select [formControl]="componentsToCondition" multiple>
         <mat-option *ngFor="let component of selectableComponents" [value]="component.tempId">{{

alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts

@@ -34,7 +34,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
   minDate = new Date(0);
 
   form = new FormGroup({
-    approvalDependant: this.approvalDependant,
     securityAmount: this.securityAmount,
     singleDate: this.singleDate,
     administrativeFee: this.administrativeFee,
@@ -54,7 +53,9 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
         this.isShowSingleDateRequired = false;
       }
 
-      this.showAdmFeeField = this.data.type?.isAdministrativeFeeAmountChecked ? this.data.type?.isAdministrativeFeeAmountChecked : false;
+      this.showAdmFeeField = this.data.type?.isAdministrativeFeeAmountChecked
+        ? this.data.type?.isAdministrativeFeeAmountChecked
+        : false;
       if (this.data.type?.isAdministrativeFeeAmountRequired) {
         this.administrativeFee.addValidators(Validators.required);
         this.isAdmFeeFieldRequired = true;
@@ -63,7 +64,9 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
         this.isAdmFeeFieldRequired = false;
       }
 
-      this.showSecurityAmountField = this.data.type?.isSecurityAmountChecked ? this.data.type?.isSecurityAmountChecked : false;
+      this.showSecurityAmountField = this.data.type?.isSecurityAmountChecked
+        ? this.data.type?.isSecurityAmountChecked
+        : false;
       if (this.data.type?.isSecurityAmountRequired) {
         this.securityAmount.addValidators(Validators.required);
         this.isSecurityAmountFieldRequired = true;
@@ -93,9 +96,10 @@ export class DecisionConditionComponent implements OnInit, OnChanges {
       this.componentsToCondition.setValue(selectedOptions.map((e) => e.tempId) ?? null);
 
       this.form.patchValue({
-        approvalDependant: this.data.approvalDependant,
         securityAmount: this.data.securityAmount?.toString() ?? null,
-        administrativeFee: this.data.administrativeFee ? this.data.administrativeFee?.toString() : this.data.type?.administrativeFeeAmount?.toString(),
+        administrativeFee: this.data.administrativeFee
+          ? this.data.administrativeFee?.toString()
+          : this.data.type?.administrativeFeeAmount?.toString(),
         description: this.data.description ?? null,
         singleDate: this.data.singleDate ? new Date(this.data.singleDate) : undefined,
       });