Merge branch '127-sort-assignments-in-progress-overview-table-students-table' into 'development'

Resolve "Sort assignments in progress overview table (students table)"

Closes #127

See merge request !196

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Group joining is now restricted to groups with no submissions (@dsavvidi)
 ### Fixed
+- Modules and assignments were not sorted (@dsavvidi)
 
 ## [2.1.0]
 ### Added

src/main/resources/templates/edition/assist.html

@@ -67,7 +67,7 @@
                     <div class="tabs" role="tablist">
                         <a
                             role="tab"
-                            th:each="m, iter : ${edition.modules}"
+                            th:each="m, iter : ${#lists.sort(edition.modules, @templateService.nameComparator)}"
                             th:href="|?module=${m.id}|"
                             th:aria-selected="${iter.index == 0 && module == null} or ${module?.id == m.id}"
                             th:text="${m.name}"></a>

src/main/resources/templates/edition/grading.html

@@ -107,7 +107,7 @@
                     <div class="flex align-center">
                         <div th:id="test-fields" class="flex vertical gap-3">
                             <input
-                                th:each="module : ${edition.modules}"
+                                th:each="module : ${#lists.sort(edition.modules, @templateService.nameComparator)}"
                                 th:with="name = ${@gradeService.generateVariableName(module.name)}"
                                 class="textfield"
                                 type="text"

src/main/resources/templates/edition/student.html

@@ -82,7 +82,7 @@
                     <div class="tabs" role="tablist">
                         <a
                             role="tab"
-                            th:each="m, iter : ${edition.modules}"
+                            th:each="m, iter : ${#lists.sort(edition.modules, @templateService.nameComparator)}"
                             th:href="|?module=${m.id}|"
                             th:aria-selected="${iter.index == 0 && module == null} or ${module?.id == m.id}"
                             th:text="${m.name}"></a>

src/main/resources/templates/edition/students.html

@@ -46,7 +46,9 @@
                 <table class="table">
                     <tr class="table__header">
                         <th th:text="#{general.name}"></th>
-                        <td th:each="module : ${edition.modules}">
+                        <td
+                            th:each="module :
+                                ${#lists.sort(edition.modules, @templateService.nameComparator)}">
                             <a
                                 class="link"
                                 th:href="@{|/module/${module.id}/progress|}"

src/main/resources/templates/group/download_submissions.html

@@ -38,7 +38,9 @@
                 <div class="grid col-2" style="--col-1: minmax(0, 10rem)">
                     <span th:text="#{group.download_submissions.choose_assignments}"></span>
                     <div class="flex vertical gap-1">
-                        <div th:each="assignment : ${module.assignments}" class="checkbox">
+                        <div
+                            th:each="assignment : ${#lists.sort(module.assignments, @templateService.nameComparator)}"
+                            class="checkbox">
                             <input
                                 th:id="|assignment-${assignment.id}-box|"
                                 th:name="assignmentChoice"

src/main/resources/templates/module/grading.html

@@ -104,7 +104,7 @@
                     <div class="flex align-center">
                         <div th:id="test-fields" class="flex vertical gap-3">
                             <input
-                                th:each="assignment : ${module.assignments}"
+                                th:each="assignment : ${#lists.sort(module.assignments, @templateService.nameComparator)}"
                                 th:with="name = ${@gradeService.generateVariableName(assignment.name)}"
                                 class="textfield"
                                 type="text"

src/main/resources/templates/module/progress.html

@@ -48,7 +48,9 @@
                 <table class="table">
                     <tr class="table__header">
                         <th th:text="#{general.name}"></th>
-                        <td th:each="assignment : ${module.assignments}">
+                        <td
+                            th:each="assignment :
+                                ${#lists.sort(module.assignments, @templateService.nameComparator)}">
                             <a
                                 class="link"
                                 th:href="@{|/assignment/${assignment.id}|}"
@@ -69,7 +71,7 @@
                                 th:text="${row.person.displayName}"></span>
                         </td>
                         <td
-                            th:each="assignment : ${module.assignments}"
+                            th:each="assignment : ${#lists.sort(module.assignments, @templateService.nameComparator)}"
                             th:classappend="${row.submissions[assignment.id] == null} ? '' :
                                 (${row.submissions[assignment.id].getMaxGrade() == null} ? 'submitted' :
                                 (${@gradeService.isPassing(row.submissions[assignment.id].getMaxGrade(), module.edition.id) == false} ? 'fail' : 'pass'))">