diff --git a/.gitignore b/.gitignore index 8e88017..0098d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,5 @@ target/ # ConfigFile app/config.py - +# Do not add db file +*.db diff --git a/app/foodbot.py b/app/foodbot.py index 213b34a..6d2d11f 100644 --- a/app/foodbot.py +++ b/app/foodbot.py @@ -1,9 +1,11 @@ from views import * +from app import app, db + +from admin import admin +from login import login_manager +from models import * +from views import * -if __name__ == '__main__': - app.run() - if __name__ == '__main__': app.run(debug=True) - # app.run(host='0.0.0.0') diff --git a/app/models.py b/app/models.py index 7318f7b..8d37025 100644 --- a/app/models.py +++ b/app/models.py @@ -6,8 +6,7 @@ class User(db.Model): username = db.Column(db.String(80), unique=True) admin = db.Column(db.Boolean) bias = db.Column(db.Integer) - courrier = db.relationship('Courrier', backref='courrier', lazy='dynamic') - logactions = db.relationship('LogAction', backref='user', lazy='dynamic') + orders = db.relationship('Order', backref='courrier', lazy='dynamic') def configure(self, username, admin, bias): self.username = username @@ -51,6 +50,7 @@ class Location(db.Model): def __repr__(self): return '%s: %s' % (self.name, self.address) + class Food(db.Model): id = db.Column(db.Integer, primary_key=True) location_id = db.Column(db.Integer, db.ForeignKey('location.id')) @@ -65,13 +65,14 @@ class Food(db.Model): def __repr__(self): return '%s' % self.name + class Order(db.Model): id = db.Column(db.Integer, primary_key=True) courrier_id = db.Column(db.Integer, db.ForeignKey('user.id')) location_id = db.Column(db.Integer, db.ForeignKey('location.id')) starttime = db.Column(db.DateTime) stoptime = db.Column(db.DateTime) - orders = db.relationship('OrdreItem', backref='order', lazy='dynamic') + orders = db.relationship('OrderItem', backref='order', lazy='dynamic') def configure(self, courrier, location, starttime, stoptime): diff --git a/app/templates/layout.html b/app/templates/layout.html index 03685c6..61e2bac 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -15,7 +15,6 @@
  • Home
  • Stats
  • About
  • -
  • Login