From e95cb842fe4ae2fd060b9050e5dd0644b971e059 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Fri, 19 Mar 2021 18:09:07 +0100
Subject: [PATCH] Added assistants table

---
 advlabdb/routes.py                 | 20 ++++++++++++++++++--
 advlabdb/templates/assistants.html |  3 +++
 advlabdb/templates/students.html   | 15 +--------------
 advlabdb/utils.py                  | 30 ++++++++++++++++++++++++------
 4 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/advlabdb/routes.py b/advlabdb/routes.py
index ed88d3e..3254936 100644
--- a/advlabdb/routes.py
+++ b/advlabdb/routes.py
@@ -10,7 +10,8 @@ def index():
 
 @app.route("/students")
 def students():
-    parts = Semester.query.all()[-1].parts
+    semester = Semester.query.all()[-1]
+    parts = semester.parts
     tables = []
     tablesLabels = []
 
@@ -36,8 +37,23 @@ def students():
 
 @app.route("/assistants")
 def assistants():
+    headerAndDataList = [["First name", "row.first_name"],
+                         ["Last name", "row.last_name"],
+                         ["Email", "row.email"],
+                         ["Phone number", "row.phone_number"],
+                         ["Mobile phone number", "row.mobile_phone_number"],
+                         ["Room", "row.room"],
+                         ["Building", "row.building"],
+                         ["User", "row.user"],
+                         ["Appointments", "row.appointments"],
+                         ["Experiemt marks", "row.experiment_marks"]]
+
+    table = makeTable(headerAndDataList=headerAndDataList,
+                      rows=Assistant.query.filter(Assistant.user_id != None).all())
+
     page = "assistants"
-    return render_template(page + ".html", navbarItems=navbarItems(page))
+    return render_template(page + ".html", navbarItems=navbarItems(page),
+                           table=table)
 
 @app.route("/experiments")
 def experiments():
diff --git a/advlabdb/templates/assistants.html b/advlabdb/templates/assistants.html
index 39e893d..31810f8 100644
--- a/advlabdb/templates/assistants.html
+++ b/advlabdb/templates/assistants.html
@@ -1,3 +1,6 @@
 {% extends "layout.html" %}
 {% block content %}
+
+{{table|safe}}
+
 {% endblock content %}
diff --git a/advlabdb/templates/students.html b/advlabdb/templates/students.html
index 87f9869..f87c4aa 100644
--- a/advlabdb/templates/students.html
+++ b/advlabdb/templates/students.html
@@ -3,20 +3,7 @@
 
 {% for table in tables %}
 <h2>{{tablesLabels[loop.index0]}}</h2>
-<table
-data-classes="table table-bordered table-striped"
-data-toggle="table"
-data-thead-classes="table-dark"
-data-search="true"
-data-show-toggle="true"
-data-show-columns="true"
-data-show-export="true"
-data-export-types="['json', 'xml', 'csv', 'txt', 'sql', 'pdf']">
-  {{table|safe}}
-</table>
-<br>
-<hr>
-<br>
+{{table|safe}}
 {% else %}
 No parts in this semster yet!
 {% endfor %}
diff --git a/advlabdb/utils.py b/advlabdb/utils.py
index 0cd7720..ed1fd6e 100644
--- a/advlabdb/utils.py
+++ b/advlabdb/utils.py
@@ -10,17 +10,31 @@ def navbarItems(activePage):
     return items
 
 def makeTable(headerAndDataList, rows):
+    def cellString(cell):
+        return str(cell).replace("<", " ").replace(">", " ")
+
     def td(cell):
-        return "<td>" + str(cell) + "</td>"
+        return "<td>" + cellString(cell) + "</td>"
 
     def th(cell):
-        return '<th data-sortable="true">' + str(cell) + '</th>'
+        return '<th data-sortable="true">' + cellString(cell) + '</th>'
 
-
-    table = '<thead><tr>'
+    table = '''<table
+data-classes="table table-bordered table-striped"
+data-toggle="table"
+data-thead-classes="table-dark"
+data-search="true"
+data-show-toggle="true"
+data-show-columns="true"
+data-show-export="true"
+data-export-types="['json', 'xml', 'csv', 'txt', 'sql', 'pdf']">
+<thead>
+<tr>'''
     for i in headerAndDataList:
         table += th(i[0])
-    table += '</tr></thead>\n<tbody>\n'
+    table += '''</tr>
+</thead>
+<tbody>\n'''
 
     for row in rows:
         table += '<tr>'
@@ -30,5 +44,9 @@ def makeTable(headerAndDataList, rows):
 
         table += '</tr>\n'
 
-    table += '</tbody>'
+    table += '''</tbody>
+</table>
+<br>
+<hr>
+<br>'''
     return table