Improve UI for smaller screens

2024-11-14 07:25:06 +01:00
parent cb86720b13
commit 20b9a59257
23 changed files with 224 additions and 191 deletions
--- a/software/backend/routes/exercise.routes.ts
+++ b/software/backend/routes/exercise.routes.ts
@@ -8,19 +8,13 @@ export const exercises = Router()
 * Get all Exercises grouped in ExerciseGroups
 */
 exercises.get("/", (req: Request, res: Response) => {
-  ExerciseGroup.findAll(
-    {
-      include: [
-        {
-          model: Exercise,
-          separate: true,
-          order: [
-            [ 'id', 'ASC' ]
-          ]
-        }
-      ]
-    }
-  ).then(result => {
+  Exercise.findAll({
+    include: [ ExerciseGroup ]
+  }).then(result => {
+    result.sort((a, b) => {
+      return (a.dataValues.exerciseGroup.dataValues.groupNr * 10 + a.dataValues.exerciseNr) > (b.dataValues.exerciseGroup.dataValues.groupNr * 10 + b.dataValues.exerciseNr) ? 1 : -1
+    })
+
    res.status(200).json(result)
  })
 })