diff --git a/app.py b/app.py index 2134a47..fd2ae9e 100644 --- a/app.py +++ b/app.py @@ -1,7 +1,6 @@ -from flask import Flask, render_template +from flask import Flask, render_template, request, redirect, url_for from models import db -from models import * - +from models import User, Progul app = Flask(__name__) @@ -10,14 +9,37 @@ app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///app.db' db.init_app(app) + @app.route('/') def index(): return render_template('index.html') -@app.route('/admin') -def admipage(): - return render_template('adminpage.html') +@app.route('/admin', methods=['GET', 'POST']) +def adminpage(): + usersQuery = User.query.all() + users = {} + for user in usersQuery: + users[user.id] = user.FIO + + return render_template('adminpage.html', users={k: v for k, v in sorted(users.items(), key=lambda item: item[1])}, methods=['GET', 'POST']) + + +@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) + db.session.add(userAdd) + db.session.commit() + return redirect(url_for('adminpage')) + + +@app.route('/addprogul') +def addprogul(): + pass + if __name__ == '__main__': - app.run(host='0.0.0.0', port='3800', debug=True) \ No newline at end of file + app.run(host='0.0.0.0', port='3800', debug=True) diff --git a/models.py b/models.py index dd8a747..1534968 100644 --- a/models.py +++ b/models.py @@ -2,8 +2,12 @@ from flask_sqlalchemy import SQLAlchemy db = SQLAlchemy() -class PrintedDetal(db.Model): +class User(db.Model): id = db.Column(db.Integer, primary_key=True, autoincrement=True) - imgpath = db.Column(db.String(3000)) - stlpath = db.Column(db.String(3000)) - isprinted = db.Column(db.Boolean()) \ No newline at end of file + FIO = db.Column(db.String(300)) + dolgnost = db.Column(db.String(3000)) + +class Progul(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + IO = db.Column(db.Date()) + user_id = db.Column(db.Integer, db.ForeignKey('user.id')) \ No newline at end of file diff --git a/templates/adminpage.html b/templates/adminpage.html index 10dab93..e2a2407 100644 --- a/templates/adminpage.html +++ b/templates/adminpage.html @@ -19,40 +19,43 @@ -