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

Issue #PS-000 chore: Fixed UI Issue and added toast message
tekdi · Jul 5, 2024 · 7752d5e · 7752d5e
2 parents af60f92 + 0642d1d
commit 7752d5e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/components/CohortSelectionSection.tsx b/src/components/CohortSelectionSection.tsx
@@ -15,6 +15,7 @@ import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
 import Loader from './Loader';
 import { cohortHierarchy } from '@/utils/app.constant';
+import { showToastMessage } from './Toastify';
 
 interface CohortSelectionSectionProps {
   classId: string;
@@ -151,6 +152,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
         } catch (error) {
           console.error('Error fetching cohort list', error);
           setLoading(false);
+          showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
         }
       };
 

diff --git a/src/pages/blocks/centre.tsx b/src/pages/blocks/centre.tsx
@@ -19,6 +19,7 @@ import {
 } from '@mui/icons-material';
 import AddIcon from '@mui/icons-material/Add';
 import FilterModalCenter from './components/FilterModalCenter';
+import { toPascalCase } from '@/utils/Helper';
 
 interface BlocksProps {
   // Define any props if needed
@@ -110,10 +111,10 @@ const Blocks: React.FC<BlocksProps> = () => {
 
   useEffect(() => {
     const storedDistrict = localStorage.getItem('selectedBlockDistrict') || '';
-    setDistrict(storedDistrict);
+    setDistrict(toPascalCase(storedDistrict));
 
     const storedBlock = localStorage.getItem('selectedBlock') || '';
-    setBlocks(storedBlock);
+    setBlocks(toPascalCase(storedBlock));
   }, []);
 
   useEffect(() => {
@@ -142,7 +143,7 @@ const Blocks: React.FC<BlocksProps> = () => {
             fontWeight={'500'}
             color={theme?.palette?.text?.primary}
           >
-            {districts}, {state}
+            {districts}, {toPascalCase(state)}
           </Typography>
           <Box display={'flex'} alignItems={'center'} mb={2}>
             <TextField

diff --git a/src/pages/centers/[cohortId].tsx b/src/pages/centers/[cohortId].tsx
@@ -17,6 +17,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import { useRouter } from 'next/router';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
+import { toPascalCase } from '@/utils/Helper';
 
 const TeachingCenterDetails = () => {
   const [value, setValue] = React.useState(1);
@@ -46,7 +47,7 @@ const TeachingCenterDetails = () => {
             (item: CustomField) => item.label === 'State'
           );
 
-          cohortData.address = `${district?.value}, ${state?.value}` || '';
+          cohortData.address = `${toPascalCase(district?.value)}, ${toPascalCase(state?.value)}` || '';
         }
         setCohortDetails(cohortData);
       }

diff --git a/src/pages/centers/index.tsx b/src/pages/centers/index.tsx
@@ -217,7 +217,7 @@ const TeachingCenters = () => {
                   <Box>
                     <TextField
                       className="input_search"
-                      placeholder={t('COMMON.SEARCH_FACILITATORS')}
+                      placeholder={t('COMMON.SEARCH')}
                       color="secondary"
                       focused
                       sx={{