From aff62e048ee3f7d99f8c238ddc8b7db0b447a6a1 Mon Sep 17 00:00:00 2001 From: danamir Date: Sun, 18 Jun 2023 13:06:51 +0300 Subject: [PATCH 1/5] 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() From 05e42ca3820843226a1c4f28d5c6a959fefa459c Mon Sep 17 00:00:00 2001 From: danamir Date: Sun, 18 Jun 2023 13:09:55 +0300 Subject: [PATCH 2/5] worked model with adding default admin --- .gitignore | 5 ++++- .vscode/settings.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a798d0..addb38b 100644 --- a/.gitignore +++ b/.gitignore @@ -161,4 +161,7 @@ cython_debug/ #.idea/ *.db -.vscode +*.vscode +*.json +.vscode/settings.json +modelbackup.py diff --git a/.vscode/settings.json b/.vscode/settings.json index 9ee86e7..ba77eac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "[python]": { - "editor.defaultFormatter": "ms-python.autopep8" + "editor.defaultFormatter": "ms-python.python" }, "python.formatting.provider": "none" } \ No newline at end of file From 3bfca193877943c23b09af6d2fd8b2993efd5b75 Mon Sep 17 00:00:00 2001 From: danamir Date: Sun, 18 Jun 2023 13:21:13 +0300 Subject: [PATCH 3/5] add motherboard to model --- models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/models.py b/models.py index 1707efe..1e2a1c4 100644 --- a/models.py +++ b/models.py @@ -11,6 +11,15 @@ 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) + nazvanie = Column(String) + versia = Column(String) + officialSite = Column(String) + kolvoDraivers = Column(String) + + printers = relationship('Printer', backref='Motherboard') @@ -24,7 +33,7 @@ class Printer(Base): minSpedPrint = Column(Integer) print_settings = relationship("PrintSettings", backref="Printer") - #mtboards = Column(Integer, ForeignKey(Mottherboard.id)) + mtboards = Column(Integer, ForeignKey(Mottherboard.id)) class Plastic(Base): From cd3a1b1f156bab17074573ae78e57b030ad5a7a9 Mon Sep 17 00:00:00 2001 From: danamir Date: Sun, 18 Jun 2023 13:54:30 +0300 Subject: [PATCH 4/5] Rename table --- main.py | 4 ++-- models.py | 33 +++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) 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) From b4895b787e2061f4b82b864ef1df912a67883e3a Mon Sep 17 00:00:00 2001 From: danamir Date: Sun, 18 Jun 2023 14:08:35 +0300 Subject: [PATCH 5/5] worked db --- models.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/models.py b/models.py index 4115c72..10f2098 100644 --- a/models.py +++ b/models.py @@ -16,12 +16,20 @@ engine = create_engine('sqlite:///dipl.db', echo=True) 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) + + mboards = relationship("Motherboard") - -class Mottherboard(Base): + +class Motherboard(Base): __tablename__ = "Motherboard" id = Column(Integer, primary_key=True) nazvanie = Column(String) @@ -29,9 +37,10 @@ class Mottherboard(Base): officialSite = Column(String) kolvoDraivers = Column(String) - printers = relationship('Printer', backref='Motherboard') - drv = relationship('MotorDruvers') - + prshvID = Column(Integer, ForeignKey(Proshivka.id)) + printers = relationship("Printer") + drv = relationship("MotorDruvers") + class MotorDruvers(Base): __tablename__ ="MotorDruvers" @@ -40,7 +49,10 @@ class MotorDruvers(Base): versia = Column(String) workTok = Column(Float) - mboardID = Column(Integer, ForeignKey(Mottherboard.id)) + mboardID = Column(Integer, ForeignKey(Motherboard.id)) + + + @@ -54,8 +66,8 @@ class Printer(Base): maxSpedPrint = Column(Integer) minSpedPrint = Column(Integer) - print_settings = relationship("PrintSettings", backref="Printer") - mboard_id = Column(Integer, ForeignKey(Mottherboard.id)) + print_settings = relationship("PrintSettings") + mboard_id = Column(Integer, ForeignKey(Motherboard.id)) @@ -72,7 +84,7 @@ class Plastic(Base): maxTempPrint = Column(Integer) dateproizv = Column(DateTime) - print_settings = relationship("PrintSettings", backref="Plastic") + print_settings = relationship("PrintSettings") class PrintSettings(Base):