Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…

…lease-1.0.0
tekdi · Sep 24, 2024 · e0474a2 · e0474a2
2 parents f002583 + 2fc3749
commit e0474a2
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 20 deletions.
diff --git a/src/components/CohortSelectionSection.tsx b/src/components/CohortSelectionSection.tsx
@@ -94,7 +94,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
  showFloatingLabel = false,
  showDisabledDropDown = false,
 }) => {
- console.log("cohortsData",classId, cohortsData[0]?.cohortId)
+ console.log('cohortsData', classId, cohortsData[0]?.cohortId);
  const router = useRouter();
  const theme = useTheme<any>();
  const queryClient = useQueryClient();
@@ -151,12 +151,14 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
 
  const cohortData = response[0];
  let userDetailsResponse;
- if(userId)
- {
+ if (userId) {
  userDetailsResponse = await getUserDetails(userId, true);
  }
- const blockObject = userDetailsResponse?.result?.userData?.customFields.find((item:any) => item?.label === 'BLOCKS');
-
+ const blockObject =
+ userDetailsResponse?.result?.userData?.customFields.find(
+ (item: any) => item?.label === 'BLOCKS'
+ );
+
  if (cohortData?.customField?.length) {
  const district = cohortData?.customField?.find(
  (item: CustomField) => item?.label === 'DISTRICTS'
@@ -185,7 +187,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
  setBlockId(blockObject?.fieldId);
  }
  }
- 
+
  if (response && response?.length > 0) {
  const extractNamesAndCohortTypes = (
  data: ChildData[]
@@ -368,19 +370,28 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
  {cohortsData?.length > 1 ? (
  <FormControl
  className="drawer-select"
- sx={{ m: 0, width: '100%' }}
+ sx={{
+ m: 0,
+ width: '100%',
+ '@media (max-width: 700px)': {
+ width: '50%',
+ },
+ }}
  >
  <Select
  value={classId}
  onChange={handleCohortSelection}
  displayEmpty
  inputProps={{ 'aria-label': 'Without label' }}
  className="select-languages capitalize fs-14 fw-500 bg-white"
- style={{
+ sx={{
  borderRadius: '0.5rem',
  color: theme.palette.warning['200'],
  width: '100%',
  marginBottom: '0rem',
+ '@media (max-width: 700px)': {
+ width: '50%',
+ },
  }}
  MenuProps={{
  PaperProps: {
@@ -454,7 +465,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
  <Select
  labelId="center-select-label"
  label={showFloatingLabel ? t('COMMON.CENTER') : ''}
- value={classId? classId: cohortsData[0]?.cohortId}
+ value={classId ? classId : cohortsData[0]?.cohortId}
  onChange={handleCohortSelection}
  // displayEmpty
  // style={{ borderRadius: '4px' }}
@@ -465,14 +476,17 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
  ? ''
  : 'select-languages fs-14 fw-500 bg-white'
  }
- style={
+ sx={
  showFloatingLabel
  ? { borderRadius: '4px' }
  : {
  borderRadius: '0.5rem',
  color: theme.palette.warning['200'],
  width: '100%',
  marginBottom: '0rem',
+ '@media (max-width: 700px)': {
+ width: '50%',
+ },
  }
  }
  >

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -116,6 +116,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
  const [extraSessions, setExtraSessions] = React.useState<Session[]>();
  const [myCohortList, setMyCohortList] = React.useState<any>();
  const [centralizedModal, setCentralizedModal] = useState(false);
+ const [showCentralisedModal, setShowCentralisedModal] = useState(false);
  const [cohortType, setCohortType] = React.useState<string>();
  const [medium, setMedium] = React.useState<string>();
  const [grade, setGrade] = React.useState<string>();
@@ -124,8 +125,26 @@ const Dashboard: React.FC<DashboardProps> = () => {
  const [eventDeleted, setEventDeleted] = React.useState(false);
  const [eventUpdated, setEventUpdated] = React.useState(false);
 
+ useEffect(() => {
+ if (typeof window !== 'undefined' && window.localStorage) {
+ const skipResetPassword = localStorage.getItem('skipResetPassword');
+ const temporaryPassword = localStorage.getItem('temporaryPassword');
+
+ if (temporaryPassword === 'true' && skipResetPassword !== 'true') {
+ setShowCentralisedModal(true);
+ }
+ }
+ }, []);
+
  const toggleDrawer = (newOpen: boolean) => () => {
  setOpenDrawer(newOpen);
+ //open modal for reset
+ // const skipResetPassword = localStorage.getItem('skipResetPassword');
+ // const temporaryPassword = localStorage.getItem('temporaryPassword');
+
+ if (showCentralisedModal && !newOpen) {
+ setCentralizedModal(true);
+ }
  };
  const [selectedDays, setSelectedDays] = React.useState<any>([]);
 
@@ -702,15 +721,16 @@ const Dashboard: React.FC<DashboardProps> = () => {
  setEventUpdated(true);
  };
 
- useEffect(() => {
- if (typeof window !== 'undefined' && window.localStorage) {
- const skipResetPassword = localStorage.getItem('skipResetPassword');
- const temporaryPassword = localStorage.getItem('temporaryPassword');
- if (temporaryPassword === 'true' && skipResetPassword !== 'true') {
- setCentralizedModal(true);
- }
- }
- }, []);
+ // useEffect(() => {
+ // if (typeof window !== 'undefined' && window.localStorage) {
+ // const skipResetPassword = localStorage.getItem('skipResetPassword');
+ // const temporaryPassword = localStorage.getItem('temporaryPassword');
+
+ // if (temporaryPassword === 'true' && skipResetPassword !== 'true') {
+ // setCentralizedModal(true);
+ // }
+ // }
+ // }, []);
 
  const handlePrimaryButton = () => {
  router.push(`/create-password`);
@@ -819,7 +839,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
  </Box>
 
  <Box
- className="calenderTitle flex-center joyride-step-3 ps-md-ab right-md-20"
+ className="calenderTitle flex-center joyride-step-3 ps-md-ab right-md-20 top-md-185"
  display={'flex'}
  sx={{
  cursor: 'pointer',

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -934,6 +934,10 @@ main {
  right: 20px;
  }
 
+ .top-md-185{
+ top: 185px;
+ }
+
  .mt-md-3 {
  margin-top: 3px;
  }