Merge pull request #193 from upendraTekdi/late_markingfor_self_uk

Task #224820: for modification attendance previous status should be there,Remove My timetable section by config,update option from remove user reason Taken Tc make it Taken TC
tekdi · Aug 27, 2024 · df173e2 · df173e2
2 parents c6b9e47 + 47e5430
commit df173e2
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 64 deletions.
diff --git a/app.config.ts b/app.config.ts
@@ -93,4 +93,6 @@ export const markdDropOut = false;
 
 // show lables as per product
 export const showLablesForOther = true;
-export const tourGuideNavigtion = false
+export const tourGuideNavigtion = false
+
+export const showMyTimeTable = false
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -354,7 +354,7 @@
     "ERROR_EMPTY": "Center name cannot be empty",
     "ERROR_NUMBER": "Center name cannot be number",
     "LONG_ABSENTEE": "Long Absentee",
-    "TAKEN_TC": "Taken Tc",
+    "TAKEN_TC": "Taken TC",
     "ALLOCATION_CHANGE": "Allocation  Change",
     "INCORRECT_ENTRY": "Incorrect Entry",
     "DUPLICATION_ENTRY": "Duplicate Entry"

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -52,6 +52,7 @@ import {
   lowLearnerAttendanceLimit,
   showLablesForOther,
   tourGuideNavigtion,
+  showMyTimeTable,
 } from './../../app.config';
 
 import AttendanceComparison from '@/components/AttendanceComparison';
