fix(core/utils): format date values in the deepCopy of a form

gnucoop · Mar 22, 2023 · 8cd3566 · 8cd3566
1 parent d0952ec
commit 8cd3566
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/projects/core/utils/src/deep-copy.ts b/projects/core/utils/src/deep-copy.ts
@@ -20,10 +20,23 @@
  *
  */
 
+import {format} from 'date-fns';
+
 function functionSerializer(_: any, v: any): any {
   if (typeof v === 'function') {
     return v.toString().replace(/[\r\n]+/g, ' ');
   }
+  if (isNaN(v) && typeof v === 'string') {
+    try {
+      const d = new Date(v);
+      if (d instanceof Date) {
+        return format(d, 'yyyy-MM-dd');
+      }
+    } catch (e) {}
+  }
+  if (typeof v === 'object' && v instanceof Date) {
+    return format(v, 'yyyy-MM-dd');
+  }
   return v;
 }
 

diff --git a/projects/material/forms/src/date-input-field.html b/projects/material/forms/src/date-input-field.html
@@ -5,7 +5,6 @@
     [attr.aria-label]="instance!|ajfNodeCompleteName"
     [min]="instance!.node.minDate|ajfDateValueString"
     [max]="instance!.node.maxDate|ajfDateValueString"
-    (change)="onChange()"
     [formControl]="ctrl!"
   />
   <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>

diff --git a/projects/material/forms/src/date-input-field.ts b/projects/material/forms/src/date-input-field.ts
@@ -35,9 +35,7 @@ import {
   ViewChild,
   ViewEncapsulation,
 } from '@angular/core';
-
 import {MatInput} from '@angular/material/input';
-
 import {AjfWarningAlertService} from './warning-alert-service';
 
 @Component({
@@ -49,31 +47,27 @@ import {AjfWarningAlertService} from './warning-alert-service';
 export class AjfDateInputFieldComponent extends AjfBaseFieldComponent<AjfDateFieldInstance> {
   @ViewChild(MatInput, {static: false}) input!: MatInput;
 
-  private _minDateStr: string | undefined;
-  private _maxDateStr: string | undefined;
-
   constructor(
     cdr: ChangeDetectorRef,
     service: AjfFormRendererService,
     @Inject(AJF_WARNING_ALERT_SERVICE) was: AjfWarningAlertService,
-    private _dvs: AjfDateValueStringPipe,
   ) {
     super(cdr, service, was);
   }
 
-  onChange(): void {
-    if (this.input == null) {
+  // TODO is this function useful??
+  /*
+  onChange(event: MatDatepickerInputEvent<Date>): void {
+    if (event.value == null) {
       return;
     }
-    const val = this.input.value || '';
-    if (val.length > 0) {
-      if (
-        (this._minDateStr != null && val < this._minDateStr) ||
-        (this._maxDateStr != null && val > this._maxDateStr)
-      ) {
-        this.input.value = '';
-      }
+    if (
+      (this._minDateStr != null && event.value < new Date(this._minDateStr)) ||
+      (this._maxDateStr != null && event.value > new Date(this._maxDateStr))
+    ) {
+      this.input.value = '';
     }
+
   }
 
   protected override _onInstanceChange(): void {
@@ -82,5 +76,5 @@ export class AjfDateInputFieldComponent extends AjfBaseFieldComponent<AjfDateFie
     }
     this._minDateStr = this._dvs.transform(this.instance.node.minDate);
     this._maxDateStr = this._dvs.transform(this.instance.node.maxDate);
-  }
+  }*/
 }