notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/razor] Display local times when rendering timestamps on queue dashboard pages

Browse source
This commit is contained in:
Laura Hausmann 2024-07-22 06:23:44 +02:00
parent 1d02ad1073
commit b62a0ad46e
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Iceshrimp.Backend/Pages/Queue.cshtml
View file

@ -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() ?? "<unknown>"}",
Job.JobStatus.Completed => $"at {job.FinishedAt?.ToDisplayStringTz() ?? "<unknown>"}",
Job.JobStatus.Failed => $"at {job.FinishedAt?.ToDisplayStringTz() ?? "<unknown>"}",
Job.JobStatus.Delayed => $"until {job.DelayedUntil?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>"}",
Job.JobStatus.Completed => $"at {job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>"}",
Job.JobStatus.Failed => $"at {job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>"}",
_ => throw new ArgumentOutOfRangeException()
};

8
Iceshrimp.Backend/Pages/QueueJob.cshtml
View file

@ -49,13 +49,13 @@
}
<tr>
<td>Queued at</td>
<td>@Model.Job.QueuedAt.ToDisplayStringTz()</td>
<td>@Model.Job.QueuedAt.ToLocalTime().ToDisplayStringTz()</td>
</tr>
@if (Model.Job.Status is not Job.JobStatus.Queued and not Job.JobStatus.Delayed)
{
<tr>
<td>Started at</td>
<td>@(Model.Job.StartedAt?.ToDisplayStringTz() ?? "<unknown>")</td>
<td>@(Model.Job.StartedAt?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>")</td>
</tr>
if (Model.Job.WorkerId != null)
{
@ -69,14 +69,14 @@
{
<tr>
<td>Finished at</td>
<td>@(Model.Job.FinishedAt?.ToDisplayStringTz() ?? "<unknown>")</td>
<td>@(Model.Job.FinishedAt?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>")</td>
</tr>
}
@if (Model.Job.Status == Job.JobStatus.Delayed)
{
<tr>
<td>Delayed until</td>
<td>@(Model.Job.DelayedUntil?.ToDisplayStringTz() ?? "<unknown>")</td>
<td>@(Model.Job.DelayedUntil?.ToLocalTime().ToDisplayStringTz() ?? "<unknown>")</td>
</tr>
}
@if (TimeSpan.FromMilliseconds(Model.Job.Duration).TotalHours <= 72)