From 7395bb6d8988074597f7f87770d99773de7fabf8 Mon Sep 17 00:00:00 2001 From: TTPL-RT-52 Date: Wed, 10 Jul 2024 17:11:12 +0530 Subject: [PATCH] Issue #PS-1344 fix: Center Sessions UI Implementation --- public/locales/en/common.json | 12 +-- src/components/SessionCard.tsx | 58 +++++------ src/components/SessionCardFooter.tsx | 150 ++++++++++++--------------- 3 files changed, 102 insertions(+), 118 deletions(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index ca8c7807..2b2e3a5e 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -95,12 +95,12 @@ "OBSERVATIONS_FORMS": "Observations and Forms", "OTHER_REASON": "Other Reason", "OTHER_REASON_PLACEHOLDER": "Enter Other Reason", - "CENTER_SESSIONS":"Center Sessions", - "SCHEDULE_NEW":"Schedule New", - "UPCOMING_EXTRA_SESSION":"Upcoming Extra Sessions", - "NO_SESSIONS_SCHEDULED" :" No sessions scheduled", - "TO_BE_TAUGHT" :"What is going to be taught:", - "SELECT_TOPIC":" Select Topic, Sub-topic" + "CENTER_SESSIONS": "Center Sessions", + "SCHEDULE_NEW": "Schedule New", + "UPCOMING_EXTRA_SESSION": "Upcoming Extra Sessions", + "NO_SESSIONS_SCHEDULED": "No sessions scheduled", + "TO_BE_TAUGHT": "What is going to be taught:", + "SELECT_TOPIC": "Select Topic, Sub-topic" }, "LOGIN_PAGE": { "USERNAME": "Username", diff --git a/src/components/SessionCard.tsx b/src/components/SessionCard.tsx index 02ad9058..fac18d37 100644 --- a/src/components/SessionCard.tsx +++ b/src/components/SessionCard.tsx @@ -8,43 +8,41 @@ import { useTheme } from '@mui/material/styles'; const SessionsCard: React.FC = ({ data, children }) => { const theme = useTheme(); return ( - <> + - - - - {data?.subject} - + + + {data?.subject} + - - {data?.time} - - - {data?.teacherName} - - - + + {data?.time} + + + {data?.teacherName} + - {children} + - + {children} + ); }; diff --git a/src/components/SessionCardFooter.tsx b/src/components/SessionCardFooter.tsx index f564ea4e..05cf3a54 100644 --- a/src/components/SessionCardFooter.tsx +++ b/src/components/SessionCardFooter.tsx @@ -17,93 +17,79 @@ const SessionCardFooter: React.FC = ({ item }) => { const theme = useTheme(); const { t } = useTranslation(); - return ( - <> - {!item?.topic && ( - + + } + aria-controls="panel1-content" + id="panel1-header" + className="accordion-summary" + sx={{ px: 0, m: 0 }} > - - - - {t('COMMON.SELECT_TOPIC')} - + + {t('COMMON.TO_BE_TAUGHT')} + + + + + + + {item?.topic} + - - - )} - {item?.topic && ( + + + + {item?.subtopic} + + + + + + ) : ( + + + - - - } - aria-controls="panel1-content" - id="panel1-header" - className="accordion-summary" - sx={{ - px: 0, - m: 0, - }} - > - - {t('COMMON.TO_BE_TAUGHT')} - - - - - - - {item?.topic} - - - - - - {item?.subtopic} - - - - - + {t('COMMON.SELECT_TOPIC')} - )} - + + + ); };