Skip to content

Commit e2699f6

Browse files
Fix datetime on detail view
1 parent 32e3660 commit e2699f6

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
-->
2828
<ng-container *ngIf="(vm$ | async) as vm">
2929
<span *ngIf="field.value">
30-
{{toDateTime(field.value) | date:getDateTimeFormat():getUserTimeZone()}}
30+
{{toDateTime(field.value)}}
3131
</span>
3232
</ng-container>

core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.ts

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {DataTypeFormatter} from '../../../../services/formatters/data-type.forma
3030
import {DatetimeFormatter} from '../../../../services/formatters/datetime/datetime-formatter.service';
3131
import {FieldLogicManager} from '../../../field-logic/field-logic.manager';
3232
import {FieldLogicDisplayManager} from '../../../field-logic-display/field-logic-display.manager';
33+
import {UserPreferenceStore} from "../../../../store/user-preference/user-preference.store";
3334

3435
@Component({
3536
selector: 'scrm-datetime-detail',
@@ -43,7 +44,8 @@ export class DateTimeDetailFieldComponent extends BaseDateTimeComponent{
4344
protected formatter: DatetimeFormatter,
4445
protected typeFormatter: DataTypeFormatter,
4546
protected logic: FieldLogicManager,
46-
protected logicDisplay: FieldLogicDisplayManager
47+
protected logicDisplay: FieldLogicDisplayManager,
48+
protected preferences: UserPreferenceStore
4749
) {
4850
super(formatter, typeFormatter, logic, logicDisplay);
4951
}
@@ -52,9 +54,18 @@ export class DateTimeDetailFieldComponent extends BaseDateTimeComponent{
5254
return this.formatter.userTimeZone();
5355
}
5456

55-
toDateTime(dateString: string): Date {
56-
return this.formatter.toDateTime(dateString, this.formatter.getInternalFormat(), {
57-
zone: 'GMT'
58-
}).toJSDate();
57+
getLocale(): string {
58+
return this.formatter.locale;
5959
}
60+
61+
toDateTime(dateString: string) {
62+
const options = {
63+
fromFormat: this.formatter.getInternalFormat(),
64+
toFormat: this.formatter.getUserFormat()
65+
}
66+
67+
return this.formatter.toUserFormat(dateString, options);
68+
}
69+
70+
6071
}

0 commit comments

Comments
 (0)