Compare commits
2
Commits
ae1a23143e
...
7da337cc4d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7da337cc4d | ||
|
|
c23de38b21 |
No files matched your search
+2
-1
@@ -630,7 +630,7 @@ def dashboard(request: Request, user: User = Depends(get_current_user_web), db:
|
||||
"countries": countries, "recent": recent,
|
||||
"sent_pct": sent_pct, "delivered_pct": delivered_pct, "received_pct": received_pct,
|
||||
"sent_country_stats": sent_country_stats, "received_country_stats": received_country_stats,
|
||||
"now": datetime.now(_tz.utc),
|
||||
"now": datetime.now(_tz.utc) + timedelta(hours=8),
|
||||
})
|
||||
|
||||
|
||||
@@ -644,6 +644,7 @@ def profile_list(request: Request, user: User = Depends(get_current_user_web), d
|
||||
cards = db.query(Postcard).filter(Postcard.profile_id == p.id).all()
|
||||
extras[p.id] = {
|
||||
"total": len(cards),
|
||||
"pending": sum(1 for c in cards if c.status == "pending"),
|
||||
"sent": sum(1 for c in cards if c.status == "sent"),
|
||||
"delivered": sum(1 for c in cards if c.status == "delivered"),
|
||||
"received": sum(1 for c in cards if c.status == "received"),
|
||||
|
||||
@@ -229,6 +229,7 @@ code { background: var(--bg); padding: .15rem .4rem; border-radius: 4px; font-si
|
||||
.stat-value { font-size: 1.1rem; font-weight: 700; }
|
||||
.stat-label { font-size: .75rem; color: var(--text-muted); }
|
||||
.badge-sent-text { color: var(--sent); }
|
||||
.badge-pending-text { color: var(--primary); }
|
||||
.badge-delivered-text { color: var(--delivered); }
|
||||
.badge-received-text { color: var(--received); }
|
||||
.profile-card-footer { display: flex; align-items: center; justify-content: space-between; }
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -34,6 +34,10 @@
|
||||
<span class="stat-value">{{ e.total }}</span>
|
||||
<span class="stat-label">{{ 'profiles.total'|t(user.language) }}</span>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="stat-value badge-pending-text">{{ e.pending }}</span>
|
||||
<span class="stat-label">{{ 'status.pending'|t(user.language) }}</span>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="stat-value badge-sent-text">{{ e.sent }}</span>
|
||||
<span class="stat-label">{{ 'dash.sent'|t(user.language) }}</span>
|
||||
|
||||
Reference in New Issue
Block a user