feat: add timezone handling
This commit is contained in:
parent
349cee0ce6
commit
e8ec620d57
13 changed files with 128 additions and 28 deletions
|
|
@ -63,7 +63,7 @@ defmodule MvWeb.JoinRequestLive.Index do
|
|||
>
|
||||
<:col :let={req} label={gettext("Submitted at")}>
|
||||
<%= if req.submitted_at do %>
|
||||
{DateFormatter.format_datetime(req.submitted_at)}
|
||||
{DateFormatter.format_datetime(req.submitted_at, @browser_timezone)}
|
||||
<% else %>
|
||||
<.empty_cell sr_text={gettext("Not submitted yet")} />
|
||||
<% end %>
|
||||
|
|
@ -125,7 +125,7 @@ defmodule MvWeb.JoinRequestLive.Index do
|
|||
</.badge>
|
||||
</:col>
|
||||
<:col :let={req} label={gettext("Reviewed at")}>
|
||||
{review_date(req)}
|
||||
{review_date(req, @browser_timezone)}
|
||||
</:col>
|
||||
<:col :let={req} label={gettext("Review by")}>
|
||||
{JoinRequestHelpers.reviewer_display(req) || ""}
|
||||
|
|
@ -162,7 +162,7 @@ defmodule MvWeb.JoinRequestLive.Index do
|
|||
assign(socket, :page_title, gettext("Join requests"))
|
||||
end
|
||||
|
||||
defp review_date(req) do
|
||||
defp review_date(req, timezone) do
|
||||
date =
|
||||
case req.status do
|
||||
:approved -> req.approved_at
|
||||
|
|
@ -170,6 +170,6 @@ defmodule MvWeb.JoinRequestLive.Index do
|
|||
_ -> nil
|
||||
end
|
||||
|
||||
if date, do: DateFormatter.format_datetime(date), else: ""
|
||||
if date, do: DateFormatter.format_datetime(date, timezone), else: ""
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ defmodule MvWeb.JoinRequestLive.Show do
|
|||
<div class="border border-base-300 rounded-lg p-4 bg-base-100 space-y-2">
|
||||
<.field_row
|
||||
label={gettext("Submitted at")}
|
||||
value={DateFormatter.format_datetime(@join_request.submitted_at)}
|
||||
value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)}
|
||||
/>
|
||||
<div class="flex gap-2">
|
||||
<span class="text-base-content/60 min-w-32 shrink-0">{gettext("Status")}:</span>
|
||||
|
|
@ -158,13 +158,17 @@ defmodule MvWeb.JoinRequestLive.Show do
|
|||
<%= if @join_request.approved_at do %>
|
||||
<.field_row
|
||||
label={gettext("Approved at")}
|
||||
value={DateFormatter.format_datetime(@join_request.approved_at)}
|
||||
value={
|
||||
DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone)
|
||||
}
|
||||
/>
|
||||
<% end %>
|
||||
<%= if @join_request.rejected_at do %>
|
||||
<.field_row
|
||||
label={gettext("Rejected at")}
|
||||
value={DateFormatter.format_datetime(@join_request.rejected_at)}
|
||||
value={
|
||||
DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone)
|
||||
}
|
||||
/>
|
||||
<% end %>
|
||||
<.field_row
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue