From 6e660399a2f503a465f22841f4137d7626cd859f Mon Sep 17 00:00:00 2001
From: Feliciaan De Palmenaer <feliciaan@de-palmenaer.eu>
Date: Fri, 27 Mar 2015 18:07:06 +0100
Subject: [PATCH] Added an order detail view, and open orders on the homepage

---
 app/filters.py                   |  7 +++++++
 app/foodbot.py                   |  1 +
 app/models.py                    |  4 +++-
 app/templates/about.html         |  5 +++--
 app/templates/home.html          |  3 ++-
 app/templates/home_loggedin.html | 14 ++++++++++++++
 app/templates/layout.html        | 17 ++++++++++++++---
 app/templates/login.html         | 24 ------------------------
 app/templates/order.html         | 16 ++++++++++++++++
 app/templates/stats.html         |  4 ++--
 app/views.py                     | 17 +++++++++++++++--
 app/zeus.py                      |  2 +-
 12 files changed, 78 insertions(+), 36 deletions(-)
 create mode 100644 app/filters.py
 create mode 100644 app/templates/home_loggedin.html
 delete mode 100644 app/templates/login.html
 create mode 100644 app/templates/order.html

diff --git a/app/filters.py b/app/filters.py
new file mode 100644
index 0000000..a73a454
--- /dev/null
+++ b/app/filters.py
@@ -0,0 +1,7 @@
+from app import app
+__author__ = 'feliciaan'
+
+@app.template_filter('euro')
+def euro(value):
+    result = '€' + str(value/100)
+    return result
\ No newline at end of file
diff --git a/app/foodbot.py b/app/foodbot.py
index 0165261..4335503 100644
--- a/app/foodbot.py
+++ b/app/foodbot.py
@@ -10,6 +10,7 @@ from app import app, db
 from admin import admin
 from login import login_manager
 from models import *
+from filters import *
 from views import *
 
 if __name__ == '__main__':
diff --git a/app/models.py b/app/models.py
index 2fc7274..86ca9e5 100644
--- a/app/models.py
+++ b/app/models.py
@@ -43,6 +43,8 @@ class Location(db.Model):
     address = db.Column(db.String(254))
     website = db.Column(db.String(120))
     food = db.relationship('Food', backref='location', lazy='dynamic')
+    orders = db.relationship('Order', backref='location', lazy='dynamic')
+
 
     def configure(self, name, address, website):
         self.name = name
@@ -85,7 +87,7 @@ class Order(db.Model):
         self.stoptime = stoptime
 
     def __repr__(self):
-        return 'Order'
+        return 'Order %s' % (self.location.name)
 
 
 class OrderItem(db.Model):
diff --git a/app/templates/about.html b/app/templates/about.html
index a36d7c4..b412cf7 100644
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -1,5 +1,6 @@
-{% extends "layout.html" %}
-  
+{% extends "layout.html" -%}
+{% set active_page = "about" -%}
+
 {% block content %}
   <h1>About</h1>
   <p>This is an About page for FoodBot. Don't I look good? Oh stop, you're making me blush.</p>
diff --git a/app/templates/home.html b/app/templates/home.html
index 91b872c..eefe505 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -1,4 +1,5 @@
-{% extends "layout.html" %}
+{% extends "layout.html" -%}
+{% set active_page = "home" -%}
 {% block content %}
   <div class="jumbotron">
     <h2>Welcome to FoodBot</h2>
diff --git a/app/templates/home_loggedin.html b/app/templates/home_loggedin.html
new file mode 100644
index 0000000..26bbc22
--- /dev/null
+++ b/app/templates/home_loggedin.html
@@ -0,0 +1,14 @@
+{% extends "home.html" %}
+{% block content %}
+{{ super() }}
+<div class="row">
+    <div class="col-md-4">
+        <h3>Open orders:</h3>
+    <ul>
+        {% for order in orders %}
+            <li><a href="{{ url_for('order', id=order.id) }}">{{ order.location.name }}-{{ order.stoptime }}</a></li>
+        {% endfor %}
+    </ul>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/layout.html b/app/templates/layout.html
index 772121c..f402dd9 100644
--- a/app/templates/layout.html
+++ b/app/templates/layout.html
@@ -1,3 +1,12 @@
+{% set navbar = [
+    ('home', 'Home'),
+    ('about', 'About'),
+    ('stats', 'Stats'),
+] -%}
+{% if current_user.is_admin() -%}
+    {% set navbar = navbar + [('admin.index', 'Admin')] -%}
+{% endif -%}
+{% set active_page = active_page|default('index') -%}
 <!DOCTYPE html>
 <html>
   <head lang="en">
