fix(core/forms): prints date even when formcontrol changes

gnucoop · Sep 15, 2023 · 1a61104 · 1a61104
1 parent e211733
commit 1a61104
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/projects/core/forms/src/read-only-date-field.html b/projects/core/forms/src/read-only-date-field.html
@@ -1 +1,7 @@
-<span *ngIf="date|async as dateVal">{{dateVal}}</span>
+<ng-container *ngIf="control|async as ctrl">
+
+  <span *ngIf="date|async as dateVal; else dateCtrl">{{dateVal}}</span>
+  <ng-template #dateCtrl>
+    {{formatDateField(ctrl.value)}}
+  </ng-template>
+</ng-container>
diff --git a/projects/core/forms/src/read-only-date-field.ts b/projects/core/forms/src/read-only-date-field.ts
@@ -65,28 +65,30 @@ export class AjfReadOnlyDateFieldComponent extends CoreComponent {
       filter(control => control != null),
       map(ctrl => {
         if (ctrl) {
-          const val = ctrl.value;
-          if (val == null) {
-            return '';
-          }
-
-          let dt = null;
-          if (typeof val === 'string') {
-            dt = parse(val, 'yyyy-MM-dd', new Date());
-          } else {
-            dt = toDate(val);
-          }
-          if (!isNaN(dt.valueOf())) {
-            const datePipe = new DatePipe(this._getCurrentLocale());
-            return datePipe.transform(dt, 'shortDate') as string;
-          }
-          return '';
+          this.formatDateField(ctrl.value);
         }
         return '';
       }),
     );
   }
 
+  formatDateField(val: any): string {
+    if (val == null) {
+      return '';
+    }
+    let dt = null;
+    if (typeof val === 'string') {
+      dt = parse(val, 'yyyy-MM-dd', new Date());
+    } else {
+      dt = toDate(val);
+    }
+    if (!isNaN(dt.valueOf())) {
+      const datePipe = new DatePipe(this._getCurrentLocale());
+      return datePipe.transform(dt, 'shortDate') as string;
+    }
+    return '';
+  }
+
   private _getCurrentLocale(): string {
     const lang = this._ts.getActiveLang();
     switch (lang) {