Merge branch 'danamir' of https://git.danamir.ru/danamir/danrazdipl into danamir

.gitignore

@@ -161,4 +161,7 @@ cython_debug/
 #.idea/
 
 *.db
-.vscode
+*.vscode
+*.json
+.vscode/settings.json
+modelbackup.py

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "[python]": {
-        "editor.defaultFormatter": "ms-python.autopep8"
+        "editor.defaultFormatter": "ms-python.python"
     },
     "python.formatting.provider": "none"
 }

main.py

@@ -278,7 +278,7 @@ def addDolgnostGui():
 
     window.mainloop()
 
-def addPrintSettingsGui():
+def addPrintSettingsGui() -> None:
     window = Tk()
     window.geometry("800x600")
 
@@ -406,7 +406,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)

models.py

@@ -1,9 +1,14 @@
-from sqlalchemy import Column, Integer, String, create_engine, ForeignKey, DateTime, Boolean, Float
+"""
+module docstring
+"""
+
+
+from sqlalchemy import Column, Integer, String, create_engine, ForeignKey, DateTime, Boolean,Float, 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,7 +16,6 @@ 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)
@@ -19,10 +23,13 @@ class Proshivka(Base):
     versia = Column(String)
     officialSite = Column(String)
 
-    mboards = relationship("Mottherboard", backref="Proshivka")
+    mboards = relationship("Motherboard")
 
 
-class Mottherboard(Base):
+
+
+
+class Motherboard(Base):
     __tablename__ = "Motherboard"
     id = Column(Integer, primary_key=True)
     nazvanie = Column(String)
@@ -30,20 +37,24 @@ class Mottherboard(Base):
     officialSite = Column(String)
     kolvoDraivers = Column(String)
 
-
-    proshivkas = Column(Integer, ForeignKey(Proshivka.id))
+    prshvID = Column(Integer, ForeignKey(Proshivka.id))  
     printers = relationship("Printer")
-    mbdrivers = relationship("PrnttDriver")
+    drv = relationship("MotorDruvers")  
+    
 
-
-class PrnttDriver(Base):
-    __tablename__ ="Drivers"
+class MotorDruvers(Base):
+    __tablename__ ="MotorDruvers"
     id = Column(Integer, primary_key=True)
-    model = Column(String)
+    nazvanie = Column(String)
     versia = Column(String)
-    rabTok=Column(Float)
+    workTok = Column(Float)
+
+    mboardID = Column(Integer, ForeignKey(Motherboard.id)) 
+
+
+
+   
 
-    mboardID = Column(Integer, ForeignKey(Mottherboard.id))
 
 
 class Printer(Base):
@@ -56,7 +67,9 @@ class Printer(Base):
     minSpedPrint = Column(Integer)
 
     print_settings = relationship("PrintSettings")
-    mtboards = Column(Integer, ForeignKey(Mottherboard.id))
+    mboard_id = Column(Integer, ForeignKey(Motherboard.id))
+
+
 
 
 class Plastic(Base):
@@ -71,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):
@@ -89,6 +102,7 @@ class PrintSettings(Base):
     id_plastic = Column(Integer, ForeignKey(Plastic.id))
 
 
+
 class Dolgnost(Base):
     __tablename__ = "Dolgnost"
     id = Column(Integer, primary_key=True)
@@ -110,14 +124,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()