inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5857] fixed paths and minDate maxDate logic in date-time-widget

Browse Source
This commit is contained in:
SheenaMalhotra182
2023-10-04 01:15:31 +05:30
parent 837ec58a8d
commit dfe25e6ae8
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts
+10 -4
View File
@@ -62,9 +62,12 @@ describe('DateTimeWidgetComponent', () => {
fixture.detectChanges();
minValue = DateFnsUtils.addSeconds(minValue);
if (!minValue.includes('00.')) {
minValue = DateFnsUtils.addSeconds(minValue);
}
const expected = DateFnsUtils.formatDate(new Date(minValue), 'YYYY-MM-DDTHH:mm:ssZ');
const [year, month, day, hours, minutes, seconds] = minValue.split(/[-T:.Z]/).map(Number);
const expected = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds)).toISOString();
expect(widget.minDate).toBe(expected);
});
@@ -87,9 +90,12 @@ describe('DateTimeWidgetComponent', () => {
});
fixture.detectChanges();
maxValue = DateFnsUtils.addSeconds(maxValue);
if (!maxValue.includes('00.')) {
maxValue = DateFnsUtils.addSeconds(maxValue);
}
const expected = DateFnsUtils.formatDate(new Date(maxValue), 'YYYY-MM-DDTHH:mm:ssZ');
const [year, month, day, hours, minutes, seconds] = maxValue.split(/[-T:.Z]/).map(Number);
const expected = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds)).toISOString();
expect(widget.maxDate).toBe(expected);
});
lib/core/src/lib/form/components/widgets/date-time/date-time.widget.ts
+15 -7
View File
@@ -25,7 +25,7 @@ import { WidgetComponent } from '../widget.component';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { DateFnsUtils } from '../../../../common';
import { TranslationService } from '../../../../../../../core/src/lib/translation';
import { TranslationService } from '../../../../../lib/translation/translation.service';
import { FormFieldModel } from '../core';
import { isValid } from 'date-fns';
import { DateFnsAdapter } from '@angular/material-date-fns-adapter';
@@ -63,20 +63,28 @@ export class DateTimeWidgetComponent extends WidgetComponent implements OnInit,
if (this.field) {
if (this.field.minValue) {
this.field.minValue = DateFnsUtils.addSeconds(this.field.minValue);
if (!this.field.minValue.includes('00.')) {
this.field.minValue = DateFnsUtils.addSeconds(this.field.minValue);
}
const [year, month, day, hours, minutes, seconds] = this.field.minValue.split(/[-T:.Z]/).map(Number);
const minDate = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
const minDate = new Date(this.field.minValue);
if (isValid(minDate)) {
this.minDate = DateFnsUtils.formatDate(minDate, 'YYYY-MM-DDTHH:mm:ssZ');
this.minDate = minDate.toISOString();
}
}
if (this.field.maxValue) {
this.field.maxValue = DateFnsUtils.addSeconds(this.field.maxValue);
if (!this.field.maxValue.includes('00.')) {
this.field.maxValue = DateFnsUtils.addSeconds(this.field.maxValue);
}
const [year, month, day, hours, minutes, seconds] = this.field.maxValue.split(/[-T:.Z]/).map(Number);
const maxDate = new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds));
const maxDate = new Date(this.field.maxValue);
if (isValid(maxDate)) {
this.maxDate = DateFnsUtils.formatDate(maxDate, 'YYYY-MM-DDTHH:mm:ssZ');
this.maxDate = maxDate.toISOString();
}
}
}
lib/core/src/lib/form/components/widgets/date/date.widget.ts
+1 -1
View File
@@ -28,7 +28,7 @@ import { DateFnsAdapter, MAT_DATE_FNS_FORMATS } from '@angular/material-date-fns
import { DateFnsUtils } from '../../../../common';
import { isValid } from 'date-fns';
import { FormFieldModel } from '../core';
import { TranslationService } from '../../../../../../../core/src/lib/translation';
import { TranslationService } from '../../../../../lib/translation/translation.service';
@Component({
selector: 'date-widget',