fix(dashboard): exclude pending postcards from sent stat count
This commit is contained in:
@@ -590,7 +590,7 @@ def dashboard(request: Request, user: User = Depends(get_current_user_web), db:
|
|||||||
all_cards.extend(cards)
|
all_cards.extend(cards)
|
||||||
|
|
||||||
total = len(all_cards)
|
total = len(all_cards)
|
||||||
sent = sum(1 for c in all_cards if c.status in ("pending", "sent"))
|
sent = sum(1 for c in all_cards if c.status == "sent")
|
||||||
delivered = sum(1 for c in all_cards if c.status == "delivered")
|
delivered = sum(1 for c in all_cards if c.status == "delivered")
|
||||||
received = sum(1 for c in all_cards if c.status == "received")
|
received = sum(1 for c in all_cards if c.status == "received")
|
||||||
countries = len({c.country_to for c in all_cards if c.country_to})
|
countries = len({c.country_to for c in all_cards if c.country_to})
|
||||||
@@ -642,7 +642,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()
|
cards = db.query(Postcard).filter(Postcard.profile_id == p.id).all()
|
||||||
extras[p.id] = {
|
extras[p.id] = {
|
||||||
"total": len(cards),
|
"total": len(cards),
|
||||||
"sent": sum(1 for c in cards if c.status in ("pending", "sent")),
|
"sent": sum(1 for c in cards if c.status == "sent"),
|
||||||
"delivered": sum(1 for c in cards if c.status == "delivered"),
|
"delivered": sum(1 for c in cards if c.status == "delivered"),
|
||||||
"received": sum(1 for c in cards if c.status == "received"),
|
"received": sum(1 for c in cards if c.status == "received"),
|
||||||
"countries": len({c.country_to for c in cards if c.country_to}),
|
"countries": len({c.country_to for c in cards if c.country_to}),
|
||||||
|
|||||||
Reference in New Issue
Block a user