Merge pull request #366 from lara-learning/fix/change-entries-when-half-days-disabled

fix: change entries

Author: Julian-Wogersien

packages/backend/src/resolvers/entry.resolver.ts

@@ -99,10 +99,10 @@ export const entryTraineeResolver: GqlResolvers<TraineeContext> = {
 
       validateEntryUpdate(report, day, entry, currentUser.language)
 
-      entry.text = input.text
-      entry.time = input.time
-      entry.text_split = input.text_split
-      entry.time_split = input.time_split
+      entry.text = input.text ? input.text : ''
+      entry.time = input.time ? input.time : 0
+      entry.text_split = input.text_split ? input.text_split : ''
+      entry.time_split = input.time_split ? input.time_split : 0
 
       await updateReport(report, { updateKeys: ['days'] })
 

packages/frontend/src/pages/report-review-page.tsx

@@ -396,6 +396,7 @@ const ReportReviewPage: React.FunctionComponent = () => {
                       <>
                         {day.entries
                           .filter((entry) => entry.text !== null)
+                          .filter((entry) => entry.text !== '')
                           .map((entry, entryIndex) => (
                             <EntryInput
                               term=""
@@ -425,6 +426,7 @@ const ReportReviewPage: React.FunctionComponent = () => {
                         </Flex>
                         {day.entries
                           .filter((entry) => entry.text_split !== null)
+                          .filter((entry) => entry.text_split !== '')
                           .map((entry, entryIndex) => (
                             <EntryInput
                               term=""