Merge branch 'show-full-names-in-rankings' into 'master'

Feat: Changes for showing full names in the ranking of projects, instead of...

See merge request !10

app/templates/pages/staff/shortlisted-projects.html

@@ -15,7 +15,7 @@
                                 <i class="fa-solid fa-bars"></i>&ensp;
                             </span>
                                 <span>
-                                {{ shortlisting.project.title }} - {{ shortlisting.student }}
+                                {{ shortlisting.project.title }} - {{ full_names[shortlisting.id] }}
                             </span>
                             </li>
                         {% endfor %}

app/templates/pages/student/shortlisted-projects.html

@@ -15,7 +15,7 @@
                                 <i class="fa-solid fa-bars"></i>&ensp;
                             </span>
                                 <span>
-                                {{ project.title }}
+                                {{ project.title }} - {{ full_names[project.id] }}
                             </span>
                             </li>
                         {% endfor %}

app/views/staff.py

@@ -124,7 +124,23 @@ def projects_ranking():
         .order_by(Shortlisting.staff_ranking)
         .all()
     )
-    return render_template("pages/staff/shortlisted-projects.html", projects=projects)
+
+    full_names = {}
+
+    for shortlisting in projects:
+        person = Person.query.filter(
+            Person.username == shortlisting.student
+        ).first() or Person(username=shortlisting.student, firstname="", lastname="")
+
+        full_names[shortlisting.id] = (
+            person.full_name if person.full_name else person.username
+        )
+
+    return render_template(
+        "pages/staff/shortlisted-projects.html",
+        projects=projects,
+        full_names=full_names,
+    )
 
 
 @bp.route("/projects/rankings", methods=["PUT"])

app/views/student.py

@@ -42,8 +42,28 @@ def projects_ranking():
         .order_by(Shortlisting.ranking)
         .all()
     )
+
+    full_names = {}
+
+    for shortlisting in shortlisted_projects:
+        username = (
+            shortlisting.proposer
+            if shortlisting.on_behalf is None
+            else shortlisting.on_behalf
+        )
+
+        person = Person.query.filter(Person.username == username).first() or Person(
+            username=username, firstname="", lastname=""
+        )
+
+        full_names[shortlisting.id] = (
+            person.full_name if person.full_name else person.username
+        )
+
     return render_template(
-        "pages/student/shortlisted-projects.html", projects=shortlisted_projects
+        "pages/student/shortlisted-projects.html",
+        projects=shortlisted_projects,
+        full_names=full_names,
     )