From 24c9fae040a071269760ebfd5615c04b4825f115 Mon Sep 17 00:00:00 2001
From: Sunpy <sunpy@osufx.com>
Date: Fri, 26 Apr 2019 05:22:43 +0100
Subject: [PATCH] Bills display

---
 routes.py                               | 29 +++++++++++++++++++
 templates/layout/includes/side_nav.html | 38 ++++++-------------------
 templates/pages/bill.html               | 11 -------
 templates/pages/bills.html              | 36 +++++++++++++++++++++++
 templates/pages/kvittering.html         | 10 -------
 templates/pages/receipts.html           | 11 +++++++
 templates/pages/regninger.html          |  8 ------
 templates/pages/testing.html            |  8 ------
 templates/pages/warranties.html         | 11 +++++++
 9 files changed, 95 insertions(+), 67 deletions(-)
 delete mode 100644 templates/pages/bill.html
 create mode 100644 templates/pages/bills.html
 delete mode 100644 templates/pages/kvittering.html
 create mode 100644 templates/pages/receipts.html
 delete mode 100644 templates/pages/regninger.html
 delete mode 100644 templates/pages/testing.html
 create mode 100644 templates/pages/warranties.html

diff --git a/routes.py b/routes.py
index c8c3fec..1ab3671 100644
--- a/routes.py
+++ b/routes.py
@@ -19,6 +19,35 @@ logged_in_users = []
 def dashboard():
 	return render_template("pages/dashboard.html")
 
+@glob.app.route("/bills")
+@flask_login.login_required
+def bills():
+	conn = glob.get_sql_connection()
+	cur = conn.cursor()
+
+	cur.execute("""
+	SELECT Betaletil, Regningfor, Regningsum, KID, Betalingsfrist, Betalt
+	FROM Regninger
+	WHERE BrukerID = %s
+	""", (flask_login.current_user.id,))
+
+	data = []
+	for row in cur:
+		data.append(row)
+
+	cur.close()
+	return render_template("pages/bills.html", data=data)
+
+@glob.app.route("/warranties")
+@flask_login.login_required
+def warranties():
+	return "AAAA"
+
+@glob.app.route("/receipts")
+@flask_login.login_required
+def receipts():
+	return "AAAA"
+
 @glob.app.route("/login", methods = ["GET", "POST"])
 def login():
 	if flask_login.current_user.is_authenticated:
diff --git a/templates/layout/includes/side_nav.html b/templates/layout/includes/side_nav.html
index 44da047..f6a3c14 100644
--- a/templates/layout/includes/side_nav.html
+++ b/templates/layout/includes/side_nav.html
@@ -104,52 +104,30 @@
         <div class="p-2"> <!-- Padding -->
 			<div class="flex-column">
                 <div> <!-- Collection -->
-                    <a class="item" onclick="toggleCategory(this)">
-                        <i class="fa fa-chart-bar"></i><span>Dashboard</span>
-                        <i class="fas fa-chevron-right"></i>
+                    <a class="item" href="{{ url_for('dashboard') }}">
+                        <i class="far fa-calendar-alt"></i><span>Dashboard</span>
                     </a>
-                    <div class="downtab hidden">
-                        <div class="flex-column">
-                            <div class="page">
-                                <a href="#dash-test">Test</a>
-                            </div>
-                            <div class="page">
-                                <a href="#dash-demo">Demo</a>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div>
-                    <h4>Title card</h4>
+                    <h4>Economical</h4>
                 </div>
                 <div>
-                    <a class="item" onclick="toggleCategory(this)">
-                        <i class="fa fa-chart-bar"></i><span>Bills</span>
-                        <i class="fas fa-chevron-right"></i>
+                    <a class="item" href="{{ url_for('bills') }}">
+                        <i class="fas fa-money-check-alt"></i><span>Bills</span>
                     </a>
-                    <div class="downtab hidden">
-                        <div class="flex-column">
-                            <div class="page">
-                                <a href="#bills-bills">Bills</a>
-                            </div>
-                            <div class="page">
-                                <a href="#bills-log">Log</a>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div>
                     <a class="item" onclick="toggleCategory(this)">
