Merge pull request #435 from SELab-2/feature/calendar_schedule

Feature/calendar schedule

backend/student_on_tour/views.py

@@ -43,8 +43,8 @@ class StudentOnTourBulk(APIView):
 
     @extend_schema(
         description="POST body consists of a data component that is a list of Student-Tour instances. "
-                    "This enables the frontend to save a schedule in 1 request instead of multiple. "
-                    "If a save fails, all the previous saves will be undone as well.",
+        "This enables the frontend to save a schedule in 1 request instead of multiple. "
+        "If a save fails, all the previous saves will be undone as well.",
         request=StudOnTourSerializer,
         responses={200: SuccessSerializer, 400: None},
         examples=[
@@ -93,9 +93,9 @@ def post(self, request):
 
     @extend_schema(
         description="DELETE body consists of an ids component that is a list of Student-Tour instances. "
-                    "This enables the frontend to remove assignments in a schedule in 1 request instead of multiple."
-                    "If a remove fails, the previous removes will **NOT** be undone."
-                    """
+        "This enables the frontend to remove assignments in a schedule in 1 request instead of multiple."
+        "If a remove fails, the previous removes will **NOT** be undone."
+        """
                                 <h3> special</h3>
                                 <br/>**Request body for bulk remove:**<br/>
                                 <i>
@@ -139,8 +139,8 @@ def delete(self, request):
 
     @extend_schema(
         description="PATCH body is a map of ids on Student-Tour instances (with new data). "
-                    "This enables the frontend to edit a schedule in 1 request instead of multiple. "
-                    "If a save fails, the previous saves will **NOT** be undone.",
+        "This enables the frontend to edit a schedule in 1 request instead of multiple. "
+        "If a save fails, the previous saves will **NOT** be undone.",
         request=StudOnTourSerializer,
         responses={200: SuccessSerializer, 400: None},
         examples=[

frontend/.env.local

@@ -59,6 +59,7 @@ NEXT_PUBLIC_API_ALL_ROLES=role/all/
 NEXT_PUBLIC_API_STUDENT_ON_TOUR=student-on-tour/
 NEXT_PUBLIC_API_ALL_STUDENT_ON_TOURS=student-on-tour/all/
 NEXT_PUBLIC_API_TOURS_OF_STUDENT=student-on-tour/student/
+NEXT_PUBLIC_API_BULK_STUDENT_ON_TOUR=student-on-tour/bulk/
 
 NEXT_PUBLIC_API_REMARK_AT_BUILDING=remark-at-building/
 NEXT_PUBLIC_API_ALL_REMARKS=remark-at-building/all/

frontend/components/autocompleteComponents/autocompleteComponent.tsx

@@ -32,6 +32,12 @@ export interface GenericProps {
     required: boolean;
 }
 
+export interface TourUserProps {
+    initialId: any;
+    setObjectId: (value: any) => void;
+    tourId?: number | null;
+}
+
 const AutocompleteComponent: React.FC<Props> = ({ initialId, label, fetchOptions, mapping, setObjectId }) => {
     const [value, setValue] = React.useState<any>();
     const [inputValue, setInputValue] = useState("");

frontend/components/autocompleteComponents/studentAutocomplete.tsx

@@ -0,0 +1,17 @@
+import React from "react";
+import { getStudents, User, userSearchString } from "@/lib/user";
+import AutocompleteComponent, { GenericProps } from "@/components/autocompleteComponents/autocompleteComponent";
+
+const StudentAutocomplete: React.FC<GenericProps> = ({ initialId, setObjectId, required }) => {
+    return (
+        <AutocompleteComponent
+            initialId={initialId}
+            label={`Selecteer student${required ? "*" : ""}`}
+            fetchOptions={getStudents}
+            mapping={(user: User) => userSearchString(user)}
+            setObjectId={setObjectId}
+        />
+    );
+};
+
+export default StudentAutocomplete;

frontend/components/autocompleteComponents/tourUsersAutocomplete.tsx

@@ -0,0 +1,17 @@
+import React from "react";
+import { getTourUsersFromRegion, User, userSearchString } from "@/lib/user";
+import AutocompleteComponent, { TourUserProps } from "@/components/autocompleteComponents/autocompleteComponent";
+
+const TourUserAutocomplete: React.FC<TourUserProps> = ({ initialId, setObjectId, tourId = null }) => {
+    return (
+        <AutocompleteComponent
+            initialId={initialId}
+            label={""}
+            fetchOptions={() => getTourUsersFromRegion(tourId)}
+            mapping={(user: User) => userSearchString(user)}
+            setObjectId={setObjectId}
+        />
+    );
+};
+
+export default TourUserAutocomplete;