@@ -166,7 +160,7 @@ export function CreateNewPlanPage({ planId }: { planId: string }) {
key={f.value}
value={f.value}
>
- {f.name}
+ {registrationReplacer(f.name)}
))}
@@ -174,33 +168,81 @@ export function CreateNewPlanPage({ planId }: { planId: string }) {
{registrations.isLoading ? (
- ) : allRegistrations.length > 0 ? (
+ ) : registrations.data && registrations.data.length > 0 ? (
({
+ registrations={registrations.data.map((r) => ({
value: r.id,
- label: r.name,
+ label: registrationReplacer(r.name),
}))}
selectedRegistrations={plan.registrations.map((r) => r.id)}
onSelect={(registrationId) => {
- const registration = allRegistrations.find(
+ const selectedRegistration = registrations.data.find(
(r) => r.id === registrationId,
);
- if (registration === undefined) {
+ if (selectedRegistration === undefined) {
return;
}
- if (plan.registrations.some((r) => r.id === registration.id)) {
- plan.removeRegistration(registration.id);
+ if (
+ plan.registrations.some(
+ (r) => r.id === selectedRegistration.id,
+ )
+ ) {
+ plan.removeRegistration(selectedRegistration.id);
} else {
- plan.addRegistration(registration, registration.courses);
+ coursesFn.mutate(selectedRegistration.id, {
+ onSuccess: (data) => {
+ const extendedCourses: ExtendedCourse[] = data
+ .map((c) => ({
+ id: c.id,
+ name: c.name,
+ isChecked: false,
+ registrationId: c.registrationId,
+ type: c.groups.at(0)?.type ?? ("" as LessonType),
+ groups: c.groups.map(
+ (g) =>
+ ({
+ groupId: g.group + c.id + g.type,
+ groupNumber: g.group.toString(),
+ courseId: c.id,
+ courseName: c.name,
+ isChecked: false,
+ courseType: g.type,
+ day: g.day,
+ lecturer: g.lecturer,
+ registrationId: c.registrationId,
+ week: g.week.replace("-", "") as
+ | ""
+ | "TN"
+ | "TP",
+ endTime: g.endTime
+ .split(":")
+ .slice(0, 2)
+ .join(":"),
+ startTime: g.startTime
+ .split(":")
+ .slice(0, 2)
+ .join(":"),
+ }) satisfies ExtendedGroup,
+ ),
+ }))
+ .sort((a, b) => {
+ return a.name.localeCompare(b.name);
+ });
+ plan.addRegistration(
+ selectedRegistration,
+ extendedCourses,
+ );
+ },
+ });
}
}}
/>
- ) : allRegistrations.length === 0 ? (
+ ) : registrations.data && registrations.data.length === 0 ? (
@@ -211,7 +253,7 @@ export function CreateNewPlanPage({ planId }: { planId: string }) {
{plan.registrations.map((registration) => (
{
plan.selectCourse(courseId);
}}
@@ -229,9 +271,8 @@ export function CreateNewPlanPage({ planId }: { planId: string }) {