fix: handle calendar events with no ID

BetterLectio · Sep 26, 2024 · 2cc3c27 · 2cc3c27
1 parent 625d220
commit 2cc3c27
Show file tree

Hide file tree

Showing 6 changed files with 253 additions and 251 deletions.
diff --git a/apps/api/lectio/_forside.py b/apps/api/lectio/_forside.py
@@ -108,7 +108,6 @@ def forside(self):
                             ],
                         }
                     )
-                    print(forsideDict["undervisning"][navn][-1])
     for element in soup.find(
         "div", {"id": "s_m_Content_Content_skemaIsland_pa"}
     ).find_all("div"):

diff --git a/apps/api/lectio/utils.py b/apps/api/lectio/utils.py
@@ -30,7 +30,7 @@ def generatePayload(soup, eventTarget):
 
 def skemaBrikExtract(skemabrik, modul_id=None):
     if modul_id is None:
-        if matches := re.search(r"(absid|ProeveholdId)=([0-9]+)", skemabrik["href"]):
+        if matches := re.search(r"(absid|ProeveholdId)=([0-9]+)", skemabrik.get("href") or ""):
             id_type, absid = matches.groups()
             if id_type == "ProeveholdId":
                 absid = f"PH{absid}"

diff --git a/apps/frontend/src/lib/stores.ts b/apps/frontend/src/lib/stores.ts
@@ -14,7 +14,6 @@ import type { RawHomework } from "./types/homework";
 import type { Rooms } from "./types/rooms";
 import type {
 	Information,
-	information,
 	RawInformation,
 } from "./types/information";
 

diff --git a/apps/frontend/src/lib/types/lesson.ts b/apps/frontend/src/lib/types/lesson.ts
@@ -1,5 +1,5 @@
 export type RawLesson = {
-  absid: string;
+  absid: null | string;
   andet: null | string;
   hold: null | string;
   hold_id: null | string;
@@ -11,12 +11,12 @@ export type RawLesson = {
 };
 
 export type Lesson = {
-  id: string;
+  id: string | null;
   date: string;
   class: string | null;
   name: string | null;
   note: string | null;
   room: string | null;
   status: string | null;
   teacher: string | null;
-}
+};
diff --git a/apps/frontend/src/routes/home/+page.svelte b/apps/frontend/src/routes/home/+page.svelte
@@ -80,7 +80,7 @@
     <div class="flex flex-col gap-4">
       <a
         class="unstyled"
-        href={nextClass ? (nextClass.id.startsWith('PH') ? `/eksamen?id=${nextClass.id.substring(2)}&navn=${$frontPageStore?.name}` : `/modul?absid=${nextClass.id}`) : ''}
+        href={nextClass ? (nextClass.id?.startsWith('PH') ? `/eksamen?id=${nextClass.id.substring(2)}&navn=${$frontPageStore?.name}` : `/modul?absid=${nextClass.id}`) : ''}
       >
         <Card class={cn("p-2 overflow-auto border-2", {"shrink-0": !nextClass})}>
           <div class="flex items-center justify-between">
@@ -163,9 +163,9 @@
               {#each classes as day}
                 <h3 class="text-sm font-medium leading-7 unstyled">{day.name}</h3>
                 {#each day.lessons as lesson}
-                  {@const url = lesson.id.startsWith("PH") ? `/eksamen?id=${lesson.id.substring(2)}&navn=${$frontPageStore?.name}` : `/modul?absid=${lesson.id}`}
+                  {@const url = lesson.id ? lesson.id.startsWith("PH") ? `/eksamen?id=${lesson.id.substring(2)}&navn=${$frontPageStore?.name}` : `/modul?absid=${lesson.id}` : null}
                   <Card level="2" class="flex items-center p-3" error={lesson.status === 'aflyst'}
-                        on:click={() => !$isSmallScreen && goto(url)}>
+                        on:click={() => !$isSmallScreen && url && goto(url)}>
                     <div
                       class="flex items-stretch sm:items-center max-sm:flex-col-reverse max-sm:content-start flex-1 h-full min-w-0">
                       <div class="max-sm:hidden flex justify-center shrink-0 w-11">
@@ -204,12 +204,14 @@
                         {/if}
                       </div>
                     </div>
-                    <Button
-                      href={url}
-                      variant="ghost" size="sm" class="max-sm:hidden">
-                      Vis
-                      <ArrowRight class="ml-1 size-4" />
-                    </Button>
+                    {#if url}
+                      <Button
+                        href={url}
+                        variant="ghost" size="sm" class="max-sm:hidden">
+                        Vis
+                        <ArrowRight class="ml-1 size-4" />
+                      </Button>
+                    {/if}
                   </Card>
                 {/each}
               {/each}