Skip to content

Fix #652 - Use internal/user datetime to calculate GMT offset #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scicali wants to merge 3 commits into
base: hotfix
Choose a base branch
from
Open

Fix #652 - Use internal/user datetime to calculate GMT offset #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b09576
Fix #652 - Use internal user datetime to calculate GMT offset
scicali Apr 16, 2025
080fd67
Merge branch 'salesagility:hotfix' into hotfix
scicali Apr 24, 2025
81879f9
Merge branch 'SuiteCRM:hotfix' into hotfix
scicali Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
-->
<ng-container *ngIf="(vm$ | async) as vm">
<span *ngIf="field.value">
{{toDateTime(field.value) | date:getDateTimeFormat():getUserTimeZone()}}
{{toDateTime(field.value) | date:getDateTimeFormat():getUserTimeZone(field.value)}}
</span>
</ng-container>
4 changes: 2 additions & 2 deletions core/app/core/src/lib/fields/datetime/templates/detail/datetime.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export class DateTimeDetailFieldComponent extends BaseDateTimeComponent{
super(formatter, typeFormatter, logic, logicDisplay);
}

getUserTimeZone(): string {
return this.formatter.userTimeZone();
getUserTimeZone(dateString): string {
return this.formatter.userTimeZone(this.formatter.toDateTime(dateString));
}

toDateTime(dateString: string): Date {
Expand Down
6 changes: 3 additions & 3 deletions core/app/core/src/lib/services/formatters/datetime/datetime-formatter.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class DatetimeFormatter implements Formatter {
if (!dateTime.isValid) {
return dateString;
}
return formatDate(dateTime.toJSDate(), toFormat, this.locale, this.userTimeZone());
return formatDate(dateTime.toJSDate(), toFormat, this.locale, this.userTimeZone(dateTime));
}
return '';
}
Expand Down Expand Up @@ -329,12 +329,12 @@ export class DatetimeFormatter implements Formatter {
return !dateTime.isValid;
}

userTimeZone(): string {
userTimeZone(dateTime: DateTime): string {
let userTZ = this.preferences.getUserPreference('timezone') ?? 'GMT';
if (!userTZ) {
userTZ = 'GMT';
}
const milliseconds = DateTime.now().setZone(userTZ).toMillis();
const milliseconds = dateTime.setZone(userTZ).toMillis();
return IANAZone.create(userTZ).formatOffset(milliseconds, 'techie');
}

Expand Down