Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

stop gap fix to mitigate date conversion exceptions on WebAssembly

Browse Source
This commit is contained in:
sbwalker
2025-06-05 10:37:25 -04:00
parent 4418e27c29
commit 85085bf4c7
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -500,17 +500,24 @@ namespace Oqtane.Modules
}; };
} }
// date methods // date conversion methods
public DateTime? UtcToLocal(DateTime? datetime) public DateTime? UtcToLocal(DateTime? datetime)
{ {
TimeZoneInfo timezone = null; TimeZoneInfo timezone = null;
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId)) try
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId); if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
}
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
}
} }
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId)) catch
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId); // The time zone ID was not found on the local computer
} }
return Utilities.UtcAsLocalDateTime(datetime, timezone); return Utilities.UtcAsLocalDateTime(datetime, timezone);
} }
@ -518,13 +525,20 @@ namespace Oqtane.Modules
public DateTime? LocalToUtc(DateTime? datetime) public DateTime? LocalToUtc(DateTime? datetime)
{ {
TimeZoneInfo timezone = null; TimeZoneInfo timezone = null;
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId)) try
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId); if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
}
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
}
} }
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId)) catch
{ {
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId); // The time zone ID was not found on the local computer
} }
return Utilities.LocalDateAndTimeAsUtc(datetime, timezone); return Utilities.LocalDateAndTimeAsUtc(datetime, timezone);
} }