fix(dashboard+list): pending status sort first, stats count, badge/recipient/time display
This commit is contained in:
@@ -115,7 +115,7 @@ new Chart(document.getElementById('chart-received'), {
|
||||
</div>
|
||||
<div class="recent-info">
|
||||
<strong>{{ pc.card_number }}</strong>
|
||||
<span class="badge badge-{{ pc.status }}">{{ {'sent':'已寄出','delivered':'已送达','received':'已收到'}.get(pc.status) if user.language=='zh' else {'sent':'Sent','delivered':'Delivered','received':'Received'}.get(pc.status) }}</span>
|
||||
<span class="badge badge-{{ pc.status }}">{{ {'pending':'待寄出','sent':'已寄出','delivered':'已送达','received':'已收到'}.get(pc.status) if user.language=='zh' else {'pending':'Pending','sent':'Sent','delivered':'Delivered','received':'Received'}.get(pc.status) }}</span>
|
||||
</div>
|
||||
<div style="margin-left:auto;text-align:right;display:flex;gap:1rem;align-items:center">
|
||||
<div>
|
||||
@@ -125,7 +125,7 @@ new Chart(document.getElementById('chart-received'), {
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="recent-meta" style="margin-left:0">
|
||||
{% if pc.status in ('sent','delivered') %}
|
||||
{% if pc.status in ('pending','sent','delivered') %}
|
||||
<span>→ {{ pc.recipient_name or '-' }}</span>
|
||||
{% else %}
|
||||
<span>← {{ pc.sender_name or '-' }}</span>
|
||||
@@ -134,7 +134,7 @@ new Chart(document.getElementById('chart-received'), {
|
||||
</div>
|
||||
<div class="recent-meta" style="margin-left:0">
|
||||
<span class="recent-time">
|
||||
{% if pc.status == 'sent' and pc.send_time %}
|
||||
{% if pc.status in ('pending','sent') and pc.send_time %}
|
||||
{% set delta = (now.date() - pc.send_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 %}
|
||||
|
||||
Reference in New Issue
Block a user