mode some changes to get it working
This commit is contained in:
parent
c851ce11ec
commit
4e2780d9be
4 changed files with 12 additions and 9 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -58,4 +58,5 @@ target/
|
||||||
# ConfigFile
|
# ConfigFile
|
||||||
app/config.py
|
app/config.py
|
||||||
|
|
||||||
|
# Do not add db file
|
||||||
|
*.db
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
from views import *
|
from views import *
|
||||||
|
|
||||||
|
from app import app, db
|
||||||
|
|
||||||
if __name__ == '__main__':
|
from admin import admin
|
||||||
app.run()
|
from login import login_manager
|
||||||
|
from models import *
|
||||||
|
from views import *
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
app.run(debug=True)
|
app.run(debug=True)
|
||||||
# app.run(host='0.0.0.0')
|
|
||||||
|
|
|
@ -6,8 +6,7 @@ class User(db.Model):
|
||||||
username = db.Column(db.String(80), unique=True)
|
username = db.Column(db.String(80), unique=True)
|
||||||
admin = db.Column(db.Boolean)
|
admin = db.Column(db.Boolean)
|
||||||
bias = db.Column(db.Integer)
|
bias = db.Column(db.Integer)
|
||||||
courrier = db.relationship('Courrier', backref='courrier', lazy='dynamic')
|
orders = db.relationship('Order', backref='courrier', lazy='dynamic')
|
||||||
logactions = db.relationship('LogAction', backref='user', lazy='dynamic')
|
|
||||||
|
|
||||||
def configure(self, username, admin, bias):
|
def configure(self, username, admin, bias):
|
||||||
self.username = username
|
self.username = username
|
||||||
|
@ -51,6 +50,7 @@ class Location(db.Model):
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return '%s: %s' % (self.name, self.address)
|
return '%s: %s' % (self.name, self.address)
|
||||||
|
|
||||||
|
|
||||||
class Food(db.Model):
|
class Food(db.Model):
|
||||||
id = db.Column(db.Integer, primary_key=True)
|
id = db.Column(db.Integer, primary_key=True)
|
||||||
location_id = db.Column(db.Integer, db.ForeignKey('location.id'))
|
location_id = db.Column(db.Integer, db.ForeignKey('location.id'))
|
||||||
|
@ -65,13 +65,14 @@ class Food(db.Model):
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return '%s' % self.name
|
return '%s' % self.name
|
||||||
|
|
||||||
|
|
||||||
class Order(db.Model):
|
class Order(db.Model):
|
||||||
id = db.Column(db.Integer, primary_key=True)
|
id = db.Column(db.Integer, primary_key=True)
|
||||||
courrier_id = db.Column(db.Integer, db.ForeignKey('user.id'))
|
courrier_id = db.Column(db.Integer, db.ForeignKey('user.id'))
|
||||||
location_id = db.Column(db.Integer, db.ForeignKey('location.id'))
|
location_id = db.Column(db.Integer, db.ForeignKey('location.id'))
|
||||||
starttime = db.Column(db.DateTime)
|
starttime = db.Column(db.DateTime)
|
||||||
stoptime = 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):
|
def configure(self, courrier, location, starttime, stoptime):
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
<li><a href="{{ url_for('home') }}">Home</a></li>
|
<li><a href="{{ url_for('home') }}">Home</a></li>
|
||||||
<li><a href="{{ url_for('stats') }}">Stats</a></li>
|
<li><a href="{{ url_for('stats') }}">Stats</a></li>
|
||||||
<li><a href="{{ url_for('about') }}">About</a></li>
|
<li><a href="{{ url_for('about') }}">About</a></li>
|
||||||
<li><a href="{{ url_for('login') }}">Login</a></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue