This commit is contained in:
2023-06-20 20:51:44 +03:00
parent 90c8e46d7b
commit 006dee506e
2 changed files with 18 additions and 15 deletions

View File

@@ -78,6 +78,7 @@ def validateLogin(username, password):
if hasattr(results,"login"): if hasattr(results,"login"):
messagebox.showinfo(title="Успех", message="Вы успешно авторизировались в ситеме.") messagebox.showinfo(title="Успех", message="Вы успешно авторизировались в ситеме.")
ShowOptimalSettingsGui()
else: else:
messagebox.showinfo(title="Успех", message="Вы НЕ авторизировались в ситеме.") messagebox.showinfo(title="Успех", message="Вы НЕ авторизировались в ситеме.")
return return
@@ -687,6 +688,6 @@ def ShowOptimalSettingsGui():
if __name__ == '__main__': if __name__ == '__main__':
ShowOptimalSettingsGui() main()

View File

@@ -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.ext.declarative import declarative_base
from sqlalchemy.orm import sessionmaker, aliased, Query, relationship from sqlalchemy.orm import sessionmaker, aliased, Query, relationship
from sqlalchemy.sql import func from sqlalchemy.sql import func
@@ -19,7 +19,7 @@ class Proshivka(Base):
versia = Column(String) versia = Column(String)
officialSite = Column(String) officialSite = Column(String)
printers = relationship('Motherboard', backref='Proshivka') mboards = relationship("Mottherboard", backref="Proshivka")
class Mottherboard(Base): class Mottherboard(Base):
@@ -30,9 +30,20 @@ class Mottherboard(Base):
officialSite = Column(String) officialSite = Column(String)
kolvoDraivers = Column(String) kolvoDraivers = Column(String)
drivers = relationship('Driver', backref='Motherboard')
proshivkas = Column(Integer, ForeignKey(Proshivka.id)) 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): class Printer(Base):
@@ -44,19 +55,10 @@ class Printer(Base):
maxSpedPrint = Column(Integer) maxSpedPrint = Column(Integer)
minSpedPrint = Column(Integer) minSpedPrint = Column(Integer)
print_settings = relationship("PrintSettings", backref="Printer") print_settings = relationship("PrintSettings")
mtboards = Column(Integer, ForeignKey(Mottherboard.id)) 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): class Plastic(Base):
__tablename__ = "Plastic" __tablename__ = "Plastic"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)