-                        <i class="fa fa-chart-bar"></i><span>Receipt</span>
+                        <i class="far fa-list-alt"></i><span>Receipts</span>
                         <i class="fas fa-chevron-right"></i>
                     </a>
                     <div class="downtab hidden">
 						<div class="flex-column">
                             <div class="page">
-                                <a href="#recieps-recieps">Receipt</a>
+                                <a href="{{ url_for('receipts') }}">Receipts</a>
                             </div>
                             <div class="page">
-                                <a href="#recieps-log">Log</a>
+                                <a href="{{ url_for('warranties') }}">Warranties</a>
                             </div>
                         </div>
                     </div>
diff --git a/templates/pages/bill.html b/templates/pages/bill.html
deleted file mode 100644
index ea43231..0000000
--- a/templates/pages/bill.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% set title = "bill:)" %}
-
-{% extends "layout/bootstrap.html" %}
-
-{% block content %}
-<p>lotsa bills</p>
-<p>many bills</p>
-<i class="fas fa-user"></i> <!-- uses solid style -->
-<i class="far fa-user"></i> <!-- uses regular style -->
-<i class="fab fa-github-square"></i> <!-- uses brands style -->
-{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/bills.html b/templates/pages/bills.html
new file mode 100644
index 0000000..5f43645
--- /dev/null
+++ b/templates/pages/bills.html
@@ -0,0 +1,36 @@
+{% set title = "Bills" %}
+
+{% extends "layout/dash.html" %}
+
+{% block content %}
+
+<div class="container module">
+
+<table class="table">
+	<thead class="thead-light">
+		<tr>
+			<th scope="col">Payment to</th>
+			<th scope="col">Description</th>
+			<th scope="col">Sum</th>
+			<th scope="col">KID</th>
+			<th scope="col">Date Due</th>
+			<th scope="col">Payment status</th>
+		</tr>
+	</thead>
+	<tbody>
+{% for row in data %}
+		<tr>
+			<th>{{ row[0] }}</th>
+			<td>{{ row[1] }}</td>
+			<td>{{ row[2] }}</td>
+			<td>{{ row[3] }}</td>
+			<td>{{ row[4] }}</td>
+			<td>{{ row[5] }}</td>
+		</tr>
+{% endfor %}
+	</tbody>
+</table>
+
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/kvittering.html b/templates/pages/kvittering.html
deleted file mode 100644
index 5743bef..0000000
--- a/templates/pages/kvittering.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% set title = "Kvitteringer" %}
-
-{% extends "layout/bootstrap.html" %}
-
-{% block content %}
-
-<p>Tester siden!</p>
-<p>KVITTERINGER FOR FAEN!</p>
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/receipts.html b/templates/pages/receipts.html
new file mode 100644
index 0000000..85b6cd8
--- /dev/null
+++ b/templates/pages/receipts.html
@@ -0,0 +1,11 @@
+{% set title = "Dashboard" %}
+
+{% extends "layout/dash.html" %}
+
+{% block content %}
+
+<div class="container module">
+{% include "modules/calendar.html" %}
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/regninger.html b/templates/pages/regninger.html
deleted file mode 100644
index 87e0e34..0000000
--- a/templates/pages/regninger.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% set title = "Regninger" %}
-
-{% extends "layout/bootstrap.html" %}
-
-{% block content %}
-<p>Regninger :D</p>
-<p>test</p>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/testing.html b/templates/pages/testing.html
deleted file mode 100644
index 91a7ad0..0000000
--- a/templates/pages/testing.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% set title = "testing" %}
-
-{% extends "layout/bootstrap.html" %}
-
-{% block content %}
-<p>testing</p>
-<p>tester dette</p>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/pages/warranties.html b/templates/pages/warranties.html
new file mode 100644
index 0000000..85b6cd8
--- /dev/null
+++ b/templates/pages/warranties.html
@@ -0,0 +1,11 @@
+{% set title = "Dashboard" %}
+
+{% extends "layout/dash.html" %}
+
+{% block content %}
+
+<div class="container module">
+{% include "modules/calendar.html" %}
+</div>
+
+{% endblock %}
\ No newline at end of file