Merge pull request #21 from PCS-Poli-USP/develop

Develop
PCS-Poli-USP · Apr 16, 2024 · fa63b59 · fa63b59
2 parents 9749826 + 6eadbb0
commit fa63b59
Show file tree

Hide file tree

Showing 35 changed files with 2,024 additions and 185 deletions.
diff --git a/src/components/allocation/automaticAllocation.accordion.tsx b/src/components/allocation/automaticAllocation.accordion.tsx
@@ -19,7 +19,7 @@ import Event from 'models/event.model';
 import { useEffect, useState } from 'react';
 import { weekDaysFormatter } from 'utils/classes/classes.formatter';
 import ClassroomsService from 'services/classrooms.service';
-import { sortClassrooms, sortEventsByClassroomAndTime } from 'utils/sorter';
+import { sortClassrooms, sortEventsBySubjectAndClass } from 'utils/sorter';
 
 interface AutomaticAllocationAccordionProps {
   onEdit: (event: Event) => void;
@@ -50,8 +50,8 @@ export default function AutomaticAllocationAccordion({
     });
   }
 
-  allocatedEvents.sort(sortEventsByClassroomAndTime);
-  unallocatedEvents.sort(sortEventsByClassroomAndTime);
+  allocatedEvents.sort(sortEventsBySubjectAndClass);
+  unallocatedEvents.sort(sortEventsBySubjectAndClass);
 
   return (
     <Accordion

diff --git a/src/components/allocation/classromView/eventsByClassrooms.plugin.tsx b/src/components/allocation/classromView/eventsByClassrooms.plugin.tsx
@@ -109,6 +109,7 @@ function ClassroomsTables(props: any) {
         toastSuccess(
           `Alocação de ${subjectCode} - ${classCode}  removida com sucesso!`,
         );
+        window.location.reload();
       })
       .catch((error) => {
         toastError(

diff --git a/src/components/allocation/editEvent.modal.tsx b/src/components/allocation/editEvent.modal.tsx
@@ -12,13 +12,14 @@ import {
   ModalFooter,
   ModalHeader,
   ModalOverlay,
-  Select,
   Spinner,
   Stack,
   Text,
   useCheckboxGroup,
   useDisclosure,
 } from '@chakra-ui/react';
+import { Select as CSelect } from '@chakra-ui/react';
+import Select from 'react-select';
 import Dialog from 'components/common/dialog.component';
 import { appContext } from 'context/AppContext';
 import { Building } from 'models/building.model';
@@ -29,6 +30,11 @@ import BuildingsService from 'services/buildings.service';
 import ClassroomsService from 'services/classrooms.service';
 import { Capitalize } from 'utils/formatters';
 
+interface ClassroomOption {
+  value: string;
+  label: string;
+}
+
 interface EditEventModalProps {
   isOpen: boolean;
   onClose: () => void;
@@ -53,7 +59,7 @@ export default function EditEventModal({
     onOpen: onOpenDialog,
     onClose: onCloseDialog,
   } = useDisclosure();
-  const { dbUser } = useContext(appContext);
+  const { loggedUser } = useContext(appContext);
   const [availableClassrooms, setAvailableClassrooms] = useState<
     AvailableClassroom[]
   >([]);
@@ -82,7 +88,7 @@ export default function EditEventModal({
   useEffect(() => {
     getBuildingsList();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dbUser]);
+  }, [loggedUser]);
 
   useEffect(() => {
     getAvailableClassrooms();
@@ -92,10 +98,12 @@ export default function EditEventModal({
   useEffect(() => {
     resetClassroomsDropdown();
     getAvailableClassrooms();
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [checkedEvents]);
 
   useEffect(() => {
     setCheckedEvents(classEvents.map((it) => it.id ?? ''));
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [classEvents]);
 
   async function getAvailableClassrooms() {
@@ -124,21 +132,23 @@ export default function EditEventModal({
       value.sort((a, b) => {
         if (a.conflicted && !b.conflicted) return 1;
         if (!a.conflicted && b.conflicted) return -1;
+        if (a.classroom_name < b.classroom_name) return -1;
+        if (a.classroom_name > b.classroom_name) return 1;
         return 0;
       }),
     );
   }
 
   function getBuildingsList() {
-    if (dbUser) {
-      if (dbUser.isAdmin) {
+    if (loggedUser) {
+      if (loggedUser.isAdmin) {
         setBuildingsLoading(true);
         buildingsService.list().then((response) => {
           setBuildingsList(response.data);
           setBuildingsLoading(false);
         });
       } else {
-        setBuildingsList(dbUser.buildings);
+        setBuildingsList(loggedUser.buildings);
       }
     }
   }
@@ -241,7 +251,7 @@ export default function EditEventModal({
             {buildingsList.length !== 1 && (
               <>
                 <FormLabel mt={4}>Prédio</FormLabel>
-                <Select
+                <CSelect
                   placeholder='Selecionar prédio'
                   onChange={(event) => {
                     setSelectedBuilding(
@@ -256,7 +266,7 @@ export default function EditEventModal({
                       {it.name}
                     </option>
                   ))}
-                </Select>
+                </CSelect>
               </>
             )}
             <FormLabel mt={4}>Salas disponíveis</FormLabel>
@@ -267,38 +277,28 @@ export default function EditEventModal({
               </Alert>
             )}
             <Select
-              icon={classroomsLoading ? <Spinner size='sm' /> : undefined}
-              disabled={
-                classroomsLoading ||
-                !selectedBuilding ||
-                availableClassrooms.length < 1
-              }
-              placeholder='Sala - Capacidade'
-              isInvalid={
-                selectedClassroom &&
-                classData?.subscribers > selectedClassroom.capacity
-              }
-              value={selectedClassroom?.classroom_name}
-              onChange={(event) => {
+              placeholder={'Sala - Capacidade'}
+              isLoading={classroomsLoading}
+              options={availableClassrooms.map((it) =>
+                it.conflicted
+                  ? {
+                      value: it.classroom_name,
+                      label: `⚠️ ${it.classroom_name} - ${it.capacity}`,
+                    }
+                  : {
+                      value: it.classroom_name,
+                      label: `${it.classroom_name} - ${it.capacity}`,
+                    },
+              )}
+              onChange={(selected) => {
+                const selectedClassroom = selected as ClassroomOption;
                 setSelectedClassroom(
                   availableClassrooms.find(
-                    (it) => event.target.value === it.classroom_name,
+                    (it) => selectedClassroom.value === it.classroom_name,
                   ),
                 );
               }}
-            >
-              {availableClassrooms.map((it) =>
-                it.conflicted ? (
-                  <option key={it.classroom_name} value={it.classroom_name}>
-                    ⚠️ {it.classroom_name} - {it.capacity}
-                  </option>
-                ) : (
-                  <option key={it.classroom_name} value={it.classroom_name}>
-                    {it.classroom_name} - {it.capacity}
-                  </option>
-                ),
-              )}
-            </Select>
+            />
           </FormControl>
 
           <Dialog

diff --git a/src/components/classes/edit.modal.tsx b/src/components/classes/edit.modal.tsx
@@ -416,7 +416,7 @@ export default function EditModal({
                     value={subjectCode}
                     errorBorderColor='crimson'
                     onChange={(event) => {
-                      setSubjectCode(event.target.value);
+                      setSubjectCode(event.target.value.toUpperCase());
                       if (event.target.value) setHasSubjectCodeError(false);
                     }}
                   />

diff --git a/src/components/classes/jupiterCrawler.popover.tsx b/src/components/classes/jupiterCrawler.popover.tsx
@@ -38,7 +38,7 @@ export default function JupiterCrawlerPopover({
   subjects = [],
   onSave,
 }: JupiterCrawlerPopoverPrpos) {
-  const { dbUser } = useContext(appContext);
+  const { loggedUser } = useContext(appContext);
 
   const buildingsService = new BuildingsService();
 
@@ -61,18 +61,16 @@ export default function JupiterCrawlerPopover({
 
   useEffect(() => {
     getBuildingsList();
-  }, [dbUser]);
+  }, [loggedUser]);
 
   function handleAddClick() {
-    if (subjectInput.length > 6 && !subjectsList.includes(subjectInput)) {
+    if (subjectInput.length === 7 && !subjectsList.includes(subjectInput)) {
       setSubjectsList((prev) => [...prev, subjectInput.replace(' ', '')]);
       setSubjectInput('');
     }
     if (multSubjectInput.length > 6) {
-      const formatedInput = multSubjectInput.replace(' ', '');
-      const subjects = formatedInput
-        .split(',')
-        .filter((value) => value.length === 7);
+      const formatedInput = multSubjectInput.replaceAll(' ', '');
+      const subjects = formatedInput.split(',').filter((value) => (value.length === 7 && !subjectsList.includes(value)));
       setSubjectsList((prev) => prev.concat(subjects));
       setMultSubjectInput('');
     }
@@ -91,15 +89,15 @@ export default function JupiterCrawlerPopover({
   }
 
   function getBuildingsList() {
-    if (dbUser) {
-      if (dbUser.isAdmin) {
+    if (loggedUser) {
+      if (loggedUser.isAdmin) {
         setBuildingsLoading(true);
         buildingsService.list().then((response) => {
           setBuildingsList(response.data);
           setBuildingsLoading(false);
         });
       } else {
-        setBuildingsList(dbUser.buildings);
+        setBuildingsList(loggedUser.buildings);
       }
     }
   }