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

…shiksha-2.0
tekdi · May 27, 2024 · 512075d · 512075d
2 parents e83c8cc + 5a0ef98
commit 512075d
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 125 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -113,6 +113,11 @@
     "MY_PROFILE": "My Profile",
     "VIEW_MORE": "View More",
     "VIEW_LESS": "View Less",
-    "DATA_RANAGE": "Data Range"
+    "DATA_RANAGE": "Data Range",
+    "LEARNER_DETAILS": "Learner Details",
+    "VIEW_DAY_WISE": "View Day-Wise",
+    "SUBMITTED_ON": "Submitted On",
+    "MARK_OBTAINED": "Mark Obtained",
+    "TOTAL_QUESTIONS":"Total Questions"
   }
 }
diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json
@@ -44,7 +44,6 @@
     "LEARNER_NAME": "शिक्षार्थी का नाम",
     "DATE_RANGE": "तिथि सीमा",
     "SELECT_AN_OPTION": "कोई विकल्प चुनें"
-
   },
   "LOGIN_PAGE": {
     "USERNAME": "उपयोगकर्ता नाम",
@@ -114,6 +113,11 @@
     "MY_PROFILE": "मेरी प्रोफ़ाइल",
     "VIEW_MORE": "अधिक देखें",
     "VIEW_LESS": "कम देखें",
-    "DATA_RANAGE": "डेटा रेंज़"
+    "DATA_RANAGE": "डेटा रेंज़",
+    "LEARNER_DETAILS": "विद्यार्थी विवरण",
+    "VIEW_DAY_WISE": "दिन-वार देखें",
+    "SUBMITTED_ON": "प्रस्तुत किया गया",
+    "MARK_OBTAINED": "प्राप्त अंक",
+    "TOTAL_QUESTIONS": "कुल प्रश्न"
   }
 }
diff --git a/public/locales/mr/common.json b/public/locales/mr/common.json
@@ -43,8 +43,6 @@
     "LEARNER_NAME": "शिकणाऱ्याचे नाव",
     "DATE_RANGE": "तारीख श्रेणी",
     "SELECT_AN_OPTION": "एक पर्याय निवडा"
-
-
   },
   "LOGIN_PAGE": {
     "USERNAME": "वापरकर्ता नाव",
@@ -110,6 +108,11 @@
     "MY_PROFILE": "माझी प्रोफाइल",
     "VIEW_MORE": "अधिक पाहा",
     "VIEW_LESS": "कमी करा",
-    "DATA_RANAGE": "डेटा श्रेणी"
+    "DATA_RANAGE": "डेटा श्रेणी",
+    "LEARNER_DETAILS": "विद्यार्थी तपशील",
+    "VIEW_DAY_WISE": "दिवस-निहाय पहा",
+    "SUBMITTED_ON": "सादर केलेले",
+    "MARK_OBTAINED": "प्राप्त गुण",
+    "TOTAL_QUESTIONS": "एकूण प्रश्न"
   }
 }
diff --git a/src/components/MarkBulkAttendance.tsx b/src/components/MarkBulkAttendance.tsx
@@ -100,7 +100,7 @@ const MarkBulkAttendace: React.FC<MarkBulkAttendanceProps> = ({
       setLoading(true);
       try {
         if (classId) {
-          const limit = 0;
+          const limit = 300;
           const page = 0;
           const filters = { cohortId: classId };
           const response = await getMyCohortMemberList({
@@ -119,7 +119,7 @@ const MarkBulkAttendace: React.FC<MarkBulkAttendanceProps> = ({
               const formatSelectedDate = shortDateFormat(selectedDate);
               const userAttendanceStatusList = async () => {
                 const attendanceStatusData: AttendanceStatusListProps = {
-                  limit: 0,
+                  limit: 300,
                   page: 0,
                   filters: {
                     fromDate: formatSelectedDate,

diff --git a/src/pages/attendance-history.tsx b/src/pages/attendance-history.tsx
@@ -232,7 +232,7 @@ const UserAttendanceHistory = () => {
     setLoading(true);
     try {
       if (classId) {
-        let limit = 0;
+        let limit = 300;
         let page = 0;
         let filters = { cohortId: classId };
         const response = await getMyCohortMemberList({
@@ -251,7 +251,7 @@ const UserAttendanceHistory = () => {
           if (nameUserIdArray && (selectedDate || currentDate)) {
             const userAttendanceStatusList = async () => {
               const attendanceStatusData: AttendanceStatusListProps = {
-                limit: 0,
+                limit: 300,
                 page: 0,
                 filters: {
                   fromDate: shortDateFormat(selectedDate || currentDate),

diff --git a/src/pages/attendance-overview.tsx b/src/pages/attendance-overview.tsx
@@ -113,7 +113,7 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
     setLoading(true);
     try {
       if (classId) {
-        let limit = 0;
+        let limit = 300;
         let page = 0;
         let filters = { cohortId: classId };
         const response = await getMyCohortMemberList({
@@ -313,6 +313,7 @@ const AttendanceOverview: React.FC<AttendanceOverviewProps> = () => {
               value={classId}
               onChange={handleCohortSelection}
               displayEmpty
+              disabled = {cohortsData?.length == 1 ? true : false}
               inputProps={{ 'aria-label': 'Without label' }}
               className="SelectLanguages fs-14 fw-500"
               style={{

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -56,7 +56,6 @@ import useDeterminePathColor from '../hooks/useDeterminePathColor';
 import { useRouter } from 'next/navigation';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
-import MarkBulkAttendance from '@/components/MarkBulkAttendance';
 
 interface State extends SnackbarOrigin {
   openModal: boolean;
@@ -166,7 +165,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
       setLoading(true);
       try {
         if (classId) {
-          let limit = 0;
+          let limit = 300;
           let page = 0;
           let filters = { cohortId: classId };
           const response = await getMyCohortMemberList({
@@ -185,7 +184,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
             if (nameUserIdArray && (selectedDate || currentDate)) {
               const userAttendanceStatusList = async () => {
                 const attendanceStatusData: AttendanceStatusListProps = {
-                  limit: 0,
+                  limit: 300,
                   page: 0,
                   filters: {
                     fromDate: selectedDate || currentDate,
@@ -316,8 +315,8 @@ const Dashboard: React.FC<DashboardProps> = () => {
           const fromDateFormatted = shortDateFormat(startDate);
           const toDateFormatted = shortDateFormat(endDate);
           const attendanceRequest: AttendancePercentageProps = {
-            limit: 2,
-            page: 1,
+            limit: 300,
+            page: 0,
             filters: {
               contextId: classId,
               fromDate: fromDateFormatted,
@@ -527,6 +526,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
                         onChange={handleCohortSelection}
                         displayEmpty
                         inputProps={{ 'aria-label': 'Without label' }}
+                        disabled = {cohortsData?.length == 1 ? true : false}
                         className="SelectLanguages fs-14 fw-500"
                         style={{
                           borderRadius: '0.5rem',
@@ -891,7 +891,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
               </Box>
             </Box>
           </Box>
-          <Box sx={{ background: '#fff' }}>
+          {/* <Box sx={{ background: '#fff' }}>
             <Typography
               textAlign={'left'}
               fontSize={'0.8rem'}
@@ -943,7 +943,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
                 }}
               />
             </Box>
-          </Box>
+          </Box> */}
         </Box>
       )}
     </>