inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix date issue +1 time zone in date widget (#4982)

Browse Source
This commit is contained in:
Eugenio Romano 2019-08-08 22:52:22 +01:00 committed by GitHub
parent cb988b0145
commit 4aa0f49c58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/form/components/widgets/core/form-field.model.ts
View File

@ -398,7 +398,7 @@ export class FormFieldModel extends FormWidgetModel {
} }
break; break;
case FormFieldTypes.DATETIME: case FormFieldTypes.DATETIME:
const dateTimeValue = moment(this.value, this.dateDisplayFormat, true); const dateTimeValue = moment(this.value, this.dateDisplayFormat, true).utc();
if (dateTimeValue && dateTimeValue.isValid()) { if (dateTimeValue && dateTimeValue.isValid()) {
/* cspell:disable-next-line */ /* cspell:disable-next-line */
this.form.values[this.id] = dateTimeValue.format('YYYY-MM-DDTHH:mm:ssZ'); this.form.values[this.id] = dateTimeValue.format('YYYY-MM-DDTHH:mm:ssZ');

7
lib/core/form/components/widgets/date-time/date-time.widget.ts
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
/* tslint:disable:component-selector */ /* tslint:disable:component-selector */
import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core'; import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material';
@ -75,7 +75,10 @@ export class DateTimeWidgetComponent extends WidgetComponent implements OnInit,
this.maxDate = moment(this.field.maxValue, 'YYYY-MM-DDTHH:mm:ssZ'); this.maxDate = moment(this.field.maxValue, 'YYYY-MM-DDTHH:mm:ssZ');
} }
} }
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat); this.displayDate = moment(this.field.value, this.field.dateDisplayFormat)
.add(
moment(this.field.value, this.field.dateDisplayFormat).utcOffset(),
'minutes');
} }
ngOnDestroy() { ngOnDestroy() {