Compare commits
2 Commits
90c8e46d7b
...
05e42ca382
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05e42ca382 | ||
|
|
aff62e048e |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -161,4 +161,7 @@ cython_debug/
|
||||
#.idea/
|
||||
|
||||
*.db
|
||||
.vscode
|
||||
*.vscode
|
||||
*.json
|
||||
.vscode/settings.json
|
||||
modelbackup.py
|
||||
|
||||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"[python]": {
|
||||
"editor.defaultFormatter": "ms-python.autopep8"
|
||||
"editor.defaultFormatter": "ms-python.python"
|
||||
},
|
||||
"python.formatting.provider": "none"
|
||||
}
|
||||
2
main.py
2
main.py
@@ -687,6 +687,6 @@ def ShowOptimalSettingsGui():
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
ShowOptimalSettingsGui()
|
||||
main()
|
||||
|
||||
|
||||
45
models.py
45
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()
|
||||
|
||||
Reference in New Issue
Block a user