fix: signature component

PSE-Timetable · Jul 17, 2024 · 6452311 · 6452311
1 parent 7d2a23e
commit 6452311
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/web/src/lib/components/ui/constraintSignature/constraint-signature.svelte b/web/src/lib/components/ui/constraintSignature/constraint-signature.svelte
@@ -36,47 +36,47 @@
       switch (parameterType) {
         case ParameterType.Grade: {
           const { content } = value ? await getGrades(page, { name: value }) : { content: grades };
-          data[name] = content?.map((grade) => ({ value: grade.name ?? '', label: grade.name ?? '' })) || [];
+          data[name] = content?.map((grade) => ({ value: grade.id, label: grade.name ?? '' })) || [];
           break;
         }
         case ParameterType.Subject: {
           const { content } = value ? await getSubjects(page, { name: value }) : { content: subjects };
-          data[name] = content?.map((subject) => ({ value: subject.name, label: subject.name })) || [];
+          data[name] = content?.map((subject) => ({ value: subject.id, label: subject.name })) || [];
           break;
         }
         case ParameterType.Room: {
           const { content } = await getRooms(page, { name: value });
           data[name] =
             content?.map((room) => ({
-              value: `${room.buildingName}: ${room.name}`,
+              value: room.id,
               label: `${room.buildingName}: ${room.name}`,
             })) || [];
           break;
         }
         case ParameterType.StudentGroup: {
           const { content } = await getStudentGroups(page, { name: value });
-          data[name] = content?.map((studentGroup) => ({ value: studentGroup.name, label: studentGroup.name })) || [];
+          data[name] = content?.map((studentGroup) => ({ value: studentGroup.id, label: studentGroup.name })) || [];
           break;
         }
         case ParameterType.Student: {
           const { content } = await getStudents(page, { firstName: value });
           data[name] =
             content?.map((student) => ({
-              value: `${student.firstName} ${student.lastName}`,
+              value: student.id,
               label: `${student.firstName} ${student.lastName}`,
             })) || [];
           break;
         }
         case ParameterType.Tag: {
           const { content } = await getTags(page, { name: value });
-          data[name] = content?.map((tag) => ({ value: tag.name, label: tag.name })) || [];
+          data[name] = content?.map((tag) => ({ value: tag.id, label: tag.name })) || [];
           break;
         }
         case ParameterType.Teacher: {
           const { content } = value ? await getTeachers(page, { firstName: value }) : { content: teachers };
           data[name] =
             content?.map((teacher) => ({
-              value: `${teacher.firstName} ${teacher.lastName}`,
+              value: teacher.id,
               label: `${teacher.firstName} ${teacher.lastName}`,
             })) || [];
           break;
@@ -85,7 +85,7 @@
           const { content } = await getTimeslots(page);
           data[name] =
             content?.map((timeslot) => ({
-              value: `${timeslot.day}: ${timeslot.slot}`,
+              value: timeslot.id,
               label: `${timeslot.day}: ${timeslot.slot}`,
             })) || [];
           break;
@@ -110,8 +110,8 @@
 <div class="flex flex-col gap-8 bg-primary w-fit p-6 rounded-md text-white">
   <p class="font-bold text-md">{constraintSignature.description}</p>
 
-  {#await initData()}
-    {#each constraintSignature.parameters as parameter}
+  {#await initData() then}
+    {#each constraintSignature.parameters as parameter (parameter.id)}
       <div class="flex flex-row items-center justify-around w-full gap-8">
         <p>{parameter.parameterName}</p>
         {console.log(parameter.parameterName)}

diff --git a/web/src/lib/elements/ui/combo-box/combo-box.svelte b/web/src/lib/elements/ui/combo-box/combo-box.svelte
@@ -19,7 +19,7 @@
   let selectedValue = '';
   let lastSearchedValued: string;
 
-  export let onSearch = (string: string) => {};
+  export let onSearch: (string: string) => void;
 
   $: {
     selectedValue = 'Select a framework...';
@@ -36,9 +36,9 @@
   // We want to refocus the trigger button when the user selects
   // an item from the list so users can continue navigating the
   // rest of the form with the keyboard.
-  function closeAndFocusTrigger(triggerId: string) {
+  async function closeAndFocusTrigger(triggerId: string) {
     open = false;
-    tick().then(() => {
+    await tick().then(() => {
       document.getElementById(triggerId)?.focus();
     });
   }
@@ -59,19 +59,19 @@
   </Popover.Trigger>
   <Popover.Content class="w-[200px] p-0">
     <Command.Root>
-      <Command.Input bind:value={searchedValue} placeholder="Search framework..." />
+      <Command.Input bind:value={searchedValue} placeholder="Suche Resource" />
       <Command.Empty>No framework found.</Command.Empty>
       <Command.Group>
-        {#each data as framework}
+        {#each data as resource}
           <Command.Item
-            value={framework.value}
-            onSelect={(currentValue) => {
+            value={resource.value}
+            onSelect={async (currentValue) => {
               value = currentValue;
-              closeAndFocusTrigger(ids.trigger);
+              await closeAndFocusTrigger(ids.trigger);
             }}
           >
-            <Check class={cn('mr-2 h-4 w-4', value !== framework.value && 'text-transparent')} />
-            {framework.label}
+            <Check class={cn('mr-2 h-4 w-4', value !== resource.value && 'text-transparent')} />
+            {resource.label}
           </Command.Item>
         {/each}
       </Command.Group>