Merge pull request #220 from Rushikesh-Sonawane99/shiksha-2.0

Issue #PS-388 chore: Added feature to show number of days attendance marked out of 7 days on attendance overview page
tekdi · Jun 4, 2024 · de3192c · de3192c
2 parents 9f589c3 + 559bd57
commit de3192c
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 82 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -89,6 +89,7 @@
     "UPCOMING_EXTRA_SESSION": "Upcoming Extra Sessions",
     "BACK_TO_TOP": "Back to Top",
     "LAST_SEVEN_DAYS_RANGE": "Last 7 Days {{date_range}}",
+    "AS_OF_TODAY_DATE": "As of Today {{day_date}}",
     "LEARNER": "Learners"
   },
   "ATTENDANCE": {
@@ -116,7 +117,8 @@
     "N/A": "N/A",
     "CENTER_NAME": "Center Name",
     "ALL_CENTERS": "All Centers",
-    "NO_LEARNER_WITH_LOW_ATTENDANCE": "No Learner with low attendance"
+    "NO_LEARNER_WITH_LOW_ATTENDANCE": "No Learner with low attendance",
+    "ATTENDANCE_MARKED_OUT_OF_DAYS": "Attendance marked: {{count}} out of last 7 days"
   },
   "PROFILE": {
     "EDIT_PROFILE": "Edit Profile",

diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json
@@ -87,6 +87,7 @@
     "UPCOMING_EXTRA_SESSION": "आगामी अतिरिक्त सत्र",
     "BACK_TO_TOP": "वापस शीर्ष पर",
     "LAST_SEVEN_DAYS_RANGE": "पिछले 7 दिन {{date_range}}",
+    "AS_OF_TODAY_DATE": "As of Today {{dayDate}}",
     "LEARNER": "शिक्षार्थियों"
   },
   "ATTENDANCE": {
@@ -115,7 +116,8 @@
     "N/A": "उपलब्ध नहीं",
     "CENTER_NAME": "केंद्र का नाम",
     "ALL_CENTERS": "सभी केंद्र",
-    "NO_LEARNER_WITH_LOW_ATTENDANCE": "कम उपस्थिति वाले कोई शिक्षार्थी नहीं"
+    "NO_LEARNER_WITH_LOW_ATTENDANCE": "कम उपस्थिति वाले कोई शिक्षार्थी नहीं",
+    "ATTENDANCE_MARKED_OUT_OF_DAYS": "उपस्थिति चिह्नित: पिछले 7 दिनों में से {{count}} दिन"
   },
   "PROFILE": {
     "EDIT_PROFILE": "प्रोफ़ाइल संपादित करें",

diff --git a/public/locales/mr/common.json b/public/locales/mr/common.json
@@ -87,6 +87,7 @@
     "UPCOMING_EXTRA_SESSION": "आगामी अतिरिक्त सत्रे",
     "BACK_TO_TOP": "परत वर जा",
     "LAST_SEVEN_DAYS_RANGE": "शेवटचे 7 दिवस {{date_range}}",
+    "AS_OF_TODAY_DATE": "As of Today {{day_date}}",
     "LEARNER": "शिकणारे"
   },
   "ATTENDANCE": {
@@ -110,7 +111,8 @@
     "N/A": "उपलब्ध नाही",
     "CENTER_NAME": "केंद्राचे नाव",
     "ALL_CENTERS": "सर्व केंद्रे",
-    "NO_LEARNER_WITH_LOW_ATTENDANCE": "कमी उपस्थिती असलेला कोणताही शिकणारा नाही"
+    "NO_LEARNER_WITH_LOW_ATTENDANCE": "कमी उपस्थिती असलेला कोणताही शिकणारा नाही",
+    "ATTENDANCE_MARKED_OUT_OF_DAYS": "उपस्थिती नोंदवली: मागील 7 दिवसांपैकी {{count}} दिवस"
   },
   "PROFILE": {
     "EDIT_PROFILE": "प्रोफाइल संपादित करा",

diff --git a/src/components/DateRangePopup.tsx b/src/components/DateRangePopup.tsx
@@ -59,13 +59,15 @@ interface CustomSelectModalProps {
   selectedValue: string;
   setSelectedValue: (value: string) => void;
   onDateRangeSelected: any;
+  currentDayMonth:string;
 }
 
 const DateRangePopup: React.FC<CustomSelectModalProps> = ({
   menuItems,
   selectedValue,
   setSelectedValue,
   onDateRangeSelected,
+  currentDayMonth
 }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isCalendarModalOpen, setIsCalenderModalOpen] = useState(false);
@@ -187,10 +189,10 @@ const DateRangePopup: React.FC<CustomSelectModalProps> = ({
           inputProps={{ readOnly: true }}
         >
           <MenuItem value="" disabled>
-            {t('COMMON.SELECT_AN_OPTION')}
+        {  t('DASHBOARD.AS_OF_TODAY_DATE', {day_date: currentDayMonth})}
           </MenuItem>
           <MenuItem value={selectedValue}>
-            {selectedValue ? selectedValue : t('COMMON.SELECT_AN_OPTION')}
+            {selectedValue ? selectedValue : t('DASHBOARD.AS_OF_TODAY_DATE', {day_date: currentDayMonth})}
           </MenuItem>
         </Select>
       </FormControl>

diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
@@ -111,7 +111,7 @@ ModalComponent.propTypes = {
   open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   heading: PropTypes.string.isRequired,
-  SubHeading: PropTypes.string.isRequired,
+  SubHeading: PropTypes.string,
   btnText: PropTypes.string.isRequired,
   children: PropTypes.node,
 };