merge branch 'main' into libnest-v8

Author: joshunrau

apps/api/src/instrument-records/instrument-records.service.ts

@@ -140,7 +140,8 @@ export class InstrumentRecordsService {
           select: {
             date: true,
             id: true,
-            type: true
+            type: true,
+            user: true
           }
         },
         subject: true
@@ -185,6 +186,7 @@ export class InstrumentRecordsService {
             subjectId: removeSubjectIdScope(record.subject.id),
             subjectSex: record.subject.sex,
             timestamp: record.date.toISOString(),
+            userId: record.session.user?.username ?? 'N/A',
             value: measureValue
           });
         }
@@ -208,6 +210,7 @@ export class InstrumentRecordsService {
               subjectId: removeSubjectIdScope(record.subject.id),
               subjectSex: record.subject.sex,
               timestamp: record.date.toISOString(),
+              userId: record.session.user?.username ?? 'N/A',
               value: arrayEntry.measureValue
             });
           });

apps/api/src/sessions/sessions.controller.ts

@@ -1,7 +1,9 @@
-import { Body, Controller, Post } from '@nestjs/common';
+import { CurrentUser } from '@douglasneuroinformatics/libnest';
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
 import { ApiOperation } from '@nestjs/swagger';
 import type { Session } from '@prisma/client';
 
+import type { AppAbility } from '@/auth/auth.types';
 import { RouteAccess } from '@/core/decorators/route-access.decorator';
 
 import { CreateSessionDto } from './dto/create-session.dto';
@@ -17,4 +19,11 @@ export class SessionsController {
   create(@Body() data: CreateSessionDto): Promise<Session> {
     return this.sessionsService.create(data);
   }
+
+  @ApiOperation({ description: 'Find Session by ID' })
+  @Get(':id')
+  @RouteAccess({ action: 'read', subject: 'Session' })
+  findByID(@Param('id') id: string, @CurrentUser('ability') ability: AppAbility): Promise<Session> {
+    return this.sessionsService.findById(id, { ability });
+  }
 }

apps/web/src/components/Navbar/Navbar.tsx

@@ -18,6 +18,7 @@ export const Navbar = () => {
   const navItems = useNavItems();
   const { t } = useTranslation('layout');
   const navigate = useNavigate();
+  const endSession = useAppStore((store) => store.endSession);
 
   // This is to prevent ugly styling when resizing the viewport
   const isDesktop = useIsDesktop();
@@ -83,6 +84,10 @@ export const Navbar = () => {
                   isActive={false}
                   label={t('navLinks.endSession')}
                   url="#"
+                  onClick={() => {
+                    endSession();
+                    void navigate({ to: '/session/start-session' });
+                  }}
                 />
               )}
             </div>

apps/web/src/routes/_app/session/start-session.tsx

@@ -1,9 +1,11 @@
 import React, { useEffect, useState } from 'react';
 
-import { Heading } from '@douglasneuroinformatics/libui/components';
+import { Card, Heading } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { FormTypes } from '@opendatacapture/runtime-core';
 import { createFileRoute, useLocation } from '@tanstack/react-router';
+import { CheckCircle } from 'lucide-react';
+import { AnimatePresence, motion } from 'motion/react';
 
 import { PageHeader } from '@/components/PageHeader';
 import { StartSessionForm } from '@/components/StartSessionForm';
@@ -41,16 +43,45 @@ const RouteComponent = () => {
           {t('startSession')}
         </Heading>
       </PageHeader>
-      <StartSessionForm
-        currentGroup={currentGroup}
-        initialValues={initialValues}
-        readOnly={currentSession !== null || createSessionMutation.isPending}
-        username={currentUser?.username}
-        onSubmit={async (formData) => {
-          const session = await createSessionMutation.mutateAsync(formData);
-          startSession({ ...session, type: formData.type });
-        }}
-      />
+      {currentSession === null && (
+        <StartSessionForm
+          currentGroup={currentGroup}
+          initialValues={initialValues}
+          readOnly={currentSession !== null || createSessionMutation.isPending}
+          username={currentUser?.username}
+          onSubmit={async (formData) => {
+            const session = await createSessionMutation.mutateAsync(formData);
+            startSession({ ...session, type: formData.type });
+          }}
+        />
+      )}
+      <AnimatePresence>
+        {currentSession !== null && (
+          <motion.div
+            animate={{ opacity: 1, scale: 1 }}
+            className="flex grow"
+            exit={{ opacity: 0, scale: 0 }}
+            initial={{ opacity: 0, scale: 0 }}
+            key="modal"
+          >
+            <div className="flex grow items-center justify-center">
+              {currentSession !== null && (
+                <Card className="mx-auto block max-w-3xl border p-12 text-green-600 opacity-70 dark:text-green-300">
+                  <div className="flex flex-col items-center justify-center gap-y-10">
+                    <CheckCircle className="!size-20" />
+                    <p className="max-w-2xl text-center text-lg font-medium">
+                      {t({
+                        en: 'The current session must be ended before starting the form again.',
+                        fr: 'La session en cours doit être terminée avant de recommencer le formulaire.'
+                      })}
+                    </p>
+                  </div>
+                </Card>
+              )}
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
     </React.Fragment>
   );
 };

packages/schemas/src/instrument-records/instrument-records.ts

@@ -46,6 +46,7 @@ export const $InstrumentRecord = $BaseModel.extend({
   date: z.coerce.date(),
   groupId: z.string().nullish(),
   instrumentId: z.string(),
+  sessionId: z.string(),
   subjectId: z.string()
 });
 
@@ -63,6 +64,7 @@ export type InstrumentRecordsExport = {
   subjectId: string;
   subjectSex: null | string;
   timestamp: string;
+  userId: string;
   value: InstrumentMeasureValue;
 }[];