⚙️ Fix: erro de service_id e formato de tempo inválido no card de inf…

…os (#107)
RJ-SMTR · Apr 10, 2024 · 0c4d315 · 0c4d315
1 parent 30897fc
commit 0c4d315
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 23 deletions.
diff --git a/src/components/InfoCard/InfoCard.jsx b/src/components/InfoCard/InfoCard.jsx
@@ -27,7 +27,7 @@ import { format, parse, addDays } from "date-fns"
 
 
 export function InfoCard() {
-    const { setGpsUrl, name, infoLinha, linha } = useContext(CodeContext)
+    const { setGpsUrl, name, infoLinha, linha, setCancelSearch } = useContext(CodeContext)
     const {serviceId} = useContext(ServiceIdContext)
     const { routes, isParent, getMultiplePages, plataforms, setRoutes, activateLoader } = useContext(RoutesContext)
     const { setTracked, arrivals, setArrivals, setRoutesAndFrequencies, routesAndFrequencies } = useContext(MovingMarkerContext)
@@ -70,18 +70,21 @@ export function InfoCard() {
         );
                 }
     }, [plataforms])
+
     function convertTime(timeString) {
-        const [hoursStr, minutesStr] = timeString?.split(':');
-        const hours = parseInt(hoursStr, 10);
-        const minutes = parseInt(minutesStr, 10);
+        if(timeString !== null){
+            const [hoursStr, minutesStr] = timeString?.split(':');
+            const hours = parseInt(hoursStr, 10);
+            const minutes = parseInt(minutesStr, 10);
 
-        if (hours >= 24) {
-            const baseDate = new Date('1970-01-01');
-            const newDate = addDays(baseDate, Math.floor(hours / 24));
-            return parse(`${format(newDate, 'yyyy-MM-dd')} ${hours % 24}:${minutes}:00`, 'yyyy-MM-dd HH:mm:ss', new Date());
-        } else {
-            return parse(`1970-01-01 ${hours}:${minutes}:00`, 'yyyy-MM-dd HH:mm:ss', new Date());
-        }
+            if (hours >= 24) {
+                const baseDate = new Date('1970-01-01');
+                const newDate = addDays(baseDate, Math.floor(hours / 24));
+                return parse(`${format(newDate, 'yyyy-MM-dd')} ${hours % 24}:${minutes}:00`, 'yyyy-MM-dd HH:mm:ss', new Date());
+            } else {
+                return parse(`1970-01-01 ${hours}:${minutes}:00`, 'yyyy-MM-dd HH:mm:ss', new Date());
+            }
+        } 
     }
 
     return (
@@ -97,7 +100,7 @@ export function InfoCard() {
                         </svg>
                     </button>
                     {!routes ? <></> : <div className='flex justify-end'>
-                        <button onClick={() => (setRoutes(), setRoutesAndFrequencies(), setTracked(), infoLinha(), setArrivals(), stopFetching(), setGpsUrl(), resetMultiModalTheme())}>
+                        <button onClick={() => (setRoutes(), setRoutesAndFrequencies(), setTracked(), infoLinha(), setArrivals(), stopFetching(), setGpsUrl(), resetMultiModalTheme(), setCancelSearch(true))}>
                             <GrClose />
                         </button>
                     </div>}
@@ -173,11 +176,12 @@ export function InfoCard() {
                                             </div>
                                             <div className="flex flex-col  ml-2.5">
                                                 <p className="text-sm">{e.trip_id?.trip_headsign ?? 'Circular'}</p>
-                                                {e.trip_id.route_id.route_type === 702 ?
-                                                <p className="text-xs">
-                                                   Funcionamento: {format(convertTime(e.start_time), 'HH:mm')} - {format(convertTime(e.end_time), 'HH:mm')}
-                                                </p>
-                                                    : null}
+                                                {e.trip_id.route_id.route_type === 702 && e.start_time && e.end_time ? (
+                                                    <p className="text-xs">
+                                                        Funcionamento: {format(convertTime(e.start_time), 'HH:mm')} - {format(convertTime(e.end_time), 'HH:mm')}
+                                                    </p>
+                                                ) : null}
+
                                           </div>
                                         </div>
 

diff --git a/src/hooks/getCode.jsx b/src/hooks/getCode.jsx
@@ -27,6 +27,8 @@ export function CodeProvider({ children }) {
     // COORDENADAS PRA USAR NO SHAPE
     const [stopCoords, setStopCoords] = useState()
     const [linha, setLinha] = useState(false)
+    // BACK
+    const [cancelSearch, setCancelSearch] = useState(false)
 
 
 
@@ -63,7 +65,7 @@ export function CodeProvider({ children }) {
     }
 
     return (
-        <CodeContext.Provider value={{ code, setCode, setSearchParams, active, setActive, stopId, locationType, setStopId, gpsUrl, setGpsUrl, name, center, stopCoords, infoLinha, linha, setLinha }}>
+        <CodeContext.Provider value={{ code, setCode, setSearchParams, active, setActive, stopId, locationType, setStopId, gpsUrl, setGpsUrl, name, center, stopCoords, infoLinha, linha, setLinha, cancelSearch, setCancelSearch }}>
             {children}
         </CodeContext.Provider>
     )

diff --git a/src/hooks/getRoutes.jsx b/src/hooks/getRoutes.jsx
@@ -10,7 +10,7 @@ export const RoutesContext = createContext()
 
 
 export function RoutesProvider({ children }) {
-    const { code, stopId, locationType } = useContext(CodeContext)
+    const { code, stopId, locationType, setCancelSearch, cancelSearch } = useContext(CodeContext)
     const { serviceId } = useContext(ServiceIdContext)
     const { routeType } = useContext(ThemeContext)
     const [routes, setRoutes] = useState()
@@ -49,6 +49,13 @@ export function RoutesProvider({ children }) {
         setLoader(true)
         setPlataforms([])
     }
+    useEffect(() => {
+        if (cancelSearch) {
+            getStations(`/stop_times/?stop_id=${stopId}&service_id=${serviceId}`);
+        }
+    }, [cancelSearch])
+
+
     const rawTrips = [];
     const tripPromises = [];
 
@@ -79,7 +86,6 @@ export function RoutesProvider({ children }) {
                         rawTrips[index].lastStop = specificData[specificData.length - 1];
                     }
                 });
-                getStations(`/stop_times/?stop_id=${stopId}&service_id=${serviceId}`);
             } else {
                 const stopTimeResponses = await Promise.all(tripPromises);
                 stopTimeResponses.forEach((response, index) => {
@@ -94,6 +100,7 @@ export function RoutesProvider({ children }) {
            }) 
             filteredTrips.sort(compareTripName);
             setRoutes([...filteredTrips]);
+            setCancelSearch(false)
         }
     }
 
@@ -124,7 +131,6 @@ export function RoutesProvider({ children }) {
         for (let index = 0; index < stopIdsResponses.length; index++) {
             const response = stopIdsResponses[index];
             const stopTimes = response.data.results;
-
             const tripPromises = stopTimes.map((stopTime) =>
                 api.get(`/stop_times/?trip_id=${stopTime.trip_id.trip_id}`)
             );

diff --git a/src/hooks/getServiceId.jsx b/src/hooks/getServiceId.jsx
@@ -62,7 +62,7 @@ export function ServiceIdProvider({ children }) {
         fetchCalendars()
     }, [])
 
-  
+
     let exceptionService = []
     let baseService = []
     function findService(todayDate) {
@@ -96,7 +96,7 @@ export function ServiceIdProvider({ children }) {
             baseService.push(todayService)
 
             if (todayService && exceptionService) {
-                const baseService = todayService[0]?.service_id || 'U_REG'
+                const baseService = todayService.map(item => item.service_id)
                 const allServices = exceptionService.concat(baseService)
                 setServiceId(allServices);