Issue #219465 chore: Feedback changes

tekdi · May 22, 2024 · e3a66ca · e3a66ca
1 parent 85ad649
commit e3a66ca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/packages/cohort/src/pages/CohortDetails.js b/packages/cohort/src/pages/CohortDetails.js
@@ -288,11 +288,7 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
       >
         <Layout
           _header={{
-            title:
-              cohortParentDetails?.name +
-              ", " +
-              " Level " +
-              cohortDetails?.name,
+            title: cohortParentDetails?.name + ", " + cohortDetails?.name,
             subHeading: moment().format("hh:mm A"),
             iconComponent: (
               <Pressable>
@@ -360,6 +356,7 @@ const CohortDetails = ({ footerLinks, setAlert, appName }) => {
                 attendanceStatusData?.data[0]?.attendance
               ) {
                 modifiedTitle += `                           - ${attendanceStatusData?.data[0]?.attendance}`;
+                isDisabled = true;
               }
               return (
                 <Widget

diff --git a/packages/cohort/src/pages/CohortMemberList.js b/packages/cohort/src/pages/CohortMemberList.js
@@ -249,7 +249,7 @@ export default function CohortMemberList({ footerLinks, appName }) {
       _header={{
         title: loading
           ? ""
-          : cohortParentDetails?.name + ", " + " Level " + cohortDetails?.name,
+          : cohortParentDetails?.name + ", " + cohortDetails?.name,
         subHeading: moment().format("hh:mm A"),
         iconComponent: (
           <Pressable>
@@ -387,12 +387,22 @@ export default function CohortMemberList({ footerLinks, appName }) {
                 >
                   <HStack justifyContent="space-between">
                     <VStack>
-                      <H4>{item?.userDetails?.name}</H4>
+                      <H4 mt={5}>{item?.userDetails?.name}</H4>
                     </VStack>
                     <HStack space={2}>
                       {attendanceRecord ? (
-                        <Button colorScheme="primary">
-                          {attendanceRecord.attendance}
+                        <Button colorScheme="primary" mt={5}>
+                          <div
+                            style={{
+                              color:
+                                attendanceRecord.attendance === "Present"
+                                  ? "green"
+                                  : "red",
+                              paddingRight: "26px",
+                            }}
+                          >
+                            {attendanceRecord.attendance}
+                          </div>
                         </Button>
                       ) : null}