From 14a39e68bfe6a002bb028f7de22c07bcd69896eb Mon Sep 17 00:00:00 2001
From: Felipe Barreta <fbarreta@gmail.com>
Date: Wed, 18 Dec 2024 15:01:54 -0800
Subject: [PATCH 1/4] ALCS-2446 Set single date as default if date is not
 checked

---
 .../decision-condition-types-dialog.component.html           | 2 +-
 .../decision-condition-types-dialog.component.ts             | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
index 45bfff2b0..d353acedd 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
@@ -100,7 +100,7 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type</h4>
             *ngIf="conditionTypeForm.get('isDateChecked')?.value"
             class="condition-date-types"
           >
-            <mat-radio-button [value]="DateType.SINGLE">Single - Select date label </mat-radio-button>
+            <mat-radio-button [value]="DateType.SINGLE" [checked]="isSingleDateDeafult">Single - Select date label </mat-radio-button>
             <div class="condition-fields-container" *ngIf="conditionTypeForm.value.dateType === DateType.SINGLE">
               <mat-button-toggle-group
                 id="singleDateLabelId"
diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
index 811f7fb59..008e0d952 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
@@ -39,6 +39,7 @@ export class DecisionConditionTypesDialogComponent {
   isLoading = false;
   isEdit = false;
   showWarning = false;
+  isSingleDateDeafult = false;
 
   service: ApplicationDecisionConditionTypesService | NoticeofIntentDecisionConditionTypesService | undefined;
   conditionService: ApplicationDecisionConditionService | NoticeOfIntentDecisionConditionService | undefined;
@@ -110,6 +111,10 @@ export class DecisionConditionTypesDialogComponent {
       this.conditionTypeForm.get('code')?.disable();
     }
 
+    if (!this.data?.content?.isDateChecked && !this.data?.content?.dateType) {
+      this.isSingleDateDeafult = true;
+    }
+
     this.conditionTypeForm.get('isComponentToConditionChecked')?.disable();
     this.conditionTypeForm.get('isDescriptionChecked')?.disable();
     this.isLoading = false;

From 3cbebcbe5f94d3f143a1c36284a6f9a1a2c29252 Mon Sep 17 00:00:00 2001
From: Felipe Barreta <fbarreta@gmail.com>
Date: Wed, 18 Dec 2024 15:07:50 -0800
Subject: [PATCH 2/4] ALCS-2446 Typo fix

---
 .../decision-condition-types-dialog.component.html            | 2 +-
 .../decision-condition-types-dialog.component.ts              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
index d353acedd..3d393b9e9 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
@@ -100,7 +100,7 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type</h4>
             *ngIf="conditionTypeForm.get('isDateChecked')?.value"
             class="condition-date-types"
           >
-            <mat-radio-button [value]="DateType.SINGLE" [checked]="isSingleDateDeafult">Single - Select date label </mat-radio-button>
+            <mat-radio-button [value]="DateType.SINGLE" [checked]="isSingleDateDefault">Single - Select date label </mat-radio-button>
             <div class="condition-fields-container" *ngIf="conditionTypeForm.value.dateType === DateType.SINGLE">
               <mat-button-toggle-group
                 id="singleDateLabelId"
diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
index 008e0d952..36e8c2456 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
@@ -39,7 +39,7 @@ export class DecisionConditionTypesDialogComponent {
   isLoading = false;
   isEdit = false;
   showWarning = false;
-  isSingleDateDeafult = false;
+  isSingleDateDefault = false;
 
   service: ApplicationDecisionConditionTypesService | NoticeofIntentDecisionConditionTypesService | undefined;
   conditionService: ApplicationDecisionConditionService | NoticeOfIntentDecisionConditionService | undefined;
@@ -112,7 +112,7 @@ export class DecisionConditionTypesDialogComponent {
     }
 
     if (!this.data?.content?.isDateChecked && !this.data?.content?.dateType) {
-      this.isSingleDateDeafult = true;
+      this.isSingleDateDefault = true;
     }
 
     this.conditionTypeForm.get('isComponentToConditionChecked')?.disable();

From 6e1e56b3cece09807fcdfb0c512ff3e2c51862c4 Mon Sep 17 00:00:00 2001
From: Felipe Barreta <fbarreta@gmail.com>
Date: Wed, 18 Dec 2024 15:31:24 -0800
Subject: [PATCH 3/4] ALCS-2446 Set default at the form

---
 .../decision-condition-types-dialog.component.html         | 2 +-
 .../decision-condition-types-dialog.component.ts           | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
index 3d393b9e9..45bfff2b0 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html
@@ -100,7 +100,7 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type</h4>
             *ngIf="conditionTypeForm.get('isDateChecked')?.value"
             class="condition-date-types"
           >
-            <mat-radio-button [value]="DateType.SINGLE" [checked]="isSingleDateDefault">Single - Select date label </mat-radio-button>
+            <mat-radio-button [value]="DateType.SINGLE">Single - Select date label </mat-radio-button>
             <div class="condition-fields-container" *ngIf="conditionTypeForm.value.dateType === DateType.SINGLE">
               <mat-button-toggle-group
                 id="singleDateLabelId"
diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
index 36e8c2456..dc1de601d 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
@@ -39,7 +39,6 @@ export class DecisionConditionTypesDialogComponent {
   isLoading = false;
   isEdit = false;
   showWarning = false;
-  isSingleDateDefault = false;
 
   service: ApplicationDecisionConditionTypesService | NoticeofIntentDecisionConditionTypesService | undefined;
   conditionService: ApplicationDecisionConditionService | NoticeOfIntentDecisionConditionService | undefined;
@@ -92,7 +91,7 @@ export class DecisionConditionTypesDialogComponent {
         [this.conditionAsyncValidator(ValidationFields.Dates)],
       ),
       isDateRequired: new FormControl(this.data?.content?.isDateRequired ? this.data.content.isDateRequired : false),
-      dateType: new FormControl(this.data?.content?.dateType),
+      dateType: new FormControl(this.data?.content?.dateType ?? DateType.SINGLE),
       singleDateLabel: new FormControl(
         this.data?.content?.singleDateLabel ? this.data.content.singleDateLabel : DateLabel.DUE_DATE,
       ),
@@ -111,10 +110,6 @@ export class DecisionConditionTypesDialogComponent {
       this.conditionTypeForm.get('code')?.disable();
     }
 
-    if (!this.data?.content?.isDateChecked && !this.data?.content?.dateType) {
-      this.isSingleDateDefault = true;
-    }
-
     this.conditionTypeForm.get('isComponentToConditionChecked')?.disable();
     this.conditionTypeForm.get('isDescriptionChecked')?.disable();
     this.isLoading = false;

From ec1440403737d36b528ed1962ae4090a66d64708 Mon Sep 17 00:00:00 2001
From: Felipe Barreta <fbarreta@gmail.com>
Date: Wed, 18 Dec 2024 15:42:11 -0800
Subject: [PATCH 4/4] ALCS-2446 Check default on form control

---
 .../decision-condition-types-dialog.component.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
index dc1de601d..2a50be3b5 100644
--- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
+++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts
@@ -91,7 +91,7 @@ export class DecisionConditionTypesDialogComponent {
         [this.conditionAsyncValidator(ValidationFields.Dates)],
       ),
       isDateRequired: new FormControl(this.data?.content?.isDateRequired ? this.data.content.isDateRequired : false),
-      dateType: new FormControl(this.data?.content?.dateType ?? DateType.SINGLE),
+      dateType: new FormControl((!this.data?.content?.isDateChecked && !this.data?.content?.dateType) ? DateType.SINGLE : this.data?.content?.dateType),
       singleDateLabel: new FormControl(
         this.data?.content?.singleDateLabel ? this.data.content.singleDateLabel : DateLabel.DUE_DATE,
       ),