fix(dashboard): convert UTC times to Beijing time before today/yesterday delta calculation
This commit is contained in:
@@ -135,13 +135,16 @@ new Chart(document.getElementById('chart-received'), {
|
||||
<div class="recent-meta" style="margin-left:0">
|
||||
<span class="recent-time">
|
||||
{% if pc.status == 'sent' and pc.send_time %}
|
||||
{% set delta = (now.date() - pc.send_time.date()).days %}
|
||||
{% set local_time = pc.send_time|to_local %}
|
||||
{% set delta = (now.date() - local_time.date()).days %}
|
||||
{% if delta == 0 %}{{ 'dash.today'|t(user.language) }}{% elif delta == 1 %}{{ 'dash.yesterday'|t(user.language) }}{% else %}{{ delta }}{{ 'dash.days_ago'|t(user.language) }}{% endif %}
|
||||
{% elif pc.status == 'delivered' and pc.arrival_time %}
|
||||
{% set delta = (now.date() - pc.arrival_time.date()).days %}
|
||||
{% set local_time = pc.arrival_time|to_local %}
|
||||
{% set delta = (now.date() - local_time.date()).days %}
|
||||
{% if delta == 0 %}{{ 'dash.today'|t(user.language) }}{% elif delta == 1 %}{{ 'dash.yesterday'|t(user.language) }}{% else %}{{ delta }}{{ 'dash.days_ago'|t(user.language) }}{% endif %}
|
||||
{% elif pc.status == 'received' and pc.receive_time %}
|
||||
{% set delta = (now.date() - pc.receive_time.date()).days %}
|
||||
{% set local_time = pc.receive_time|to_local %}
|
||||
{% set delta = (now.date() - local_time.date()).days %}
|
||||
{% if delta == 0 %}{{ 'dash.today'|t(user.language) }}{% elif delta == 1 %}{{ 'dash.yesterday'|t(user.language) }}{% else %}{{ delta }}{{ 'dash.days_ago'|t(user.language) }}{% endif %}
|
||||
{% endif %}
|
||||
</span>
|
||||
|
||||
Reference in New Issue
Block a user