informatic
/
covid-formity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore delegated in voivodeship stats, fix missing entries

master
informatic 2020-04-01 11:03:37 +02:00
parent b674ab5daa
commit 967d9a3189
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
formity/admin.py
View File

@ -45,13 +45,17 @@ class IndexView(AdminSecurityMixin, flask_admin.AdminIndexView):
).filter(FaceshieldRequest.status != Status.rejected, FaceshieldRequest.status != Status.spam).group_by(FaceshieldRequest.status).all()
vstats = FaceshieldRequest.query.select_from(FaceshieldRequest).with_entities(
PostalCode.voivodeship.label('voivodeship'),
func.coalesce(PostalCode.voivodeship, 'unknown').label('voivodeship'),
func.count().label('count'),
func.sum(FaceshieldRequest.faceshield_full_required).label('faceshield_full_required'),
func.sum(FaceshieldRequest.faceshield_full_delivered).label('faceshield_full_delivered'),
func.sum(FaceshieldRequest.faceshield_front_required).label('faceshield_front_required'),
func.sum(FaceshieldRequest.faceshield_front_delivered).label('faceshield_front_delivered'),
).filter(FaceshieldRequest.status != Status.rejected, FaceshieldRequest.status != Status.spam).join(FaceshieldRequest.postalcode_info).group_by(PostalCode.voivodeship).order_by(func.count().desc()).all()
).filter(
FaceshieldRequest.status != Status.rejected,
FaceshieldRequest.status != Status.spam,
FaceshieldRequest.status != Status.delegated,
).join(FaceshieldRequest.postalcode_info, isouter=True).group_by('voivodeship').order_by(func.count().desc()).all()
dstats = FaceshieldRequest.query.select_from(FaceshieldRequest).with_entities(
func.date_trunc('day', FaceshieldRequest.created).label('date'),