@@ -258,8 +259,9 @@ const Dashboard: React.FC<DashboardProps> = () => {
     React.useState<boolean>(false);
   const [confirmButtonDisable, setConfirmButtonDisable] =
     React.useState<boolean>(true);
-  const [selectedAttendance, setSelectedAttendance] =
-    React.useState<string>('');
+  const [selectedAttendance, setSelectedAttendance] = React.useState<
+    string | null
+  >('');
   const [isLocationModalOpen, setLocationModalOpen] = React.useState(false);
   const [attendanceLocation, setAttendanceLocation] =
     React.useState<GeolocationPosition | null>(null);
@@ -294,7 +296,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
 
   const onCloseEditMOdel = () => {
     setIsAttendanceModalOpen(false);
-    setSelectedAttendance('');
+    // setSelectedAttendance('');
     setConfirmButtonDisable(true);
   };
   const handleRadioChange = (value: string) => {
@@ -391,9 +393,10 @@ const Dashboard: React.FC<DashboardProps> = () => {
     const dateForAttendance = formatSelectedDate(currentDate);
 
     console.log('attendanceLocation?', attendanceLocation);
+    // if (selectedAttendance) {
     const data = {
       userId: userId,
-      attendance: selectedAttendance,
+      attendance: selectedAttendance ? selectedAttendance : '',
       attendanceDate: selectedDate,
       contextId: classId,
       scope: 'self',
@@ -422,11 +425,12 @@ const Dashboard: React.FC<DashboardProps> = () => {
     } finally {
       setLoading(false);
       onCloseEditMOdel();
-      setSelectedAttendance('');
+      // setSelectedAttendance('');
       fetchData(selectedDate);
       setConfirmButtonDisable(true);
-      setSelectedAttendance('');
+      // setSelectedAttendance('');
       setReasonOfAbsent('');
+      // }
     }
   };
   const fetchData = async (selectedDate: any) => {
@@ -452,7 +456,12 @@ const Dashboard: React.FC<DashboardProps> = () => {
         // Update state with attendance data
         if (response?.data?.attendanceList?.length > 0) {
           setAttendanceData(response?.data?.attendanceList);
+          const attendanceData = response?.data?.attendanceList;
+          if (attendanceData) {
+            setSelectedAttendance(attendanceData?.[0]?.attendance);
+          }
         } else {
+          setSelectedAttendance('');
           setAttendanceData([]);
         }
       } else {
@@ -762,7 +771,6 @@ const Dashboard: React.FC<DashboardProps> = () => {
       },
     };
     telemetryFactory.interact(telemetryInteract);
-
   };
 
   const getMonthName = (dateString: string) => {
@@ -1828,70 +1836,74 @@ const Dashboard: React.FC<DashboardProps> = () => {
                     <AttendanceComparison blockName={blockName} />
                   </Box>
                 )}
-                <Box mt={3} px="18px">
-                  <Box
-                    sx={{ background: '#fff', padding: '5px' }}
-                    display={'flex'}
-                    justifyContent={'space-between'}
-                  >
-                    <Typography
-                      textAlign={'left'}
-                      fontSize={'0.8rem'}
-                      pl={'1rem'}
-                      pt={'1rem'}
-                      color={'black'}
-                      fontWeight={'600'}
-                    >
-                      {t('DASHBOARD.MY_TIMETABLE')}
-                    </Typography>
+                {showMyTimeTable && (
+                  <Box mt={3} px="18px">
                     <Box
+                      sx={{ background: '#fff', padding: '5px' }}
                       display={'flex'}
-                      sx={{
-                        cursor: 'pointer',
-                        color: theme.palette.secondary.main,
-                        gap: '4px',
-                        opacity: classId === 'all' ? 0.5 : 1,
-                        alignItems: 'center',
-                      }}
-                      onClick={viewTimeTable}
+                      justifyContent={'space-between'}
                     >
                       <Typography
-                        marginBottom={'0'}
-                        style={{ fontWeight: '500' }}
+                        textAlign={'left'}
+                        fontSize={'0.8rem'}
+                        pl={'1rem'}
+                        pt={'1rem'}
+                        color={'black'}
+                        fontWeight={'600'}
                       >
-                        {getMonthName(selectedDate)}
+                        {t('DASHBOARD.MY_TIMETABLE')}
                       </Typography>
-                      <CalendarMonthIcon sx={{ fontSize: '18px' }} />
-                    </Box>
-                  </Box>
-                  <WeekCalender
-                    showDetailsHandle={showTimeTableDetailsHandle}
-                    data={percentageAttendanceData}
-                    disableDays={classId === 'all'}
-                    classId={classId}
-                    showFromToday={true}
-                    newWidth={'100%'}
-                  />
-                </Box>
-                <Box mt={3} px="18px">
-                  <Grid container spacing={2}>
-                    {sessions?.map((item) => (
-                      <Grid xs={12} sm={6} md={6} item>
-                        <SessionCard data={item} key={item.id}>
-                          <SessionCardFooter item={item} />
-                        </SessionCard>
-                      </Grid>
-                    ))}
-                    {sessions && sessions?.length === 0 && (
                       <Box
-                        className="fs-12 fw-400 italic"
-                        sx={{ color: theme.palette.warning['300'] }}
+                        display={'flex'}
+                        sx={{
+                          cursor: 'pointer',
+                          color: theme.palette.secondary.main,
+                          gap: '4px',
+                          opacity: classId === 'all' ? 0.5 : 1,
+                          alignItems: 'center',
+                        }}
+                        onClick={viewTimeTable}
                       >
-                        {t('COMMON.NO_SESSIONS_SCHEDULED')}
+                        <Typography
+                          marginBottom={'0'}
+                          style={{ fontWeight: '500' }}
+                        >
+                          {getMonthName(selectedDate)}
+                        </Typography>
+                        <CalendarMonthIcon sx={{ fontSize: '18px' }} />
                       </Box>
-                    )}
-                  </Grid>
-                </Box>
+                    </Box>
+                    <WeekCalender
+                      showDetailsHandle={showTimeTableDetailsHandle}
+                      data={percentageAttendanceData}
+                      disableDays={classId === 'all'}
+                      classId={classId}
+                      showFromToday={true}
+                      newWidth={'100%'}
+                    />
+                  </Box>
+                )}
+                {showMyTimeTable && (
+                  <Box mt={3} px="18px">
+                    <Grid container spacing={2}>
+                      {sessions?.map((item) => (
+                        <Grid xs={12} sm={6} md={6} item>
+                          <SessionCard data={item} key={item.id}>
+                            <SessionCardFooter item={item} />
+                          </SessionCard>
+                        </Grid>
+                      ))}
+                      {sessions && sessions?.length === 0 && (
+                        <Box
+                          className="fs-12 fw-400 italic"
+                          sx={{ color: theme.palette.warning['300'] }}
+                        >
+                          {t('COMMON.NO_SESSIONS_SCHEDULED')}
+                        </Box>
+                      )}
+                    </Grid>
+                  </Box>
+                )}
 
                 <Box mt={3} px="18px" gap={'15px'}>
                   <Box