-
+
Order {{ order.id }}
- {% if (current_user.id == order.courrier_id and (not order.stoptime)) or current_user.is_admin() -%}
+ {% if order.can_close(current_user.id) -%}
Close
{%- endif %}
- Courrier: {{ order.courrier.username }}
- {% if order.courrier == None %}
-
Volunteer
+ courrier: {{ order.courrier.username }}
+ {% if order.courrier == None and not current_user.is_anonymous() %}
+
Volunteer
{% endif %}
- Location:
{{ order.location.name }}
- Starttime: {{ order.starttime }}
- Stoptime: {{ order.stoptime }}
- Total price: {{ total_price|euro }}
-
Orders
- {% for item in order.items %}
- {{ item.user.username }} - {{ item.product.name }} - {{ item.product.price|euro }}
- {% if item.can_delete(order.id, current_user.id) -%}
{%- endif %}
- {% endfor %}
-
Debts
- {% for key, value in total_payments.items() %}
- {{ key.username }} - {{ value|euro }}
- {% endfor %}
+ location:
{{ order.location.name }}
+ opened on {{ order.starttime }}
+
status: {% if order.stoptime %}{{ order.stoptime|countdown }}{% else %}open{% endif %}
+ total price: {{ total_price|euro }}
-
+ {% if form -%}
+
Order:
{{ wtf.quick_form(form, action=url_for('.order_item_create', id=order.id), button_map={'submit_button': 'primary'}, form_type='horizontal') }}
+ {%- endif %}
+
+
+
+
Orders
+ {% for item in order.items %}
+ {{ item.get_name() }} - {{ item.product.name }} - {{ item.product.price|euro }}
+ {% if item.can_delete(order.id, current_user.id, session.get('anon_name', '')) -%}
{%- endif %}
+ {% endfor %}
+
+
+
Ordered products:
+ {% for key, value in order.group_by_product().items() %}
+ {{ key }} - {{ value }}
+ {% endfor %}
+
+
+
+
+
Debts
+ {% for key, value in order.group_by_user_pay().items() %}
+ {{ key }} - {{ value|euro }}
+ {% endfor %}
+
{% endblock %}
\ No newline at end of file
diff --git a/app/templates/orders.html b/app/templates/orders.html
index abae873..2374341 100644
--- a/app/templates/orders.html
+++ b/app/templates/orders.html
@@ -2,19 +2,22 @@
{% set active_page = "orders" -%}
{% import "bootstrap/wtf.html" as wtf %}
+{% import "utils.html" as util -%}
+
{% block container %}
Open orders:
-
+ {% for order in orders %}
+ {{ util.render_order(order) }}
+ {% endfor %}
+ {% if not current_user.is_anonymous() %}
- {{ wtf.quick_form(form, action=url_for('.order_create'), button_map={'submit_button': 'primary'}, form_type='horizontal') }}
+
Create new order:
+ {{ wtf.quick_form(form, action=url_for('.order_create'), button_map={'submit_button': 'primary'}, form_type='horizontal') }}
+ {% endif %}
{% endblock %}
\ No newline at end of file
diff --git a/app/templates/utils.html b/app/templates/utils.html
new file mode 100644
index 0000000..98ce6a4
--- /dev/null
+++ b/app/templates/utils.html
@@ -0,0 +1,12 @@
+{% macro render_order(order) -%}
+
+
+
{{ order.location.name }}
+
Status: {{ order.stoptime|countdown }}
+ Orders: {{ order.items.count() }}
+
+
+
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/utils.py b/app/utils.py
index 60150bf..2148b1a 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -1,6 +1,9 @@
+from datetime import datetime
from flask import render_template
from app import app
+from login import login_manager
+
__author__ = 'feliciaan'
@app.template_filter('euro')
@@ -8,10 +11,40 @@ def euro(value):
result = '€' + str(value/100)
return result
+@app.template_filter('countdown')
+def countdown(value, only_positive=True, show_text=True):
+ delta = value - datetime.now()
+ if delta.total_seconds() < 0 and only_positive:
+ return "closed"
+ hours, remainder = divmod(delta.seconds, 3600)
+ minutes, seconds = divmod(remainder, 60)
+ time = '%02d:%02d:%02d' % (hours, minutes, seconds)
+ if show_text:
+ return 'closes in ' + time
+ return time
+
@app.errorhandler(404)
def handle404(e):
return render_template('errors/404.html'), 404
@app.errorhandler(401)
def handle401(e):
- return render_template('errors/401.html'), 401
\ No newline at end of file
+ return render_template('errors/401.html'), 401
+
+class AnonymouseUser:
+ def is_active(self):
+ return False
+
+ def is_authenticated(self):
+ return False
+
+ def is_anonymous(self):
+ return True
+
+ def is_admin(self):
+ return False
+
+ def get_id(self):
+ return None
+
+login_manager.anonymous_user = AnonymouseUser
\ No newline at end of file
diff --git a/app/views/__init__.py b/app/views/__init__.py
index a44037b..0a668fd 100644
--- a/app/views/__init__.py
+++ b/app/views/__init__.py
@@ -2,20 +2,19 @@ __author__ = 'feliciaan'
from flask import url_for, render_template, abort, redirect, request
from flask.ext.login import current_user, login_required
-from datetime import datetime
+from datetime import datetime, timedelta
from app import app, db
from models import Order, OrderItem
# import views
-import views.order
+from views.order import get_orders
@app.route('/')
def home():
- if not current_user.is_anonymous():
- orders = Order.query.filter((Order.stoptime > datetime.now()) | (Order.stoptime == None)).all()
- return render_template('home_loggedin.html', orders=orders)
- return render_template('home.html')
+ prev_day = datetime.now() - timedelta(days=1)
+ recently_closed = get_orders(((Order.stoptime > prev_day) & (Order.stoptime < datetime.now())))
+ return render_template('home.html', orders=get_orders(), recently_closed=recently_closed)
@app.route('/about/')
diff --git a/app/views/order.py b/app/views/order.py
index 8e7d0e9..81ff2b1 100644
--- a/app/views/order.py
+++ b/app/views/order.py
@@ -1,22 +1,22 @@
__author__ = 'feliciaan'
-from flask import url_for, render_template, abort, redirect, Blueprint, flash
+from flask import url_for, render_template, abort, redirect, Blueprint, flash, session
from flask.ext.login import current_user, login_required
import random
from datetime import datetime
from app import app, db
from models import Order, OrderItem
-from forms import OrderItemForm, OrderForm
+from forms import OrderItemForm, OrderForm, AnonOrderItemForm
order_bp = Blueprint('order_bp', 'order')
@order_bp.route('/')
-@login_required
def orders():
- orders = Order.query.filter((Order.stoptime > datetime.now()) | (Order.stoptime == None)).all()
- orderForm = OrderForm()
- orderForm.populate()
- return render_template('orders.html', orders=orders, form=orderForm)
+ orderForm = None
+ if not current_user.is_anonymous():
+ orderForm = OrderForm()
+ orderForm.populate()
+ return render_template('orders.html', orders=get_orders(), form=orderForm)
@order_bp.route('/create', methods=['GET', 'POST'])
@@ -35,41 +35,55 @@ def order_create():
@order_bp.route('/
')
-@login_required
def order(id):
order = Order.query.filter(Order.id == id).first()
- if order is not None:
+ if order is None:
+ abort(404)
+ form = None
+ if not current_user.is_anonymous():
form = OrderItemForm()
- form.populate(order.location)
- total_price = sum([o.product.price for o in order.items])
- total_payments = order.group_by_user_pay()
- return render_template('order.html', order=order, form=form, total_price=total_price, total_payments=total_payments)
- return abort(404)
+ else:
+ form = AnonOrderItemForm()
+ form.populate(order.location)
+ if order.stoptime and order.stoptime < datetime.now():
+ form = None
+ total_price = sum([o.product.price for o in order.items])
+ return render_template('order.html', order=order, form=form, total_price=total_price)
@order_bp.route('//create', methods=['GET', 'POST'])
-@login_required
def order_item_create(id):
order = Order.query.filter(Order.id == id).first()
- if order is not None:
+ if order is None:
+ abort(404)
+ if order.stoptime and order.stoptime < datetime.now():
+ abort(404)
+ form = None
+ if not current_user.is_anonymous():
form = OrderItemForm()
- form.populate(order.location)
- if form.validate_on_submit():
- item = OrderItem()
- form.populate_obj(item)
- item.order_id = id
+ else:
+ form = AnonOrderItemForm()
+ form.populate(order.location)
+ if form.validate_on_submit():
+ item = OrderItem()
+ form.populate_obj(item)
+ item.order_id = id
+ if not current_user.is_anonymous():
item.user_id = current_user.id
- db.session.add(item)
- db.session.commit()
- return redirect(url_for('.order', id=id))
- return render_template('order_form.html', form=form, url=url_for(".order_item_create", id=id))
- return abort(404)
+ else:
+ session['anon_name'] = item.name
+ db.session.add(item)
+ db.session.commit()
+ return redirect(url_for('.order', id=id))
+ return render_template('order_form.html', form=form, url=url_for(".order_item_create", id=id))
@order_bp.route('///delete')
-@login_required
def delete_item(order_id, item_id):
item = OrderItem.query.filter(OrderItem.id == item_id).first()
- if item.can_delete(order_id, current_user.id):
+ id = None
+ if not current_user.is_anonymous():
+ id = current_user.id
+ if item.can_delete(order_id, id, session.get('anon_name', '')):
db.session.delete(item)
db.session.commit()
return redirect(url_for('.order', id=order_id))
@@ -80,47 +94,60 @@ def delete_item(order_id, item_id):
@login_required
def volunteer(id):
order = Order.query.filter(Order.id == id).first()
- if order is not None:
- print(order.courrier_id)
- if order.courrier_id == 0:
- order.courrier_id = current_user.id
- db.session.commit()
- flash("Thank you for volunteering!")
- else:
- flash("Volunteering not possible!")
- return redirect(url_for('.order', id=id))
- abort(404)
+ if order is None:
+ abort(404)
+ if order.courrier_id is None or order.courrier_id == 0:
+ order.courrier_id = current_user.id
+ db.session.commit()
+ flash("Thank you for volunteering!")
+ else:
+ flash("Volunteering not possible!")
+ return redirect(url_for('.order', id=id))
@order_bp.route('//close')
@login_required
def close_order(id):
order = Order.query.filter(Order.id == id).first()
- if order is not None:
- if (current_user.id == order.courrier_id or current_user.is_admin()) \
- and order.stoptime is None or (order.stoptime > datetime.now()):
- order.stoptime = datetime.now()
- if order.courrier_id == 0 or order.courrier_id is None:
- courrier = select_user(order.items)
- if courrier is not None:
- order.courrier_id = courrier.id
- db.session.commit()
- return redirect(url_for('.order', id=id))
- abort(401)
+ if order is None:
+ abort(404)
+ if (current_user.id == order.courrier_id or current_user.is_admin()) \
+ and order.stoptime is None or (order.stoptime > datetime.now()):
+ order.stoptime = datetime.now()
+ if order.courrier_id == 0 or order.courrier_id is None:
+ courrier = select_user(order.items)
+ print(courrier)
+ if courrier is not None:
+ order.courrier_id = courrier.id
+ db.session.commit()
+ return redirect(url_for('.order', id=id))
app.register_blueprint(order_bp, url_prefix='/order')
def select_user(items):
user = None
- items = list(items)
+ # remove non users
+ items = [i for i in items if i.user_id]
+
if len(items) <= 0:
return None
while user is None:
item = random.choice(items)
user = item.user
- if random.randint(user.bias, 100) < 80:
- user = None
+ if user:
+ if random.randint(user.bias, 100) < 80:
+ user = None
return user
+
+def get_orders(expression=None):
+ orders = []
+ if expression is None:
+ expression = (Order.stoptime > datetime.now()) | (Order.stoptime == None)
+ if not current_user.is_anonymous():
+ orders = Order.query.filter(expression).all()
+ else:
+ orders = Order.query.filter((expression & (Order.public == True))).all()
+ return orders