From d6e6b7548efdb900f8c11d4bc5e783d3d99d69b1 Mon Sep 17 00:00:00 2001 From: Eric Phillips Date: Mon, 18 Oct 2021 23:09:01 -0600 Subject: [PATCH] limit weekly table to seven days --- flaskfdx/dashboard.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/flaskfdx/dashboard.py b/flaskfdx/dashboard.py index 3f1df6d..5cdc9a2 100644 --- a/flaskfdx/dashboard.py +++ b/flaskfdx/dashboard.py @@ -19,18 +19,20 @@ def index(): ).fetchall() lastseven = {} stops = 0 - for row in fourweeks: - if row['date'] not in lastseven: - lastseven[row['date']] = {} - if row['entity'] == 'contract': - stops = row['delstops'] + row['pustops'] - pkgs = row['delpkgs'] + row['pupkgs'] - lastseven[row['date']]['stops'] = stops - lastseven[row['date']]['pkgs'] = pkgs - lastseven[row['date']]['pkgsperstop'] = round(pkgs / stops, 2) - if row['entity'] == 'terminal' : - lastseven[row['date']]['termpkgs'] = row['prepkgs'] - lastseven[row['date']]['percenttermvol'] = round(100 * stops / row['prepkgs'], 2) + i = 0 + while len(lastseven) < 7: + if fourweeks[i]['date'] not in lastseven: + lastseven[fourweeks[i]['date']] = {} + if fourweeks[i]['entity'] == 'contract': + stops = fourweeks[i]['delstops'] + fourweeks[i]['pustops'] + pkgs = fourweeks[i]['delpkgs'] + fourweeks[i]['pupkgs'] + lastseven[fourweeks[i]['date']]['stops'] = stops + lastseven[fourweeks[i]['date']]['pkgs'] = pkgs + lastseven[fourweeks[i]['date']]['pkgsperstop'] = round(pkgs / stops, 2) + i += 1 + 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)