diff --git a/app.py b/app.py index 9ab7e9c..38523fa 100644 --- a/app.py +++ b/app.py @@ -12,7 +12,29 @@ db.init_app(app) @app.route('/') def index(): - return render_template('index.html') + allUsetrs = User.query.all() + + s = {} + for user in allUsetrs: + dates = [] + data = {} + u = db.session.query(User.id).filter(User.id == user.id).subquery() + if len(Progul.query.filter(Progul.user_id.in_(u)).all()) > 0: + for pr in Progul.query.filter(Progul.user_id.in_(u)).all(): + dates.append(pr.progulDate) + data['dates'] = dates + data['kolvo'] = len(dates) + s[user.FIO] = data + else: + data['dates'] = '' + data['kolvo'] = '0' + + s[user.FIO] = data + + print(s) + + + return render_template('index.html', users = s ) @app.route('/admin', methods=['GET', 'POST']) @@ -28,28 +50,23 @@ def adminpage(): @app.route('/adduser', methods=['GET', 'POST']) def useradd(): if request.method == 'POST': - """ fio = request.form['fio'] dolgn = request.form['dolgnost'] - userAdd = User(FIO=fio, dolgnost=dolgn) + userAdd = User(FIO=fio, dolgnost=dolgn) db.session.add(userAdd) db.session.commit() - """ - print('add user') return redirect(url_for('adminpage')) @app.route('/addprogul', methods=['GET', 'POST']) def addprogul(): if request.method == 'POST': - print("add progul ") - - """" dataproeba = request.form['dateprogul'] - sotrId = request.form['sotrudnil'] - print(dataproeba) - print(sotrId) - """ + sotrId = request.form['sotrudnik'] + p = Progul(progulDate=str(dataproeba), user_id=sotrId) + db.session.add(p) + db.session.commit() + return redirect(url_for('adminpage')) diff --git a/models.py b/models.py index 1534968..3a9b04d 100644 --- a/models.py +++ b/models.py @@ -9,5 +9,5 @@ class User(db.Model): class Progul(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) - IO = db.Column(db.Date()) + progulDate = db.Column(db.String(100)) user_id = db.Column(db.Integer, db.ForeignKey('user.id')) \ No newline at end of file diff --git a/static/css/style.css b/static/css/style.css index 0e42dcc..a2ac1fd 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,4 +1,3 @@ - body { margin: 0; padding: 0; @@ -11,11 +10,11 @@ header { .h1header { margin: 0; - background-color: #4a849f; + background-color: #1b3440; height: 100px; line-height: 100px; text-align: center; - color: black; + color: #f8f7f4; } @@ -23,41 +22,33 @@ header { text-align: center; } -.tg { - padding-top: 35px; - border-collapse: collapse; - border-spacing: 0; +.card { + background-color: #b4d6c6; + border-radius: 12px; + box-shadow: 0px 5px 10px 2px rgba(27, 52, 64, 0.3); } -.tg td { - border-color: black; - border-style: solid; - border-width: 1px; - font-family: Arial, sans-serif; - font-size: 14px; - overflow: hidden; - padding: 10px 5px; - word-break: normal; + + +.row { + margin-top: 20px; } -.tg th { - border-color: black; - border-style: solid; - border-width: 1px; - font-family: Arial, sans-serif; - font-size: 14px; - font-weight: normal; - overflow: hidden; - padding: 10px 5px; - word-break: normal; + +.col-md-3 { + margin-bottom: 25px; + margin-right: 25px; } -.tg .tg-0pky { - border-color: inherit; - text-align: left; - vertical-align: top +.btn { + background-color: #1b3440; + border-color: #1b3440; + margin-top: 10px; + margin-bottom: 10px; + } -.card{ - margin-top: 40px; +.btn:hover { + background-color: #f2845c; + border-color: #f2845c; } \ No newline at end of file diff --git a/templates/adminpage.html b/templates/adminpage.html index ef1f460..4ad6783 100644 --- a/templates/adminpage.html +++ b/templates/adminpage.html @@ -17,43 +17,59 @@ +