diff --git a/advlabdb/models.py b/advlabdb/models.py
index 0ad489e..2e62ff2 100644
--- a/advlabdb/models.py
+++ b/advlabdb/models.py
@@ -56,7 +56,7 @@ class Experiment(db.Model):
building = db.Column(db.String(100), nullable=False)
responsibility = db.Column(db.String(200), nullable=True)
duration_in_days = db.Column(db.Integer, nullable=False)
- deprecated = db.Column(db.Boolean, nullable=False, default=False) # To not be deleted!
+ deprecated = db.Column(db.Boolean, nullable=False, default=False) # To not be deleted!
oral_weighting = db.Column(db.Float, nullable=False)
protocol_weighting = db.Column(db.Float, nullable=False)
final_weighting = db.Column(db.Float, nullable=False)
@@ -98,15 +98,15 @@ class Assistant(db.Model):
class Appointment(db.Model):
id = db.Column(db.Integer, primary_key=True)
- date = db.Column(db.DateTime, nullable=False) # To be specified with the python package "datetime"
- special = db.Column(db.Boolean, nullable=False) # In the break or not
+ date = db.Column(db.DateTime, nullable=False) # To be specified with the python package "datetime"
+ special = db.Column(db.Boolean, nullable=False) # In the break or not
group_experiment_id = db.Column(db.Integer, db.ForeignKey("group_experiment.id"), nullable=False)
assistant_id = db.Column(db.Integer, db.ForeignKey("assistant.id"), nullable=False)
class Part(db.Model):
id = db.Column(db.Integer, primary_key=True)
- label = db.Column(db.String(100), nullable=False) # A/1, A/2, B/1, B/2
+ label = db.Column(db.String(100), nullable=False) # A/1, A/2, B/1, B/2
semester_id = db.Column(db.Integer, db.ForeignKey("semester.id"), nullable=False)
part_experiments = db.relationship("PartExperiment", backref="part", lazy=True)
part_students = db.relationship("PartStudent", backref="part", lazy=True)
@@ -114,7 +114,7 @@ class Part(db.Model):
class Semester(db.Model):
id = db.Column(db.Integer, primary_key=True)
- label = db.Column(db.String(100), nullable=False) # WS2122 for example
+ label = db.Column(db.String(100), nullable=False) # WS2122 for example
parts = db.relationship("Part", backref="semester", lazy=True)
@@ -126,7 +126,7 @@ class ExperimentMark(db.Model):
part_student_id = db.Column(db.Integer, db.ForeignKey("part_student.id"), nullable=False)
group_experiment_id = db.Column(db.Integer, db.ForeignKey("group_experiment.id"), nullable=False)
assistant_id = db.Column(db.Integer, db.ForeignKey("assistant.id"),
- nullable=True) # The assistant who gives the mark
+ nullable=True) # The assistant who gives the mark
class User(db.Model):
diff --git a/advlabdb/routes.py b/advlabdb/routes.py
index 929588f..ed88d3e 100644
--- a/advlabdb/routes.py
+++ b/advlabdb/routes.py
@@ -10,51 +10,26 @@ def index():
@app.route("/students")
def students():
- parts = Semester.query.first().parts
+ parts = Semester.query.all()[-1].parts
tables = []
tablesLabels = []
+
+ headerAndDataList = [["Student number", "row.student.student_number"],
+ ["First name", "row.student.first_name"],
+ ["Last name", "row.student.last_name"],
+ ["Email", "row.student.email"],
+ ["Bachelor thesis", "row.student.bachelor_thesis"],
+ ["BT WG", "row.student.bachelor_thesis_work_group"],
+ ["Note", "row.student.note"],
+ ["Parts", "[ps.part for ps in row.student.part_students]"],
+ ["Final part mark", "row.final_part_mark"],
+ ["GN", "row.group.number"],
+ ["Experiemt marks", "row.experiment_marks"]]
+
for part in parts:
- tablesLabels.append("Part" + part.label + ":")
-
- table = ''
- table += th("Student number")
- table += th("First name")
- table += th("Last name")
- table += th("Email")
- table += th("Bachelor thesis")
- table += th("BT WG")
- table += th("Note")
- table += th("Parts")
- table += th("Final part mark")
- table += th("GN")
- table += th("Experiemt marks")
- table += ' \n