From 006dee506eb0d646b164a68bcf79ebb53370b41f Mon Sep 17 00:00:00 2001
From: Alex Danamir <alexandr.salny@yandex.ru>
Date: Tue, 20 Jun 2023 20:51:44 +0300
Subject: [PATCH] local

---
 main.py   |  3 ++-
 models.py | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/main.py b/main.py
index 8d1a1bf..5701c02 100644
--- a/main.py
+++ b/main.py
@@ -78,6 +78,7 @@ def validateLogin(username, password):
     if hasattr(results,"login"):
 
         messagebox.showinfo(title="Успех", message="Вы успешно авторизировались в ситеме.")
+        ShowOptimalSettingsGui()
     else:
         messagebox.showinfo(title="Успех", message="Вы НЕ авторизировались в ситеме.")
     return
@@ -687,6 +688,6 @@ def ShowOptimalSettingsGui():
 
 
 if __name__ == '__main__':
-    ShowOptimalSettingsGui()
+    main()
 
     
\ No newline at end of file
diff --git a/models.py b/models.py
index 8102f8c..dc0d0f1 100644
--- a/models.py
+++ b/models.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, String, create_engine, ForeignKey, DateTime, Boolean
+from sqlalchemy import Column, Integer, String, create_engine, ForeignKey, DateTime, Boolean, Float
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, aliased, Query, relationship
 from sqlalchemy.sql import func
@@ -19,7 +19,7 @@ class Proshivka(Base):
     versia = Column(String)
     officialSite = Column(String)
 
-    printers = relationship('Motherboard', backref='Proshivka')
+    mboards = relationship("Mottherboard", backref="Proshivka")
 
 
 class Mottherboard(Base):
@@ -30,9 +30,20 @@ class Mottherboard(Base):
     officialSite = Column(String)
     kolvoDraivers = Column(String)
 
-    drivers = relationship('Driver', backref='Motherboard')
+
     proshivkas = Column(Integer, ForeignKey(Proshivka.id))
-    printers = relationship('Printer', backref='Motherboard')
+    printers = relationship("Printer")
+    mbdrivers = relationship("PrnttDriver")
+
+
+class PrnttDriver(Base):
+    __tablename__ ="Drivers"
+    id = Column(Integer, primary_key=True)
+    model = Column(String)
+    versia = Column(String)
+    rabTok=Column(Float)
+
+    mboardID = Column(Integer, ForeignKey(Mottherboard.id))
 
 
 class Printer(Base):
@@ -44,19 +55,10 @@ class Printer(Base):
     maxSpedPrint = Column(Integer)
     minSpedPrint = Column(Integer)
 
-    print_settings = relationship("PrintSettings",  backref="Printer")
+    print_settings = relationship("PrintSettings")
     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))
-
-
 class Plastic(Base):
     __tablename__ = "Plastic"
     id = Column(Integer, primary_key=True)