mfp

models.py

@@ -12,14 +12,49 @@ 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):
     __tablename__ = "Printer"
     id = Column(Integer, primary_key=True)
+    kinematics = Column(String)
     nazvanie = Column(String)
+    proshivka = Column(String)
     maxSpedPrint = Column(Integer)
     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))
 
 
 class Plastic(Base):
@@ -27,6 +62,9 @@ class Plastic(Base):
     id = Column(Integer, primary_key=True)
     nazvanie = Column(String)
     diametr = Column(Integer)
+    color = Column(String)
+    typePlast = Column(String)
+    proizv = Column(String)
     minTempPrint = Column(Integer)
     maxTempPrint = Column(Integer)
     dateproizv = Column(DateTime)
@@ -53,7 +91,7 @@ class Dolgnost(Base):
     __tablename__ = "Dolgnost"
     id = Column(Integer, primary_key=True)
     dolgnst = Column(String)
-
+    isadmin = Column(Boolean, default=False)
     users = relationship("Users")
 
 
@@ -64,23 +102,20 @@ class Users(Base):
 
     login = Column(String)
     passwd = Column(String)
-    isadmin = Column(Boolean, default=False)
 
     id_dolgnost = Column(Integer, ForeignKey(Dolgnost.id))
 
 
 def create_db():
     Base.metadata.create_all(engine)
-
-
-def create_admin():
+    """
     sess = Session()
     newuser = Users(fio="admin", dolgnost="admin",
                     login="admin", passwd="123456")
     sess.add(newuser)
     sess.commit()
     sess.close()
-
+    """
 
 if __name__ == '__main__':
     create_db()