From aff62e048ee3f7d99f8c238ddc8b7db0b447a6a1 Mon Sep 17 00:00:00 2001
From: danamir <danamir@danamir.ru>
Date: Sun, 18 Jun 2023 13:06:51 +0300
Subject: [PATCH] worked model with adding default admin

---
 main.py   |  2 +-
 models.py | 45 +++++++++++----------------------------------
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/main.py b/main.py
index 8d1a1bf..f3b4669 100644
--- a/main.py
+++ b/main.py
@@ -687,6 +687,6 @@ def ShowOptimalSettingsGui():
 
 
 if __name__ == '__main__':
-    ShowOptimalSettingsGui()
+    main()
 
     
\ No newline at end of file
diff --git a/models.py b/models.py
index 8102f8c..1707efe 100644
--- a/models.py
+++ b/models.py
@@ -12,27 +12,6 @@ Base = mapper_registry.generate_base()
 Session = sessionmaker(bind=engine)
 
 
-class Proshivka(Base):
-    __tablename__ = "Proshivka"
-    id = Column(Integer, primary_key=True)
-    nazvanie = Column(String)
-    versia = Column(String)
-    officialSite = Column(String)
-
-    printers = relationship('Motherboard', backref='Proshivka')
-
-
-class Mottherboard(Base):
-    __tablename__ = "Motherboard"
-    id = Column(Integer, primary_key=True)
-    nazvanie = Column(String)
-    versia = Column(String)
-    officialSite = Column(String)
-    kolvoDraivers = Column(String)
-
-    drivers = relationship('Driver', backref='Motherboard')
-    proshivkas = Column(Integer, ForeignKey(Proshivka.id))
-    printers = relationship('Printer', backref='Motherboard')
 
 
 class Printer(Base):
@@ -45,16 +24,7 @@ class Printer(Base):
     minSpedPrint = Column(Integer)
 
     print_settings = relationship("PrintSettings",  backref="Printer")
-    mtboards = Column(Integer, ForeignKey(Mottherboard.id))
-
-
-class Driver():
-    __tablename__ = "Driver"
-    id = Column(Integer, primary_key=True)
-    nazvanie = Column(String)
-    versia = Column(String)
-    rabTok = Column(Integer)
-    motherId = Column(Integer, ForeignKey(Mottherboard.id))
+    #mtboards = Column(Integer, ForeignKey(Mottherboard.id))
 
 
 class Plastic(Base):
@@ -108,14 +78,21 @@ class Users(Base):
 
 def create_db():
     Base.metadata.create_all(engine)
-    """
+    
     sess = Session()
-    newuser = Users(fio="admin", dolgnost="admin",
+    newdolg=Dolgnost(dolgnst='admin', isadmin=True)
+    sess.add(newdolg)
+    sess.commit()
+
+    dlg = sess.query(Dolgnost).filter(Dolgnost.dolgnst=='admin').first()
+
+    newuser = Users(fio="admin", 
+                    id_dolgnost=dlg.id,
                     login="admin", passwd="123456")
     sess.add(newuser)
     sess.commit()
     sess.close()
-    """
+    
 
 if __name__ == '__main__':
     create_db()