Merge branch 'shiksha-2.0' of https://github.com/tekdi/shiksha-frontend…

… into cachingLatest
tekdi · Jun 27, 2024 · 8eb36f5 · 8eb36f5
2 parents 398a495 + a5e7cfd
commit 8eb36f5
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 5 deletions.
diff --git a/src/components/DateRangePopup.tsx b/src/components/DateRangePopup.tsx
@@ -11,7 +11,7 @@ import {
   Typography,
   useStepContext,
 } from '@mui/material';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { getDayAndMonthName, getTodayDate } from '@/utils/Helper';
 
 import CloseIcon from '@mui/icons-material/Close';
@@ -78,6 +78,8 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
 }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isCalendarModalOpen, setIsCalenderModalOpen] = useState(false);
+  const [selectedRangeArray, setSelectedRangeArray] = useState(null);
+
   const [dateRangeArray, setDateRangeArray] = useState<any[]>([]);
   const [selectedIndex, setSelectedIndex] = useState<number | null>(0);
   const [displayCalendarFromDate, setDisplayCalendarFromDate] = React.useState(
@@ -113,6 +115,7 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
     setCancelClicked(true);
     setDisplayCalendarFromDate(getDayAndMonthName(getTodayDate()));
     setDisplayCalendarToDate(getDayAndMonthName(getTodayDate()));
+    localStorage.removeItem('selectedRangeArray');
   };
 
   const onApply = () => {
@@ -135,6 +138,20 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
     }
   };
 
+  useEffect(() => {
+    if (typeof window !== 'undefined' && window.localStorage) {
+      const storedDates = localStorage.getItem('selectedRangeArray');
+      if (storedDates) {
+        try {
+          const dateArray = JSON.parse(storedDates);
+          setSelectedRangeArray(dateArray);
+        } catch (error) {
+          console.error('Failed to parse stored dates:', error);
+        }
+      } 
+    }
+  }, []);
+
   const getDateRange = (index: number | null) => {
     const today = new Date();
     const formatDate = (date: Date) => {
@@ -378,6 +395,7 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
               onChange={handleActiveStartDateChange}
               onDateChange={handleCalendarDateChange}
               selectionType="range"
+              selectedRangeRetention={selectedRangeArray}
             />
           </Box>
           <Box

diff --git a/src/components/MonthCalender.tsx b/src/components/MonthCalender.tsx
@@ -18,6 +18,7 @@ interface CalendarWithAttendanceProps {
   onChange: (date: Date) => void;
   onDateChange: (date: Date | Date[] | null) => void;
   selectionType?: 'single' | 'range';
+selectedRangeRetention?:Date | null | undefined | [Date | null, Date | null];
 }
 
 type AttendanceData = {
@@ -39,6 +40,7 @@ const MonthCalender: React.FC<CalendarWithAttendanceProps> = ({
   onChange,
   onDateChange,
   selectionType,
+  selectedRangeRetention
 }) => {
   const [date, setDate] = useState<
     Date | null | undefined | [Date | null, Date | null]
@@ -200,6 +202,21 @@ const MonthCalender: React.FC<CalendarWithAttendanceProps> = ({
     }
   }
 
+  useEffect(() => {
+    if (typeof window !== 'undefined' && window.localStorage) {
+      const retentionDate = localStorage.getItem('selectedRangeArray');
+      if (retentionDate) {
+        try {
+          let retention = JSON.parse(retentionDate);
+          if (retention) {
+            handleDateChange(retention);
+          }
+        } catch (error) {
+          console.error('Failed to parse date range:', error);
+        }
+      }
+    }
+  }, []);
   function tileClassName({ date, view }: { date: Date; view: string }) {
     if (view !== 'month') return null;
     const classes = [
@@ -257,6 +274,11 @@ const MonthCalender: React.FC<CalendarWithAttendanceProps> = ({
     };
     setDate(newDate);
     if (newDate !== undefined) {
+      localStorage.setItem('selectedRangeArray', JSON.stringify(newDate));
+    } else {
+      console.error('newDate is undefined');
+    }
+        if (newDate !== undefined) {
       let datesToSet: [Date | null, Date | null];
       if (Array.isArray(newDate)) {
         datesToSet = [newDate[0] || null, newDate[1] || null];

diff --git a/src/pages/centers/[cohortId].tsx b/src/pages/centers/[cohortId].tsx
@@ -127,6 +127,7 @@ const TeachingCenterDetails = () => {
                   borderRadius: '100px',
                   height: '40px',
                   width: '126px',
+                  color: theme.palette.error.contrastText,
                 }}
                 className="text-1E"
                 endIcon={<AddIcon />}
@@ -150,7 +151,11 @@ const TeachingCenterDetails = () => {
               />
             </Box>
             <Box>
-              <CohortLearnerList cohortId={cohortId} reloadState={reloadState} setReloadState={setReloadState}/>
+              <CohortLearnerList
+                cohortId={cohortId}
+                reloadState={reloadState}
+                setReloadState={setReloadState}
+              />
             </Box>
           </>
         )}

diff --git a/src/pages/centers/index.tsx b/src/pages/centers/index.tsx
@@ -72,6 +72,7 @@ const TeachingCenters = () => {
               borderRadius: '100px',
               height: '40px',
               width: '91px',
+               color: theme.palette.error.contrastText,
             }}
             className="text-1E"
             endIcon={<AddIcon />}
@@ -97,7 +98,15 @@ const TeachingCenters = () => {
                   }}
                   sx={{ cursor: 'pointer', marginBottom: '20px' }}
                 >
-                  <Box>{cohort?.['customFields']?.address?.value}</Box>
+                  <Box
+                    sx={{
+                      fontSize: '12px',
+                      fontWeight: '500',
+                      color: theme.palette.warning['300'],
+                    }}
+                  >
+                    {cohort?.['customFields']?.address?.value}
+                  </Box>
                   <Box
                     sx={{
                       display: 'flex',
@@ -131,7 +140,15 @@ const TeachingCenters = () => {
                         padding: '0 10px',
                       }}
                     >
-                      <Box>{cohort?.name}</Box>
+                      <Box
+                        sx={{
+                          fontSize: '16px',
+                          fontWeight: '400',
+                          color: theme.palette.warning['300'],
+                        }}
+                      >
+                        {cohort?.name}
+                      </Box>
                       <ChevronRightIcon />
                     </Box>
                   </Box>

diff --git a/src/styles/customTheme.tsx b/src/styles/customTheme.tsx
@@ -43,6 +43,7 @@ const customTheme = extendTheme({
         error: {
           main: '#BA1A1A',
           light: '#FFDAD6',
+          contrastText: ' #1E1B16',
         },
         action: {
           activeChannel: '#987100',
@@ -91,6 +92,7 @@ const customTheme = extendTheme({
         error: {
           main: '#BA1A1A',
           light: '#FFDAD6',
+          contrastText: ' #1E1B16',
         },
         action: {
           activeChannel: '#987100',
@@ -158,7 +160,7 @@ const customTheme = extendTheme({
       styleOverrides: {
         root: {
           '&.Mui-focused': {
-            color:  '#1F1B13',
+            color: '#1F1B13',
           },
         },
       },