@@ -24,9 +33,11 @@
         </div>
         <div id="navbar" class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a href="{{ url_for('home') }}">Home</a></li>
-            <li><a href="{{ url_for('about') }}">About</a></li>
-            <li><a href="{{ url_for('stats') }}">Stats</a></li>
+            {% for id, text in navbar -%}
+                <li class="{{ 'active' if id == active_page else '' }}">
+                    <a href="{{ url_for(id) }}">{{ text|e }}</a>
+                </li>
+            {% endfor -%}
           </ul>
           <ul class="nav navbar-nav navbar-right">
               {% if current_user.is_anonymous() %}
diff --git a/app/templates/login.html b/app/templates/login.html
deleted file mode 100644
index a70fb3d..0000000
--- a/app/templates/login.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "layout.html" %}
-  
-{% block content %}
-    <section class="container">
-        <div class="login">
-            <h1>Login with Zeus-Account</h1>
-            <form method="post" action="{{ url_for('home') }}">
-                <p><input type="text" name="login" value="" placeholder="Zeus e-mail "></p>
-                <p><input type="password" name="password" value="" placeholder="Password"></p>
-                <p class="remember_me">
-                    <label>
-                        <input type="checkbox" name="remember_me" id="remember_me">
-                        Remember me on this computer
-                    </label>
-                </p>
-                <p class="submit"><input type="submit" name="commit" value="Login"></p>
-            </form>
-        </div>
-
-        <div class="login-help">
-            <p>Forgot your password? <a href="{{ url_for('home') }}">Click here to reset it</a>.</p>
-        </div>
-    </section>
-{% endblock %}
\ No newline at end of file
diff --git a/app/templates/order.html b/app/templates/order.html
new file mode 100644
index 0000000..78329cc
--- /dev/null
+++ b/app/templates/order.html
@@ -0,0 +1,16 @@
+{% extends "layout.html" %}
+{% block content %}
+<div class="row">
+    <div class="col-md-12"><!-- Shitty html-->
+        <h3>Order {{ order.id }}</h3>
+        Courrier: {{ order.courrier.username }}<br/>
+        Location: <a href="{{ order.location.website }}">{{ order.location.name }}</a><br/>
+        Starttime: {{ order.starttime }}<br/>
+        Stoptime: {{  order.stoptime }}<br/>
+        <h3>Orders</h3>
+        {% for item in order.orders %}
+            {{ item.user.username }} - {{ item.food.name }} - {{ item.food.price|euro }}<br/>
+        {% endfor %}
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/stats.html b/app/templates/stats.html
index 553a0d1..d6ae270 100644
--- a/app/templates/stats.html
+++ b/app/templates/stats.html
@@ -1,5 +1,5 @@
-{% extends "layout.html" %}
-  
+{% extends "layout.html" -%}
+{% set active_page = "stats" -%}
 {% block content %}
   <h1>Stats bruh</h1>
   <p>TOP 4</p>
diff --git a/app/views.py b/app/views.py
index d9401f0..81bdc6d 100644
--- a/app/views.py
+++ b/app/views.py
@@ -1,11 +1,17 @@
-from flask import url_for, render_template
+from flask import url_for, render_template, abort
+from flask.ext.login import current_user
+from datetime import datetime
 
 from app import app
+from models import Order
 
 
 
 @app.route('/')
 def home():
+   if not current_user.is_anonymous():
+        orders = Order.query.filter(Order.stoptime > datetime.now()).all()
+        return render_template('home_loggedin.html', orders=orders)
    return render_template('home.html')
 
 
@@ -19,9 +25,16 @@ def stats():
    return render_template('stats.html')
 
 
+@app.route('/order/<int:id>')
+def order(id):
+    order = Order.query.filter(Order.id == id).first()
+    if order is not None:
+        return render_template('order.html', order=order)
+    return abort(404)
+
 if app.debug:  # add route information
     @app.route('/routes')
-    def list_routes(self):
+    def list_routes():
         import urllib
         output = []
         for rule in app.url_map.iter_rules():
diff --git a/app/zeus.py b/app/zeus.py
index 7661260..3a65c0e 100644
--- a/app/zeus.py
+++ b/app/zeus.py
@@ -60,7 +60,7 @@ def get_zeus_oauth_token():
 
 def login_and_redirect_user(user):
     login_user(user)
-    return redirect(url_for("admin.index"))
+    return redirect(url_for("index"))
 
 
 def create_user(username):