diff --git a/app_seed.py b/app_seed.py index 69f1053..949f954 100644 --- a/app_seed.py +++ b/app_seed.py @@ -1,7 +1,13 @@ from application import db, app -from application.dashboard.models import AllowedPlate +from application.dashboard.models import AllowedPlate, LoggedItem, datetime with app.app_context(): AllowedPlate.query.delete() db.session.add(AllowedPlate("MUN389")) db.session.commit() + +with app.app_context(): + LoggedItem.query.delete() + db.session.add(LoggedItem("MUN389", datetime.now(), True)) + db.session.add(LoggedItem("MUN389", datetime.now(), False)) + db.session.commit() diff --git a/application/dashboard/templates/dashboard.html b/application/dashboard/templates/dashboard.html index 4f1482d..e613bde 100644 --- a/application/dashboard/templates/dashboard.html +++ b/application/dashboard/templates/dashboard.html @@ -23,13 +23,13 @@ - {% for form in recent_logs %} + {% for log in logs %} - {{ form.timestamp.strftime('%H:%M:%S') }} - {{ plate.plate }} + {{ log.dateLogged.strftime('%H:%M:%S') }} + {{ log.plate }} - {{ form.allowed }} + {{ log.allowed }} diff --git a/application/dashboard/views.py b/application/dashboard/views.py index 1bca61c..9044e15 100644 --- a/application/dashboard/views.py +++ b/application/dashboard/views.py @@ -12,8 +12,8 @@ dash_blueprint = Blueprint("dash", __name__, template_folder="templates") #@login_required def dashboard(): Plates = AllowedPlate.query.all() - recent_logs = LoggedItem.query.order_by(LoggedItem.dateLogged.desc()).limit(50).all() - return render_template("dashboard.html", plates=Plates, recent_logs=recent_logs) + logs = LoggedItem.query.order_by(LoggedItem.dateLogged.desc()).limit(50).all() + return render_template("dashboard.html", plates=Plates, logs=logs) @dash_blueprint.route('/add', methods=['GET', 'POST'])