From b62a0ad46ed76bc04f576f0fdc9356967afb3d67 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Mon, 22 Jul 2024 06:23:44 +0200 Subject: [PATCH] [backend/razor] Display local times when rendering timestamps on queue dashboard pages --- Iceshrimp.Backend/Pages/Queue.cshtml | 6 +++--- Iceshrimp.Backend/Pages/QueueJob.cshtml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Iceshrimp.Backend/Pages/Queue.cshtml b/Iceshrimp.Backend/Pages/Queue.cshtml index e043b62f..6af438e8 100644 --- a/Iceshrimp.Backend/Pages/Queue.cshtml +++ b/Iceshrimp.Backend/Pages/Queue.cshtml @@ -177,9 +177,9 @@ else { Job.JobStatus.Queued => $"for {job.QueueDuration.ToDurationDisplayString()}", Job.JobStatus.Running => $"for {job.Duration.ToDurationDisplayString()}", - Job.JobStatus.Delayed => $"until {job.DelayedUntil?.ToDisplayStringTz() ?? ""}", - Job.JobStatus.Completed => $"at {job.FinishedAt?.ToDisplayStringTz() ?? ""}", - Job.JobStatus.Failed => $"at {job.FinishedAt?.ToDisplayStringTz() ?? ""}", + Job.JobStatus.Delayed => $"until {job.DelayedUntil?.ToLocalTime().ToDisplayStringTz() ?? ""}", + Job.JobStatus.Completed => $"at {job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? ""}", + Job.JobStatus.Failed => $"at {job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? ""}", _ => throw new ArgumentOutOfRangeException() }; diff --git a/Iceshrimp.Backend/Pages/QueueJob.cshtml b/Iceshrimp.Backend/Pages/QueueJob.cshtml index 4c4946f1..330e7c3a 100644 --- a/Iceshrimp.Backend/Pages/QueueJob.cshtml +++ b/Iceshrimp.Backend/Pages/QueueJob.cshtml @@ -49,13 +49,13 @@ } Queued at - @Model.Job.QueuedAt.ToDisplayStringTz() + @Model.Job.QueuedAt.ToLocalTime().ToDisplayStringTz() @if (Model.Job.Status is not Job.JobStatus.Queued and not Job.JobStatus.Delayed) { Started at - @(Model.Job.StartedAt?.ToDisplayStringTz() ?? "") + @(Model.Job.StartedAt?.ToLocalTime().ToDisplayStringTz() ?? "") if (Model.Job.WorkerId != null) { @@ -69,14 +69,14 @@ { Finished at - @(Model.Job.FinishedAt?.ToDisplayStringTz() ?? "") + @(Model.Job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? "") } @if (Model.Job.Status == Job.JobStatus.Delayed) { Delayed until - @(Model.Job.DelayedUntil?.ToDisplayStringTz() ?? "") + @(Model.Job.DelayedUntil?.ToLocalTime().ToDisplayStringTz() ?? "") } @if (TimeSpan.FromMilliseconds(Model.Job.Duration).TotalHours <= 72)