From d57ce7f89b700315cac914e7bc2c973a8a89d478 Mon Sep 17 00:00:00 2001
From: Nuno <nunogonbraga@gmail.com>
Date: Tue, 16 Dec 2025 14:20:03 +0000
Subject: [PATCH 1/2] changed nmec to name

---
 src/@types/index.d.ts                                       | 1 +
 .../admin/requests/cards/StudentEnrollmentCard.tsx          | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts
index 065d56499..6d0982320 100644
--- a/src/@types/index.d.ts
+++ b/src/@types/index.d.ts
@@ -188,6 +188,7 @@ export type CourseUnitEnrollment = {
   id: number,
   date: string,
   user_nmec: string,
+  user_name: string,
   admin_state: string,
   accepted: boolean,
   schedule: Array<ClassDescriptor>,
diff --git a/src/components/admin/requests/cards/StudentEnrollmentCard.tsx b/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
index 618e66c43..96b9d07d0 100644
--- a/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
+++ b/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
@@ -49,8 +49,8 @@ export const StudentEnrollmentCard = ({
                     </div>
                     {!open && <>
                         <Person
-                            key={"enrollment-person-" + enrollment.user_nmec}
-                            name={enrollment.user_nmec}
+                            key={"enrollment-person-" + enrollment.user_name}
+                            name={enrollment.user_name}
                             nmec={enrollment.user_nmec}
                         />
                     </>}
@@ -71,7 +71,7 @@ export const StudentEnrollmentCard = ({
                 {open && (
                     <div className="flex flex-col gap-y-8" key={crypto.randomUUID()}>
                         <div className="flex flex-row justify-between">
-                            <Person name={enrollment.user_nmec} nmec={enrollment.user_nmec} />
+                            <Person name={enrollment.user_name} nmec={enrollment.user_nmec} />
                             <div className="flex flex-row gap-x-2">
                                 {enrollment.options.map((option) => (
                                     <div

From 5c1eece7b5375c6772fcf47602cb58ed22a4d204 Mon Sep 17 00:00:00 2001
From: Nuno <nunogonbraga@gmail.com>
Date: Wed, 17 Dec 2025 14:08:53 +0000
Subject: [PATCH 2/2] Sort the list of courses by course_unit_id

---
 src/@types/index.d.ts                         |  1 +
 .../requests/cards/StudentEnrollmentCard.tsx  | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts
index 6d0982320..22a40cee7 100644
--- a/src/@types/index.d.ts
+++ b/src/@types/index.d.ts
@@ -200,6 +200,7 @@ export type CourseUnitEnrollmentOption = {
   course: Major,
   enrolling: boolean,
   class_user_goes_to: ClassInfo,
+  id: number,
 }
 
 export enum AdminRequestType {
diff --git a/src/components/admin/requests/cards/StudentEnrollmentCard.tsx b/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
index 96b9d07d0..663eb7e9c 100644
--- a/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
+++ b/src/components/admin/requests/cards/StudentEnrollmentCard.tsx
@@ -73,21 +73,22 @@ export const StudentEnrollmentCard = ({
                         <div className="flex flex-row justify-between">
                             <Person name={enrollment.user_name} nmec={enrollment.user_nmec} />
                             <div className="flex flex-row gap-x-2">
-                                {enrollment.options.map((option) => (
-                                    <div
-                                        key={crypto.randomUUID()}
-                                    >
-                                        <div
-                                            className="flex flex-row gap-x-2 items-center border-gray-200 border-2 rounded-md p-2 px-4"
-                                        >
-                                            <h2 className="font-bold">{option.course_unit.acronym}</h2>
-                                            {option.enrolling
-                                                ? <Check className="text-green-400" />
-                                                : <X className="text-red-400" />
-                                            }
+                                {[...enrollment.options]
+                                    .sort((a, b) => a.course_unit.id - b.course_unit.id)
+                                    .map((option) => (
+                                        <div key={option.id}>
+                                            <div className="flex flex-row gap-x-2 items-center border-gray-200 border-2 rounded-md p-2 px-4">
+                                                <h2 className="font-bold">
+                                                    {option.course_unit.acronym}
+                                                </h2>
+                                                {option.enrolling ? (
+                                                    <Check className="text-green-400" />
+                                                ) : (
+                                                    <X className="text-red-400" />
+                                                )}
+                                            </div>
                                         </div>
-                                    </div>
-                                ))}
+                                    ))}
                             </div>
                             <div>
                                 <AdminPreviewSchedule