Merge branch 'release-1.0.0' into forty

tekdi · Dec 4, 2024 · e1612eb · e1612eb
2 parents 1f3a6cc + a8eb6dd
commit e1612eb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -446,6 +446,7 @@
     "START_DATE_ERROR": "Start date cannot be later than end date.",
     "END_DATE_ERROR": "End date cannot be earlier than start date.",
     "IDENTIFIER_NOT_FOUND": "Identifier not found! Cannot Open Content!",
+    "SELECT_SESSION":"Please click on any session to schedule a session",
     "MEETING_LINK_REQUIRED": "Please Enter Meeting Link!",
     "WEEKDAY_ERROR": "Please select at least one weekday for the recurring event.",
     "MULTIDAY_EVENT_ERROR": "Recurring events cannot span multiple days.",

diff --git a/src/components/CenterSessionModal.tsx b/src/components/CenterSessionModal.tsx
@@ -21,6 +21,7 @@ const CenterSessionModal: React.FC<SessionsModalProps> = ({
   secondary,
   handlePrimaryModel,
   handleEditModal,
+  disable=false
 }) => {
   const theme = useTheme<any>();
   const { t } = useTranslation();
@@ -166,9 +167,9 @@ const CenterSessionModal: React.FC<SessionsModalProps> = ({
                   color="primary"
                   className="one-line-text"
                   sx={{
-                    '&.Mui-disabled': {
-                      backgroundColor: theme?.palette?.primary?.main,
-                    },
+                    // '&.Mui-disabled': {
+                    //   backgroundColor: theme?.palette?.primary?.main,
+                    // },
                     minWidth: '84px',
                     padding: theme.spacing(1),
                     fontWeight: '500',
@@ -179,6 +180,7 @@ const CenterSessionModal: React.FC<SessionsModalProps> = ({
                     },
                   }}
                   onClick={handlePrimaryModel || handleEditModal}
+                  disabled={disable}
                 >
                   {primary}
                 </Button>

diff --git a/src/pages/centers/[cohortId]/index.tsx b/src/pages/centers/[cohortId]/index.tsx
@@ -160,6 +160,8 @@ const CohortPage = () => {
     React.useState(false);
   const [openAddLearnerModal, setOpenAddLearnerModal] = React.useState(false);
   const [openSchedule, setOpenSchedule] = React.useState(false);
+  const [disableNextButton, setDisableNextButton] = React.useState(true);
+
   const [eventDeleted, setEventDeleted] = React.useState(false);
   const [eventUpdated, setEventUpdated] = React.useState(false);
   const [deleteModal, setDeleteModal] = React.useState(false);
@@ -178,6 +180,7 @@ const CohortPage = () => {
   const [initialSlideIndex, setInitialSlideIndex] = useState<any>();
 
   const handleClick = (selection: string) => {
+    setDisableNextButton(false);
     setClickedBox(selection);
   };
 
@@ -186,6 +189,7 @@ const CohortPage = () => {
   };
 
   const handleCentermodel = () => {
+
     setOpenSchedule(true);
   };
 
@@ -738,6 +742,7 @@ const CohortPage = () => {
                           : handleCentermodel
                   }
                   handleEditModal={handleEditEvent}
+                  disable={onEditEvent?false: disableNextButton}
                 >
                   {deleteModal
                     ? DeleteSession && <DeleteSession />
@@ -758,10 +763,16 @@ const CohortPage = () => {
                           />
                         )
                       : Schedule && (
+                        <>
+                        {!clickedBox &&(<Typography sx={{m:2}}>
+                          {t('CENTER_SESSION.SELECT_SESSION')}
+                        </Typography>)}
                           <Schedule
                             clickedBox={clickedBox}
                             handleClick={handleClick}
                           />
+                        </>
+
                         )}
                 </CenterSessionModal>
 

diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
@@ -157,6 +157,7 @@ export interface SessionsModalProps {
   handlePrimaryModel?: () => void;
   secondary?: string;
   handleEditModal?: () => void;
+  disable?:boolean
 }
 
 export interface PlannedModalProps {