Show correct day names on dashboard

wger-project · Jan 18, 2025 · e5f28e2 · e5f28e2
1 parent d0e7c6a
commit e5f28e2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/src/components/Dashboard/RoutineCard.tsx b/src/components/Dashboard/RoutineCard.tsx
@@ -14,6 +14,7 @@ import {
 } from '@mui/material';
 import { LoadingPlaceholder } from "components/Core/LoadingWidget/LoadingWidget";
 import { EmptyCard } from "components/Dashboard/EmptyCard";
+import { getDayName } from "components/WorkoutRoutines/models/Day";
 import { Routine } from "components/WorkoutRoutines/models/Routine";
 import { RoutineDayData } from "components/WorkoutRoutines/models/RoutineDayData";
 import { useActiveRoutineQuery } from "components/WorkoutRoutines/queries";
@@ -50,7 +51,8 @@ const RoutineCardContent = (props: { routine: Routine }) => {
         {/* Note: not 500 like the other cards, but a bit more since we don't have an action icon... */}
         <CardContent sx={{ height: "510px", overflow: "auto" }}>
             <List>
-                {props.routine.dayDataCurrentIteration.map((day, index) => <DayListItem dayData={day} key={index} />)}
+                {props.routine.dayDataCurrentIteration.map((day, index) =>
+                    <DayListItem dayData={day} key={index} />)}
             </List>
         </CardContent>
 
@@ -65,26 +67,29 @@ const RoutineCardContent = (props: { routine: Routine }) => {
 
 const DayListItem = (props: { dayData: RoutineDayData }) => {
     const [expandView, setExpandView] = useState(false);
-    const [t] = useTranslation();
-
+    const { t } = useTranslation();
 
     const handleToggleExpand = () => setExpandView(!expandView);
 
     return (<>
-        <ListItemButton onClick={handleToggleExpand} selected={expandView} disabled={props.dayData.day?.isRest}>
+        <ListItemButton
+            onClick={handleToggleExpand}
+            selected={expandView}
+            disabled={props.dayData.day === null || props.dayData.day?.isRest}
+        >
             <ListItemIcon>
                 {expandView ? <ExpandLessIcon /> : <ExpandMoreIcon />}
             </ListItemIcon>
             <ListItemText
-                primary={props.dayData.day?.getDisplayName()}
+                primary={getDayName(props.dayData.day)}
             />
         </ListItemButton>
 
         <Collapse in={expandView} timeout="auto" unmountOnExit>
             {props.dayData.slots.map((slotData, index) => (<div key={index}>
-                {slotData.setConfigs.map((setting, index) =>
+                {slotData.setConfigs.map((setConfigData, index) =>
                     <SetConfigDataDetails
-                        setConfigData={setting}
+                        setConfigData={setConfigData}
                         key={index}
                         rowHeight={'70px'}
                         showExercise={true}

diff --git a/src/components/WorkoutRoutines/Detail/RoutineDetail.tsx b/src/components/WorkoutRoutines/Detail/RoutineDetail.tsx
@@ -37,7 +37,7 @@ export const RoutineDetail = () => {
                         }
 
                         {routine!.dayDataCurrentIteration.filter((dayData) => dayData.day !== null).map((dayData, index) =>
-                            <DayDetailsCard routineId={routineId} dayData={dayData} key={`dayDetails-${index}`} />
+                            <DayDetailsCard routineId={routineId} dayData={dayData} key={index} />
                         )}
                     </Stack>
                 }

diff --git a/src/components/WorkoutRoutines/Detail/RoutineDetailsTable.tsx b/src/components/WorkoutRoutines/Detail/RoutineDetailsTable.tsx
@@ -305,7 +305,6 @@ export const RoutineTable = (props: { routine: Routine, showLogs?: boolean }) =>
                         </React.Fragment>;
                     })}
                 </React.Fragment>;
-
             })}
         </>;
     }

diff --git a/src/components/WorkoutRoutines/Detail/TemplateDetail.tsx b/src/components/WorkoutRoutines/Detail/TemplateDetail.tsx
@@ -47,8 +47,12 @@ export const TemplateDetail = () => {
                         >{t('routines.copyAndUseTemplate')}</Button>
 
                         {routine!.dayDataCurrentIteration.filter((dayData) => dayData.day !== null).map((dayData, index) =>
-                            <DayDetailsCard dayData={dayData} routineId={routineId} readOnly={true}
-                                            key={`dayDetails-${index}`} />
+                            <DayDetailsCard
+                                dayData={dayData}
+                                routineId={routineId}
+                                readOnly={true}
+                                key={`dayDetails-${index}`}
+                            />
                         )}
                     </Stack>
                 }

diff --git a/src/components/WorkoutRoutines/models/Day.ts b/src/components/WorkoutRoutines/models/Day.ts
@@ -61,6 +61,8 @@ export class Day {
 
 }
 
+export const getDayName = (day: Day | null): string => day === null || day.isRest ? i18n.t('routines.restDay') : day.getDisplayName();
+
 
 export class DayAdapter implements Adapter<Day> {
     fromJson = (item: any): Day => new Day({

diff --git a/src/components/WorkoutRoutines/widgets/RoutineDetailsCard.tsx b/src/components/WorkoutRoutines/widgets/RoutineDetailsCard.tsx
@@ -20,6 +20,7 @@ import { RenderLoadingQuery } from "components/Core/Widgets/RenderLoadingQuery";
 import { ExerciseImageAvatar } from "components/Exercises/Detail/ExerciseImageAvatar";
 import { Language } from "components/Exercises/models/language";
 import { useLanguageQuery } from "components/Exercises/queries";
+import { getDayName } from "components/WorkoutRoutines/models/Day";
 import { RoutineDayData } from "components/WorkoutRoutines/models/RoutineDayData";
 import { SetConfigData } from "components/WorkoutRoutines/models/SetConfigData";
 import { SlotData } from "components/WorkoutRoutines/models/SlotData";
@@ -146,7 +147,7 @@ function SlotDataList(props: {
 }
 
 export const DayDetailsCard = (props: { dayData: RoutineDayData, routineId: number, readOnly?: boolean }) => {
-    const readOnly = props.readOnly ?? false;
+    const readOnly = (props.readOnly ?? false) || props.dayData.day === null || props.dayData.day.isRest;
 
     const theme = useTheme();
 
@@ -168,7 +169,7 @@ export const DayDetailsCard = (props: { dayData: RoutineDayData, routineId: numb
         <Card sx={{ minWidth: 275 }}>
             <CardHeader
                 sx={{ bgcolor: theme.palette.grey.A200 }}
-                action={props.dayData.day!.isRest || readOnly
+                action={props.dayData.day === null || props.dayData.day.isRest || readOnly
                     ? null
                     : <Tooltip title={t('routines.addWeightLog')}>
                         <IconButton
@@ -179,7 +180,7 @@ export const DayDetailsCard = (props: { dayData: RoutineDayData, routineId: numb
                             <Addchart />
                         </IconButton>
                     </Tooltip>}
-                title={props.dayData.day!.getDisplayName()}
+                title={getDayName(props.dayData.day)}
                 subheader={props.dayData.day?.description}
             />
             <Menu
-Original file line number
+Diff line change
@@ Expand Up @@
                             </React.Fragment>;
                         })}
                     </React.Fragment>;
                 })}
             </>;
         }
@@ Expand Down @@