From f39746ba9a045129bbff9a69882adb8356d0c12d Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 21 Jan 2022 16:03:59 -0500 Subject: [PATCH] Can now pull dates and freq out of database and load to page. --- app.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app.py b/app.py index 3731d88..064197e 100644 --- a/app.py +++ b/app.py @@ -1,6 +1,6 @@ from flask import Flask, render_template, request, flash, redirect import datetime -from sqlalchemy import create_engine, Column, Integer, Date, String +from sqlalchemy import create_engine, Column, Integer, String, DateTime from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker @@ -13,8 +13,8 @@ Base = declarative_base() class Dates(Base): __tablename__ = 'Dates' id = Column(Integer, primary_key=True, autoincrement=True) - dateType = Column(Integer), - dateValue = Column(Date) + dateTypeID = Column(Integer) + dateValue = Column(String) class DatesMetadata(Base): @@ -45,13 +45,13 @@ DatesMetadata.__table__.create(bind=engine, checkfirst=True) SettingsMetadata.__table__.create(bind=engine, checkfirst=True) Session = sessionmaker(bind=engine) -session = Session() + @app.route('/', methods=('GET', 'POST')) @app.route('/index.html', methods=('GET', 'POST')) def index(): - + session = Session() plantdate = datetime.datetime(2022, 1,19) last = datetime.datetime(2022, 1,19) freq = 7 @@ -69,11 +69,12 @@ def index(): else: dates = {'plant': '', 'last': '', 'next':'', 'freq': ''} - dates['plant'] = session.query(Dates.dateValue).filter(Dates.dateType == 1).first() - dates['last'] = session.query(Dates.dateValue).filter(Dates.dateType == 2).first() - dates['next'] = session.query(Dates.dateValue).filter(Dates.dateType == 3).first() - dates['freq'] = session.query(Dates.dateValue).filter(Dates.dateType == 4).first() - flash(dates['plant']) + # result = session.query(Dates).filter_by(dateTypeID=1).first() + dates['plant'] = session.query(Dates).filter_by(dateTypeID=1).first().dateValue + dates['last'] = session.query(Dates).filter_by(dateTypeID=2).first().dateValue + dates['next'] = session.query(Dates).filter_by(dateTypeID=3).first().dateValue + dates['freq'] = session.query(Dates).filter_by(dateTypeID=4).first().dateValue + print(datetime.datetime.strptime(dates['plant'], '%Y-%m-%d')) return render_template("index.html", plant=dates, alerts=alerts)