Merge pull request #430 from suvarnakale/release-1.0.0

Issue #PS-2670 & 2671 feat: status indicators on planned sessions and changes in weekdays
tekdi · Nov 26, 2024 · 610ddf1 · 610ddf1
2 parents 3c6d8f4 + 64fd2ae
commit 610ddf1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/components/PlannedSession.tsx b/src/components/PlannedSession.tsx
@@ -1514,7 +1514,8 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
                 </Typography>
 
                 <WeekDays
-                  useAbbreviation={true}
+                  // useAbbreviation={true}
+                  multiselect={true}
                   selectedDays={
                     selectedDays?.length
                       ? editSession?.recurrencePattern?.daysOfWeek

diff --git a/src/components/SessionCard.tsx b/src/components/SessionCard.tsx
@@ -173,7 +173,8 @@ const SessionsCard: React.FC<SessionsCardProps> = ({
       >
         <Box>
           <Box display={'flex'} gap={1.5}>
-            {data?.isRecurring === false ? getStatusIcon() : ''}
+            {/* {data?.isRecurring === false ? getStatusIcon() : ''} */}
+            {getStatusIcon()}
             <Typography
               color={theme.palette.warning['300']}
               fontWeight={'400'}

diff --git a/src/components/WeekDays.tsx b/src/components/WeekDays.tsx
@@ -8,12 +8,14 @@ interface WeekDaysProps {
   useAbbreviation?: boolean;
   onSelectionChange?: (selectedDays: string[]) => void;
   selectedDays?: any[];
+  multiselect?: boolean;
 }
 
 const WeekDays: React.FC<WeekDaysProps> = ({
   useAbbreviation,
   onSelectionChange,
   selectedDays = [],
+  multiselect,
 }) => {
   const theme = useTheme<any>();
   const [localSelectedDays, setLocalSelectedDays] = useState<number[]>([]);
@@ -105,14 +107,14 @@ const WeekDays: React.FC<WeekDaysProps> = ({
           key={`${day}-${index}`}
           ref={index === currentDayIndex ? selectedItemRef : null}
           style={{
-            backgroundColor: useAbbreviation
+            backgroundColor: multiselect
               ? localSelectedDays.includes(index)
                 ? theme.palette.primary.main
                 : 'inherit'
               : index === currentDayIndex
                 ? theme.palette.primary.main
                 : 'inherit',
-            cursor: useAbbreviation ? 'pointer' : 'default',
+            cursor: multiselect ? 'pointer' : 'default',
             border: `1px solid ${theme?.palette?.warning['A100']}`,
             borderRadius: '4px',
             justifyContent: 'center',
@@ -122,7 +124,7 @@ const WeekDays: React.FC<WeekDaysProps> = ({
         >
           <Box
             className="card flex-center"
-            sx={{ width: 'auto', height: '50px' }}
+            sx={{ width: '2.6rem', height: '50px' }}
           >
             <CardContent align-item="center">
               <Typography