no undefined or double negatives

espoon-voltti · Nov 12, 2024 · 221166e · 221166e
1 parent 40346b1
commit 221166e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/frontend/src/employee-mobile-frontend/child-attendance/utils.ts b/frontend/src/employee-mobile-frontend/child-attendance/utils.ts
@@ -32,15 +32,15 @@ export type AttendanceStatuses = Record<
 >
 
 export type ChildAttendanceStatus = ChildAttendanceStatusResponse & {
-  noServiceToday?: boolean
+  hasOperationalDay: boolean
 }
 
 export function childAttendanceStatus(
   child: AttendanceChild,
   attendanceStatuses: Record<UUID, ChildAttendanceStatusResponse | undefined>
 ): ChildAttendanceStatus {
   const status = attendanceStatuses[child.id]
-  if (status) return status
+  if (status) return { ...status, hasOperationalDay: true }
 
   if (
     child.scheduleType === 'TERM_BREAK' ||
@@ -55,12 +55,13 @@ export function childAttendanceStatus(
 const defaultChildAttendanceStatus: ChildAttendanceStatus = {
   status: 'COMING',
   attendances: [],
-  absences: []
+  absences: [],
+  hasOperationalDay: true
 }
 
 const childAttendanceStatusNoService: ChildAttendanceStatus = {
   status: 'ABSENT',
   attendances: [],
   absences: [],
-  noServiceToday: true
+  hasOperationalDay: false
 }
diff --git a/frontend/src/employee-mobile-frontend/child-info/AttendanceChildPage.tsx b/frontend/src/employee-mobile-frontend/child-info/AttendanceChildPage.tsx
@@ -206,14 +206,7 @@ export default React.memo(function AttendanceChildPage({
                   </Zindex>
 
                   <FlexColumn paddingHorizontal="s">
-                    {childAttendance.noServiceToday ? (
-                      <>
-                        <Center data-qa="term-break">
-                          {i18n.attendances.termBreak}
-                        </Center>
-                        <Gap size="XXL" />
-                      </>
-                    ) : (
+                    {childAttendance.hasOperationalDay ? (
                       <>
                         <AttendanceDailyServiceTimes
                           dailyServiceTimes={child.dailyServiceTimes}
@@ -230,6 +223,13 @@ export default React.memo(function AttendanceChildPage({
                           placementType={child.placementType}
                         />
                       </>
+                    ) : (
+                      <>
+                        <Center data-qa="term-break">
+                          {i18n.attendances.termBreak}
+                        </Center>
+                        <Gap size="XXL" />
+                      </>
                     )}
                     <Gap size="xs" />
                     {childAttendance.status === 'COMING' && (
@@ -246,7 +246,7 @@ export default React.memo(function AttendanceChildPage({
                       <AttendanceChildDeparted unitId={unitId} child={child} />
                     )}
                     {childAttendance.status === 'ABSENT' &&
-                      !childAttendance.noServiceToday && (
+                      childAttendance.hasOperationalDay && (
                         <AttendanceChildAbsent
                           childId={childId}
                           unitId={unitId}