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 %}