From deb460708115e9a7f3a130fe29221961a9e3fafe Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 13 May 2025 13:55:01 -0400 Subject: [PATCH] adding time zone support to admin modules --- Oqtane.Client/Modules/Admin/Files/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Jobs/Log.razor | 4 ++-- Oqtane.Client/Modules/Admin/Logs/Detail.razor | 2 +- Oqtane.Client/Modules/Admin/Logs/Index.razor | 2 +- Oqtane.Client/Modules/Admin/UrlMappings/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Users/Edit.razor | 2 +- Oqtane.Client/Modules/Admin/Users/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Visitors/Detail.razor | 4 ++-- Oqtane.Client/Modules/Admin/Visitors/Index.razor | 4 ++-- Oqtane.Client/Modules/Controls/AuditInfo.razor | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index 06f7e61c..b730603b 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -53,7 +53,7 @@ else @context.Name - @context.ModifiedOn + @UtcToLocal(context.ModifiedOn) @context.Extension.ToUpper() @SharedLocalizer["File"] @string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor index f5453315..55efc788 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor @@ -23,8 +23,8 @@ else @context.Job.Name @DisplayStatus(context.Job.IsExecuting, context.Succeeded) - @context.StartDate - @context.FinishDate + @UtcToLocal(context.StartDate) + @UtcToLocal(context.FinishDate) @((MarkupString)context.Notes) diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index fd980bce..379a4f3c 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -141,7 +141,7 @@ var log = await LogService.GetLogAsync(_logId); if (log != null) { - _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); + _logDate = UtcToLocal(log.LogDate).Value.ToString(CultureInfo.CurrentCulture); _level = log.Level; _feature = log.Feature; _function = log.Function; diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index dfb0cf8d..594393ca 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -64,7 +64,7 @@ else - @context.LogDate + @UtcToLocal(context.LogDate) @context.Level @context.Feature @context.Function diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor index 75a4c845..554213fa 100644 --- a/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor +++ b/Oqtane.Client/Modules/Admin/UrlMappings/Index.razor @@ -48,7 +48,7 @@ else } @context.Requests - @context.RequestedOn + @UtcToLocal(context.RequestedOn) diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index 37d8f165..ae66baef 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -207,7 +207,7 @@ _displayname = user.DisplayName; _timezoneid = PageState.User.TimeZoneId; _isdeleted = user.IsDeleted.ToString(); - _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn); + _lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", UtcToLocal(user.LastLoginOn)); _lastipaddress = user.LastIPAddress; _ishost = UserSecurity.ContainsRole(user.Roles, RoleNames.Host); diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index d3eb9bc7..7d34670f 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -43,7 +43,7 @@ else @context.User.Username @context.User.DisplayName @((MarkupString)string.Format("{1}", @context.User.Email, @context.User.Email)) - @((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "") + @((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", UtcToLocal(context.User.LastLoginOn)) : "") diff --git a/Oqtane.Client/Modules/Admin/Visitors/Detail.razor b/Oqtane.Client/Modules/Admin/Visitors/Detail.razor index e0570431..13dd456f 100644 --- a/Oqtane.Client/Modules/Admin/Visitors/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Visitors/Detail.razor @@ -101,8 +101,8 @@ _url = visitor.Url; _referrer = visitor.Referrer; _visits = visitor.Visits.ToString(); - _visited = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture); - _created = visitor.CreatedOn.ToString(CultureInfo.CurrentCulture); + _visited = UtcToLocal(visitor.VisitedOn).Value.ToString(CultureInfo.CurrentCulture); + _created = UtcToLocal(visitor.CreatedOn).Value.ToString(CultureInfo.CurrentCulture); if (visitor.UserId != null) { diff --git a/Oqtane.Client/Modules/Admin/Visitors/Index.razor b/Oqtane.Client/Modules/Admin/Visitors/Index.razor index 1cb46d3e..2dccb94b 100644 --- a/Oqtane.Client/Modules/Admin/Visitors/Index.razor +++ b/Oqtane.Client/Modules/Admin/Visitors/Index.razor @@ -53,8 +53,8 @@ else @context.Language @context.Visits - @context.VisitedOn - @context.CreatedOn + @UtcToLocal(context.VisitedOn) + @UtcToLocal(context.CreatedOn) diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index acbb3dc6..e2a025ec 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -52,7 +52,7 @@ if (CreatedOn != null) { - _text += $" {Localizer["On"]} {CreatedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["On"]} {UtcToLocal(CreatedOn).Value.ToString(DateTimeFormat)}"; } _text += "

"; @@ -69,7 +69,7 @@ if (ModifiedOn != null) { - _text += $" {Localizer["On"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["On"]} {UtcToLocal(ModifiedOn).Value.ToString(DateTimeFormat)}"; } _text += "

"; @@ -86,7 +86,7 @@ if (DeletedOn != null) { - _text += $" {Localizer["On"]} {DeletedOn.Value.ToString(DateTimeFormat)}"; + _text += $" {Localizer["On"]} {UtcToLocal(DeletedOn).Value.ToString(DateTimeFormat)}"; } _text += "

";