ts: Fix import

src/components/DefaultLayout.tsx

@@ -238,11 +238,43 @@ function UserField() {
     );
 }
 
+function Search() {
+    const router = useRouter();
+    const [query, setQuery] = useState("");
+    const onSearchSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        let form = e.currentTarget;
+        let query = form.query.value;
+        if (query === "") return;
+        router.push("/search?q=" + encodeURIComponent(query));
+    };
+    const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        setQuery(e.target.value);
+    };
+
+    return (
+        <form role="search" className="d-flex" onSubmit={onSearchSubmit}>
+            <div className="input-group">
+                <input
+                    className="form-control"
+                    type="text"
+                    name="query"
+                    placeholder="Suche"
+                    value={query}
+                    onChange={onChange}
+                />
+                <button className="btn btn-primary" type="submit">
+                    <span className="bi bi-search"></span>
+                </button>
+            </div>
+        </form>
+    );
+}
+
 function NavBar() {
     const DEBUG = false;
 
     const togglerRef = useRef(null);
-    const router = useRouter();
 
     useEffect(() => {
         // lazy load bootstrap collapse
@@ -294,14 +326,6 @@ function NavBar() {
         }
     };
 
-    const onSearchSubmit = (e: React.FormEvent<HTMLFormElement>) => {
-        e.preventDefault();
-        let form = e.currentTarget;
-        let query = form.query.value;
-        if (query === "") return;
-        router.push("/search?q=" + encodeURIComponent(query));
-    };
-
     return (
         <nav
             className="hidden-print navbar navbar-expand-md bg-body-tertiary mb-3"
@@ -414,20 +438,7 @@ function NavBar() {
                     </ul>
                     <div className="flex-grow-1"></div>
                     <UserField />
-                    <form role="search" className="d-flex" onSubmit={onSearchSubmit}>
-                        <div className="input-group">
-                            <input
-                                className="form-control"
-                                type="text"
-                                name="query"
-                                placeholder="Suche"
-                                defaultValue=""
-                            />
-                            <button className="btn btn-primary" type="submit">
-                                <span className="bi bi-search"></span>
-                            </button>
-                        </div>
-                    </form>
+                    <Search />
                     <div className="p-1">
                         <button className={"btn"} type="button" onClick={switchTheme}>
                             <span aria-hidden="true" className={"bi bi-moon-stars"} />

src/misc/Calendar.tsx

@@ -2,7 +2,7 @@ import { DateTime } from "luxon";
 
 export interface ICalEvent {
     summary?: string;
-    startDate?: DateTime;
+    startDate: DateTime;
     endDate?: DateTime;
     duration?: number;
     location?: string;
@@ -46,7 +46,11 @@ export function parseICal(fileContent: string): ICalEvent[] {
                     .diff(currentEvent.startDate)
                     .as("minutes");
             }
+            if (currentEvent.startDate) {
                 events.push(currentEvent as ICalEvent);
+            } else {
+                console.error("Event without start date");
+            }
         } else if (inEvent) {
             // Parse individual lines within the event
             const [key, value] = line.trim().split(":");

src/pages/courses.tsx

@@ -2,6 +2,7 @@ import { useBackendContext } from "@/components/BackendProvider";
 import { useEditMode } from "@/components/EditModeProvider";
 import { FallbackErrorBoundary } from "@/components/FallbackErrorBoundary";
 import { OMCreate, OMEdit } from "@/components/OMConfigComponent";
+import { ReloadBoundary } from "@/components/ReloadBoundary";
 import { useUserContext } from "@/components/UserDataProvider";
 import { semesterToHuman } from "@/misc/Formatting";
 import { ResourceType, fetchDataWrapper } from "@/misc/PromiseHelpers";
@@ -171,11 +172,12 @@ function CourseImpl() {
     const userContext = useUserContext();
     const hasUserInfo = userContext.hasUserInfo();
     const { editMode } = useEditMode();
+    const [forceReload, setForceReload] = useState(0);
 
     const [courseData, setCourseData] = useState<ResourceType<GetCoursesResponse>>();
     useEffect(() => {
         setCourseData(fetchDataWrapper(api.getCourses()));
-    }, [api, hasUserInfo]);
+    }, [api, hasUserInfo, forceReload]);
 
     const [groupedBy, setGroupedBy] = useState<GroupByTypes>("semester");
 
@@ -196,7 +198,7 @@ function CourseImpl() {
     }
 
     return (
-        <>
+        <ReloadBoundary reloadFunc={() => setForceReload((x) => x + 1)}>
             <div>
                 <div className="col-12 p-0">
                     <ul className="list-inline d-flex">
@@ -235,7 +237,7 @@ function CourseImpl() {
             <Suspense>
                 <CourseList courseData={courseData} groupBy={groupedBy} />
             </Suspense>
-        </>
+        </ReloadBoundary>
     );
 }
 

src/pages/internal/import.tsx

@@ -21,18 +21,7 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
         return obj;
     });
 
-    // find events that are new (place, duration and time unique)
-    let new_events = imported_events
-        .filter((event) => {
-            return !existingEvents.some((existing) => {
-                return (
-                    existing.location === event.location &&
-                    existing.duration === event.duration &&
-                    existing.startDate === event.startDate
-                );
-            });
-        })
-        .filter((event, index, self) => {
+    const removeDuplicates = (event, index, self) => {
         // remove duplicates
         return (
             index ===
@@ -40,11 +29,23 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
                 (e) =>
                     e.location === event.location &&
                     e.duration === event.duration &&
-                        e.startDate === event.startDate,
+                    Math.abs(e.startDate.diff(event.startDate).as("seconds")) < 1,
             )
         );
+    };
+    // find events that are new (place, duration and time unique)
+    const new_events = imported_events
+        .filter((event) => {
+            const eventMatch = existingEvents.some((existing) => {
+                const match =
+                    existing.location === event.location &&
+                    existing.duration === event.duration &&
+                    Math.abs(existing.startDate.diff(event.startDate).as("seconds")) < 1;
+                return match;
             });
-
+            return !eventMatch;
+        })
+        .filter(removeDuplicates);
     // find existing events that are not in the imported events
     const not_imported_events = existingEvents
         .filter((event) => {
@@ -52,22 +53,23 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
                 return (
                     imported.location === event.location &&
                     imported.duration === event.duration &&
-                    imported.startDate === event.startDate
+                    Math.abs(imported.startDate.diff(event.startDate).as("seconds")) < 1
                 );
             });
         })
-        .filter((event, index, self) => {
-            // remove duplicates
+        .filter(removeDuplicates);
+    // number of full matches
+    const full_matches = imported_events
+        .filter((event) => {
+            return existingEvents.some((existing) => {
                 return (
-                index ===
-                self.findIndex(
-                    (e) =>
-                        e.location === event.location &&
-                        e.duration === event.duration &&
-                        e.startDate === event.startDate,
-                )
+                    existing.location === event.location &&
+                    existing.duration === event.duration &&
+                    Math.abs(existing.startDate.diff(event.startDate).as("seconds")) < 1
                 );
             });
+        })
+        .filter(removeDuplicates).length;
 
     const importEvent = (event: ICalEvent) => {
         // time must be YYYY-MM-ddTHH:mm:ss
@@ -107,8 +109,7 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
     };
 
     const importAllEvents = () => {
-        const promises = api
-            .getNewOMConfiguration("lecture")
+        api.getNewOMConfiguration("lecture")
             .then((res) => {
                 const defaultValues: any = {};
                 res.fields?.forEach((field) => {
@@ -175,9 +176,25 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
 
     return (
         <div>
+            <table className="table">
+                <thead>
+                    <tr>
+                        <th>Nur im Import</th>
+                        <th>Durchschnitt</th>
+                        <th>Nur bei uns</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>{imported_events.length}</td>
+                        <td>{full_matches}</td>
+                        <td>{existingEvents.length}</td>
+                    </tr>
+                </tbody>
+            </table>
             <div className="card mb-2">
                 <div className="card-header d-flex align-items-center">
-                    <span className="flex-grow-1">Termine im die nicht bei uns sind</span>
+                    <span className="flex-grow-1">Im Import, nicht bei uns</span>
 
                     <button className="btn btn-primary" onClick={importAllEvents}>
                         Alle anlegen
@@ -219,7 +236,7 @@ function TerminBody({ course, imported_events }: { course: course; imported_even
             </div>
             <div className="card">
                 <div className="card-header d-flex align-items-center">
-                    <span className="flex-grow-1">Termine bei uns nicht RWTHOnline</span>
+                    <span className="flex-grow-1">Bei uns, nicht im Import</span>
 
                     <button className="btn btn-primary" onClick={removeAllEvents}>
                         Alle entfernen
@@ -299,7 +316,8 @@ function RWTHOnlineImportImpl() {
     const onImport = () => {
         if (inputRef.current === null) return;
 
-        const url = inputRef.current.value;
+        const url =
+            "https://online.rwth-aachen.de/RWTHonline/pl/ui/%24ctx/wbTvw_List.lehrveranstaltung?pStpSpNr=485837"; /*inputRef.current.value*/
 
         // check if url contains pStpSpNr
         if (!url.includes("pStpSpNr=")) {
@@ -310,6 +328,7 @@ function RWTHOnlineImportImpl() {
         const pStpSpNr = parseInt(url.split("pStpSpNr=")[1].split("&")[0]);
         api.importRWTHOnlineCourse(pStpSpNr).then((ical) => {
             const parsed = parseICal(ical);
+            console.log(parsed);
             setImportedEvents(parsed);
         });
     };