Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/minio/public-assets/activity_logs_user.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ SPDX-License-Identifier: AGPL-3.0-only
border: 1px solid black;
"
>
{{datetime from_rfc3339=created output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=created output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td
style="
Expand All @@ -143,7 +143,7 @@ SPDX-License-Identifier: AGPL-3.0-only
border: 1px solid black;
"
>
{{datetime from_rfc3339=statement_timestamp output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=statement_timestamp output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td
style="
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/minio/public-assets/ballot_receipt_user.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</p>
<div class="key">
Timestamp:
<span class="value" class="timestamp-content">{{timestamp}}</span>
<span class="value" class="timestamp-content">{{datetime from_rfc3339=timestamp output_format="%B %d, %Y %H:%M GMT %:z"}}</span>
</div>
</div>
</p>
Expand Down
8 changes: 4 additions & 4 deletions .devcontainer/minio/public-assets/ovcs_events_user.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,16 @@
{{datetime from_rfc3339=testing_date output_format="%B %d, %Y"}}
</td>
<td>
{{datetime from_rfc3339=initialization_date output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=initialization_date output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td>
{{datetime from_rfc3339=opening_date output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=opening_date output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td>
{{datetime from_rfc3339=closing_date output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=closing_date output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td>
{{datetime from_rfc3339=transmission_date output_format="%B %d, %Y %H:%M"}}
{{datetime from_rfc3339=transmission_date output_format="%B %d, %Y %H:%M GMT %:z"}}
</td>
<td>
{{transmission_status}}
Expand Down
3 changes: 1 addition & 2 deletions .devcontainer/minio/public-assets/overseas_voters_user.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,9 @@
</td>
<td>
{{datetime from_rfc3339=date_voted output_format="%B %d, %Y"}}

</td>
<td>
{{datetime from_rfc3339=date_voted output_format="%H:%M"}}
{{datetime from_rfc3339=date_voted output_format="%H:%M GMT %:z"}}
</td>
</tr>
{{/each}}
Expand Down
6 changes: 6 additions & 0 deletions docs/docusaurus/docs/releases/01-Release-Next/release-next.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ title: Release Notes next
SPDX-License-Identifier: AGPL-3.0-only
-->

## 🐞 Admin Portal > Reports > Timezone shown is not showing timezone
Add timezone information to dates in the List of Overseas Voters, OVCS Events,
Activity Logs reports, and the ballot receipt.

- Issue: [#6191](https://github.com/sequentech/meta/issues/6191)

## 🐞 Tally > Contests are not in order when using multi-contest encoding

Sort contest shows on tally results tabs based on the contest-order
Expand Down
4 changes: 2 additions & 2 deletions packages/windmill/src/services/reports/ballot_receipt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use sequent_core::util::temp_path::*;
use sequent_core::services::pdf;
use sequent_core::services::s3::get_minio_url;
use sequent_core::types::date_time::{DateFormat, TimeZone};
use sequent_core::util::date_time::generate_timestamp;
use sequent_core::util::date_time::get_date_and_time;
use serde::{Deserialize, Serialize};
use tracing::instrument;
use uuid::Uuid;
Expand Down Expand Up @@ -154,7 +154,7 @@ impl TemplateRenderer for BallotTemplate {
ballot_tracker_url: ballot_tracker_url.to_string(),
qrcode: QR_CODE_TEMPLATE.to_string(),
logo: LOGO_TEMPLATE.to_string(),
timestamp: generate_timestamp(time_zone, date_format, None),
timestamp: get_date_and_time(),
})
}

Expand Down
Loading