update database strukture

models.py

@@ -1,6 +1,6 @@
 from flask_sqlalchemy import SQLAlchemy
+from datetime import datetime
 
-import datetime
 
 db = SQLAlchemy()
 
@@ -11,3 +11,38 @@ class CommissionPersons(db.Model):
     isrecenzent = db.Column(db.Boolean, nullable=False, default=False)
     issecretar = db.Column(db.Boolean, nullable=False, default=False)
 
+
+class CommissionSostav(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    predsedatel = db.Column(db.String(100), nullable=False)
+    uchastnik1=db.Column(db.String(100), nullable=False)
+    uchastnik2=db.Column(db.String(100), nullable=False)
+    uchastnik3=db.Column(db.String(100), nullable=False)
+    uchastnik4=db.Column(db.String(100), nullable=False)
+    secretar=db.Column(db.String(100), nullable=False)
+
+class Rukovoditeli(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    fio = db.Column(db.String(80), nullable=False)
+    canMagistr = db.Column(db.Boolean, nullable=False, default=False)
+    stepen = db.Column(db.String(80), nullable=False)
+    dolognost = db.Column(db.String(80), nullable=False)
+
+class Studentus(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    fio = db.Column(db.String(80), nullable=False)
+    vkrTheme = db.Column(db.String(80), nullable=False)
+    rucovoditel_id = db.Column(db.Integer, db.ForeignKey('rukovoditeli.id'), nullable=False)
+    konsultant_id = db.Column(db.Integer, db.ForeignKey('rukovoditeli.id'), nullable=False)
+    rucovoditel = db.relationship('Rukovoditeli', foreign_keys=[rucovoditel_id],
+                                  backref=db.backref('students_as_rucovoditel', lazy=True))
+    konsultant = db.relationship('Rukovoditeli', foreign_keys=[konsultant_id],
+                                 backref=db.backref('students_as_konsultant', lazy=True))
+
+
+class CommissionZasedanie(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    data = db.Column(db.DateTime, nullable=False)
+    commission_sostav_id = db.Column(db.Integer, db.ForeignKey('commission_sostav.id'), nullable=False)
+    commission_sostav = db.relationship('CommissionSostav', uselist=False, backref=db.backref('zasedanie', lazy=True))
+    students = db.relationship('Studentus', backref=db.backref('zasedanie', lazy=True))

static/js/createcommision.js

@@ -22,38 +22,44 @@ $(document).ready(function () {
             } else {
                 secretars.push(element.fio)
             }
+
             if (element.predsed == 1) {
                 preds.push(element.fio)
             }
 
         });
 
+        console.log(preds)
+        console.log(secretars)
+        console.log(alluchs)
 
-        for (i = 0; i < preds.length; i++) {
+        preds.forEach( function (item) {
-            let newOption = new Option(preds[i], preds[i])
+              let newOption = new Option(item, item)
             predsel.appendChild(newOption)
-        }
+        })
+
 
-        alluchs.forEach(function (item) {
-            let newOption = new Option(item, item)
-            uch1.appendChild(newOption);
-        })
-        alluchs.forEach(function (item) {
-            let newOption = new Option(item, item)
-            uch2.appendChild(newOption);
-        })
-        alluchs.forEach(function (item) {
-            let newOption = new Option(item, item)
-            uch3.appendChild(newOption);
-        })
-        alluchs.forEach(function (item) {
-            let newOption = new Option(item, item)
-            uch4.appendChild(newOption);
-        })
         secretars.forEach(function (item) {
             let newOption = new Option(item, item)
             secretar.appendChild(newOption)
         })
+
+
+        alltagych = Array.from( $('select[id^="uchgak"]'))
+
+
+        alltagych.forEach(function (alltagychItem) {
+            alluchs.forEach(function (item) {
+                const option = document.createElement('option');
+                option.value = item;
+                option.textContent = item;
+                alltagychItem.appendChild(option)
+            })
+        })
+
+
+
+
     });
 
 });

static/js/settings.js

@@ -27,6 +27,7 @@ btnadd.onclick = function (){
         }
 
     )
+
     document.getElementById("fio").value = "";
     document.getElementById("predsedatel").checked = false;
     document.getElementById("recentzent").checked = false;

templates/createCommision.html

@@ -19,14 +19,14 @@
 </div>
 
 <div class="row">
-    <label>Участник</label>
+    <label>Участник1</label>
     <select id="uchgak1">
         <option>--Выбери--</option>
     </select>
 </div>
 
 <div class="row">
-    <label>Участник</label>
+    <label>Участник2</label>
     <select id="uchgak2">
         <option>--Выбери--</option>
     </select>
@@ -34,14 +34,14 @@
 
 
 <div class="row">
-    <label>Участник</label>
+    <label>Участник3</label>
     <select id="uchgak3">
         <option>--Выбери--</option>
     </select>
 </div>
 
 <div class="row">
-    <label>Участник</label>
+    <label>Участник4</label>
     <select id="uchgak4">
         <option>--Выбери--</option>
     </select>