limit weekly table to seven days

This commit is contained in:
2021-10-18 23:09:01 -06:00
parent d970b4aefe
commit d6e6b7548e
+14 -12
View File
@@ -19,18 +19,20 @@ def index():
).fetchall() ).fetchall()
lastseven = {} lastseven = {}
stops = 0 stops = 0
for row in fourweeks: i = 0
if row['date'] not in lastseven: while len(lastseven) < 7:
lastseven[row['date']] = {} if fourweeks[i]['date'] not in lastseven:
if row['entity'] == 'contract': lastseven[fourweeks[i]['date']] = {}
stops = row['delstops'] + row['pustops'] if fourweeks[i]['entity'] == 'contract':
pkgs = row['delpkgs'] + row['pupkgs'] stops = fourweeks[i]['delstops'] + fourweeks[i]['pustops']
lastseven[row['date']]['stops'] = stops pkgs = fourweeks[i]['delpkgs'] + fourweeks[i]['pupkgs']
lastseven[row['date']]['pkgs'] = pkgs lastseven[fourweeks[i]['date']]['stops'] = stops
lastseven[row['date']]['pkgsperstop'] = round(pkgs / stops, 2) lastseven[fourweeks[i]['date']]['pkgs'] = pkgs
if row['entity'] == 'terminal' : lastseven[fourweeks[i]['date']]['pkgsperstop'] = round(pkgs / stops, 2)
lastseven[row['date']]['termpkgs'] = row['prepkgs'] i += 1
lastseven[row['date']]['percenttermvol'] = round(100 * stops / row['prepkgs'], 2) if fourweeks[i]['entity'] == 'terminal' :
lastseven[fourweeks[i]['date']]['termpkgs'] = fourweeks[i]['prepkgs']
lastseven[fourweeks[i]['date']]['percenttermvol'] = round(100 * stops / fourweeks[i]['prepkgs'], 2)
return render_template('dashboard/index.html', lastseven=lastseven) return render_template('dashboard/index.html', lastseven=lastseven)