Merge pull request #68 from AlessGarau/develop

FIX overflow in class slot and add class name

Author: mirandalucas52

packages/client/src/components/Planning/PlannedClassSlot/PlannedClassSlot.tsx

@@ -71,6 +71,7 @@ const PlannedClassSlot: React.FC<PlannedClassSlotProps> = ({ plannedClass, isEmp
                 X
             </button>
             <div className="font-semibold text-sm text-slotFilled">{plannedClass.title}</div>
+            <div className="text-xs font-medium text-slotFilled">{plannedClass.className}</div>
             <div className="text-xs text-slotFilled">{plannedClass.teacher}</div>
             <div className="text-xs text-slotFilled">
                 {plannedClass.startTime} - {plannedClass.endTime}

packages/client/src/components/Planning/PlanningContainer/PlanningContainer.tsx

@@ -114,7 +114,7 @@ const PlanningContainer: React.FC<PlanningContainerProps> = ({
                                     const timeSlots = getTimeSlotsForDay(plannedClasses);
                                     return (
                                         <td key={day.day} className={`flex-1 h-96`}>
-                                            <div className="flex flex-col gap-2 h-full">
+                                            <div className="flex flex-col gap-2 h-full overflow-y-auto">
                                                 {timeSlots.map((slot, index) => (
                                                     <PlannedClassSlot
                                                         key={slot.plannedClass ? `${classroom.id}-${day.day}-${slot.plannedClass.id}` : `${classroom.id}-${day.day}-empty-${index}`}

packages/client/src/types/Planning.d.ts

@@ -1,6 +1,7 @@
 export interface PlannedClass {
     id: string;
     title: string;
+    className: string;
     teacher: string;
     startTime: string;
     endTime: string;

packages/server/src/feature/lesson/Mapper.ts

@@ -11,6 +11,7 @@ export class LessonMapper {
     return {
       id: lesson.id,
       title: lesson.title,
+      className: lesson.class?.name || "",
       teacher: teacher ? `${teacher.first_name} ${teacher.last_name}` : "TBD",
       startTime: this.formatTime(lesson.start_time),
       endTime: this.formatTime(lesson.end_time),

packages/server/src/feature/lesson/validate.ts

@@ -16,6 +16,7 @@ export const UpdateLessonBodySchema = z.object({
 export const PlannedLessonSchema = z.object({
   id: z.string().uuid(),
   title: z.string(),
+  className: z.string(),
   teacher: z.string(),
   startTime: z.string(),
   endTime: z.string(),

packages/server/src/feature/planning/Mapper.ts

@@ -45,6 +45,7 @@ export class PlanningMapper implements IPlanningMapper {
       return {
         id: lesson.id,
         title: lesson.title,
+        className: lesson.class?.name || "",
         teacher: teacher ? `${teacher.first_name} ${teacher.last_name}` : "TBD",
         startTime: this.formatTime(lesson.start_time),
         endTime: this.formatTime(lesson.end_time),