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

…lease-1.0.0
tekdi · Aug 12, 2024 · e6065da · e6065da
2 parents f149f38 + eba466d
commit e6065da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -358,7 +358,8 @@
  "RECURRING_OFFLINE": "Recurring offline",
  "ENTER_VALID_MEETING_LINK": "Please enter a valid Zoom or Google Meet link.",
  "ZOOM": "Zoom",
- "GOOGLEMEET": "GoogleMeet"
+ "GOOGLEMEET": "GoogleMeet",
+ "SET_UP": "Set-Up"
  },
  "MANAGE_USERS": {
  "CENTERS_REQUESTED_SUCCESSFULLY": "Center Requested Successfully",

diff --git a/src/components/PlannedSession.tsx b/src/components/PlannedSession.tsx
@@ -140,7 +140,6 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
  event: ChangeEvent<HTMLInputElement>,
  id: string | number | undefined
  ) => {
- setMode(event.target.value.toLowerCase() as mode);
  const updatedSessionBlocks = sessionBlocks.map((block) =>
  block.id === id
  ? { ...block, sessionMode: event.target.value.toLowerCase() }
@@ -153,8 +152,6 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
  event: ChangeEvent<HTMLInputElement>,
  id: string | number | undefined
  ) => {
- setEventType(event.target.value as type);
- console.log(event.target.value);
  const updatedSessionBlocks = sessionBlocks.map((block) =>
  block.id === id ? { ...block, sessionType: event.target.value } : block
  );
@@ -251,14 +248,22 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
  ) => {
  if (newValue) {
  console.log(newValue);
+ let startDate;
+ let endDate;
+ let startTime;
+ let endTime;
  if (type === 'start' && field === 'date') {
- setStartDate(newValue);
+ // setStartDate(newValue);
+ startDate = newValue;
  } else if (type === 'start' && field === 'time') {
- setStartTime(newValue);
+ // setStartTime(newValue);
+ startTime = newValue;
  } else if (type === 'end' && field === 'date') {
- setEndDate(newValue);
+ // setEndDate(newValue);
+ endDate = newValue;
  } else if (type === 'end' && field === 'time') {
- setEndTime(newValue);
+ // setEndTime(newValue);
+ endTime = newValue;
  }
  }
 
@@ -585,7 +590,7 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
  return (
  <Box overflow={'auto'}>
  {sessionBlocks.map((block, index) => (
- <Box sx={{ padding: '10px 16px' }}>
+ <Box key={block.id} sx={{ padding: '10px 16px' }}>
  <Box>
  <SessionMode
  mode={block?.sessionMode || mode}