start planned training list and fix mobile styling for session creation

src/Router.ts

@@ -145,6 +145,7 @@ router.use(
             "/training-request",
             routerGroup((r: Router) => {
                 r.get("/", TrainingRequestAdminController.getOpen);
+                r.get("/planned", TrainingRequestAdminController.getPlanned);
                 r.get("/training", TrainingRequestAdminController.getOpenTrainingRequests);
                 r.get("/lesson", TrainingRequestAdminController.getOpenLessonRequests);
                 r.get("/:uuid", TrainingRequestAdminController.getByUUID);

src/controllers/training-request/TrainingRequestAdminController.ts

@@ -5,6 +5,7 @@ import { TrainingRequest } from "../../models/TrainingRequest";
 import { Op } from "sequelize";
 import NotificationLibrary from "../../libraries/notification/NotificationLibrary";
 import { TrainingType } from "../../models/TrainingType";
+import { TrainingSession } from "../../models/TrainingSession";
 
 /**
  * Returns all currently open training requests
@@ -53,6 +54,55 @@ async function getOpen(request: Request, response: Response) {
     response.send(trainingRequests);
 }
 
+/**
+ * Returns all the planned sessions of the current user as either mentor or CPT examiner
+ * The differentiation between mentor & examiner must be done in the frontend
+ * @param request
+ * @param response
+ */
+async function getPlanned(request: Request, response: Response) {
+    const user: User = request.body.user;
+
+    let trainingSession = await TrainingSession.findAll({
+        where: {
+            [Op.or]: {
+                mentor_id: user.id,
+                cpt_examiner_id: user.id
+            },
+        },
+        include: [
+            TrainingSession.associations.course,
+            TrainingSession.associations.training_type,
+            {
+                association: TrainingSession.associations.training_session_belongs_to_users,
+                attributes: ['passed']
+            }
+        ]
+    });
+
+    /*
+        For each training session, we need to check whether there is at least one associated participant, who has not yet received a log
+        If the log doesn't exist, then this acts as a reminder to the mentor to fill out this log. Only when all participants have received a log
+        entry, will the session be shown as "complete"
+     */
+    trainingSession = trainingSession.filter((trainingSession: TrainingSession) => {
+        let hasOneNonPassed = false;
+        if (trainingSession.training_session_belongs_to_users == null || trainingSession.training_session_belongs_to_users.length == 0) {
+            return true;
+        }
+
+        for (const userSession of trainingSession.training_session_belongs_to_users) {
+            if (userSession.log_id == null) {
+                hasOneNonPassed = true;
+            }
+        }
+
+        return hasOneNonPassed;
+    })
+
+    response.send(trainingSession);
+}
+
 /**
  * Returns all training requests that the current user is able to mentor based on his mentor groups
  * Only returns Trainings (not lessons)
@@ -186,6 +236,7 @@ async function destroyByUUID(request: Request, response: Response) {
 
 export default {
     getOpen,
+    getPlanned,
     getOpenTrainingRequests,
     getOpenLessonRequests,
     getByUUID,

src/controllers/training-session/TrainingSessionController.ts

@@ -109,7 +109,7 @@ async function withdrawFromSessionByUUID(request: Request, response: Response) {
         icon: "door-exit",
     });
 
-    response.send({ message: "OK" });
+    response.sendStatus(HttpStatusCode.NoContent);
 }
 
 export default {

src/models/TrainingSession.ts

@@ -6,6 +6,7 @@ import { TrainingType } from "./TrainingType";
 import { Course } from "./Course";
 import { TrainingLog } from "./TrainingLog";
 import { TrainingStation } from "./TrainingStation";
+import { TrainingSessionBelongsToUsers } from "./through/TrainingSessionBelongsToUsers";
 
 export class TrainingSession extends Model<InferAttributes<TrainingSession>, InferCreationAttributes<TrainingSession>> {
     //
@@ -37,6 +38,7 @@ export class TrainingSession extends Model<InferAttributes<TrainingSession>, Inf
     declare training_logs?: NonAttribute<TrainingLog[]>;
     declare training_station?: NonAttribute<TrainingStation>;
     declare course?: NonAttribute<Course>;
+    declare training_session_belongs_to_users?: NonAttribute<TrainingSessionBelongsToUsers[]>;
 
     declare static associations: {
         users: Association<TrainingSession, User>;
@@ -45,6 +47,7 @@ export class TrainingSession extends Model<InferAttributes<TrainingSession>, Inf
         training_type: Association<TrainingSession, TrainingType>;
         training_logs: Association<TrainingSession, TrainingLog>;
         training_station: Association<TrainingSession, TrainingStation>;
+        training_session_belongs_to_users: Association<TrainingSession, TrainingSessionBelongsToUsers>;
         course: Association<TrainingSession, Course>;
     };
 }

src/models/associations/TrainingSessionAssociations.ts

@@ -38,6 +38,12 @@ export function registerTrainingSessionAssociations() {
         foreignKey: "id",
     });
 
+    TrainingSession.hasMany(TrainingSessionBelongsToUsers, {
+        as: "training_session_belongs_to_users",
+        sourceKey: "id",
+        foreignKey: "training_session_id",
+    });
+
     TrainingSession.hasOne(User, {
         as: "mentor",
         sourceKey: "mentor_id",