reworked

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'))