diff --git a/main.py b/main.py index f3b4669..c5f12c4 100644 --- a/main.py +++ b/main.py @@ -277,7 +277,7 @@ def addDolgnostGui(): window.mainloop() -def addPrintSettingsGui(): +def addPrintSettingsGui() -> None: window = Tk() window.geometry("800x600") @@ -405,7 +405,7 @@ def addPrintSettingsGui(): prDataFrame['columns'] = table_columns for col in table_columns: - prDataFrame.column(col, width=100) + prDataFrfrom sqlalchemy import create_engineame.column(col, width=100) for col in table_headers: prDataFrame.heading(col,text=value) diff --git a/models.py b/models.py index 1e2a1c4..4115c72 100644 --- a/models.py +++ b/models.py @@ -1,9 +1,14 @@ -from sqlalchemy import Column, Integer, String, create_engine, ForeignKey, DateTime, Boolean +""" +module docstring +""" + + +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 from sqlalchemy.orm import registry -from sqlalchemy import create_engine + mapper_registry = registry() @@ -11,6 +16,11 @@ engine = create_engine('sqlite:///dipl.db', echo=True) Base = mapper_registry.generate_base() Session = sessionmaker(bind=engine) + + + + + class Mottherboard(Base): __tablename__ = "Motherboard" id = Column(Integer, primary_key=True) @@ -18,8 +28,20 @@ class Mottherboard(Base): versia = Column(String) officialSite = Column(String) kolvoDraivers = Column(String) - + printers = relationship('Printer', backref='Motherboard') + drv = relationship('MotorDruvers') + + +class MotorDruvers(Base): + __tablename__ ="MotorDruvers" + id = Column(Integer, primary_key=True) + nazvanie = Column(String) + versia = Column(String) + workTok = Column(Float) + + mboardID = Column(Integer, ForeignKey(Mottherboard.id)) + @@ -33,7 +55,9 @@ class Printer(Base): minSpedPrint = Column(Integer) print_settings = relationship("PrintSettings", backref="Printer") - mtboards = Column(Integer, ForeignKey(Mottherboard.id)) + mboard_id = Column(Integer, ForeignKey(Mottherboard.id)) + + class Plastic(Base): @@ -66,6 +90,7 @@ class PrintSettings(Base): id_plastic = Column(Integer, ForeignKey(Plastic.id)) + class Dolgnost(Base): __tablename__ = "Dolgnost" id = Column(Integer, primary_key=True)