diff --git a/models.py b/models.py deleted file mode 100644 index 289ed24..0000000 --- a/models.py +++ /dev/null @@ -1,51 +0,0 @@ - -from flask_sqlalchemy import SQLAlchemy -import datetime - -db = SQLAlchemy() - - -class Auditory(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - audnazvanie=db.Column(db.String) - oboruds = db.relationship('Oboruds') - - - -class Oboruds(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - invNumber=db.Column(db.Integer) - nazvanie=db.Column(db.String(500)) - raspologenie = db.Column(db.String(200)) - numberved = db.Column(db.String(100)) -<<<<<<< HEAD -<<<<<<< HEAD - buhnumberpp = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - balancenumber = db.Column(db.String(30)) -======= - numberppasu = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - ->>>>>>> dev -======= - kolichestvo = db.Column(db.Integer) -======= - buhnumberpp = db.Column(db.String(100)) - kolichestvo = db.Column(db.Integer) - balancenumber = db.Column(db.String(30)) ->>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476 ->>>>>>> 4c6166c9078d5d913b83b681af7f7241af0399ca - aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id)) - - - - - -class Zametki(db.Model): - id = db.Column(db.Integer, primary_key=True, autoincrement=True) - txtzam=db.Column(db.String(10000)) - created_date = db.Column(db.DateTime, default=datetime.datetime.utcnow) - rmdt = db.Column(db.DateTime) - -