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

…AppNotification
tekdi · Nov 27, 2024 · cb862ce · cb862ce
2 parents 6158f15 + df1f2b0
commit cb862ce
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/components/PlannedSession.tsx b/src/components/PlannedSession.tsx
@@ -1509,7 +1509,17 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
               <Box sx={{ overflow: 'none' }}>
                 <Typography variant="h2" component="h2">
                   {t('COMMON.HELD_EVERY_WEEK_ON', {
-                    days: block?.selectedWeekDays?.join(', '),
+                    // days:
+                    //   block?.selectedWeekDays?.join(', ') ||
+                    //   editSession?.recurrencePattern?.daysOfWeek,
+                    days: (editSession?.recurrencePattern?.daysOfWeek || [])
+                      .map(
+                        (dayIndex: any) =>
+                          ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][
+                            dayIndex
+                          ]
+                      )
+                      .join(', '),
                   })}
                 </Typography>
 

diff --git a/src/pages/observation/[observationId]/index.tsx b/src/pages/observation/[observationId]/index.tsx
@@ -116,13 +116,17 @@ const ObservationDetails = () => {
             if (searchInput !== '' && entity === ObservationEntityType.CENTER) {
               const filteredData = response[0]?.childData?.filter(
                 (cohort: any) =>
-                  cohort?.name
-                    ?.toLowerCase()
-                    .includes(searchInput?.toLowerCase())
+                  cohort?.name?.toLowerCase()?.includes(searchInput?.toLowerCase()) &&
+                  cohort?.status?.toLowerCase() === "active"
               );
+
               setMyCohortList(filteredData);
             } else {
-              setMyCohortList(response[0]?.childData);
+              const filteredData = response[0]?.childData?.filter(
+                (cohort: any) => cohort?.status?.toLowerCase() === "active"
+              );
+
+              setMyCohortList(filteredData);
             }
             if (selectedCohort === '')
             {