From e9975000d111b140deb6d77854df39e76c8820ce Mon Sep 17 00:00:00 2001
From: wayangalihpratama <wgprtm@gmail.com>
Date: Fri, 28 Jun 2024 16:39:08 +0800
Subject: [PATCH 1/2] [#350] Fix show notif when benchmark target not set

---
 frontend/src/pages/cases/components/IncomeDriverDataEntry.js | 4 ++--
 frontend/src/pages/cases/components/IncomeDriverTarget.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/cases/components/IncomeDriverDataEntry.js b/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
index bd75c7c5..f3b518e3 100644
--- a/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
+++ b/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
@@ -7,7 +7,7 @@ import {
   removeUndefinedObjectValue,
 } from "./";
 import { api } from "../../../lib";
-import { orderBy, isEqual, isEmpty } from "lodash";
+import { orderBy, isEqual } from "lodash";
 
 const MAX_SEGMENT = 5;
 
@@ -46,7 +46,7 @@ const IncomeDriverDataEntry = ({
   const [currentValues, setCurrentValues] = useState([]);
 
   const isAllSegmentHasBenchmark = useMemo(() => {
-    const check = formValues.filter((f) => !f.target && !isEmpty(f.answers));
+    const check = formValues.filter((f) => f.target === null);
     return check;
   }, [formValues]);
 
diff --git a/frontend/src/pages/cases/components/IncomeDriverTarget.js b/frontend/src/pages/cases/components/IncomeDriverTarget.js
index 6f8588b9..ddf2247d 100644
--- a/frontend/src/pages/cases/components/IncomeDriverTarget.js
+++ b/frontend/src/pages/cases/components/IncomeDriverTarget.js
@@ -121,7 +121,7 @@ const IncomeDriverTarget = ({
       setIncomeTarget(0);
       updateFormValues({
         region: region,
-        target: 0,
+        target: null,
         benchmark: {},
         adult: null,
         child: null,

From 147e48d0dc7f6c08630b4d84c084e365a3959c87 Mon Sep 17 00:00:00 2001
From: wayangalihpratama <wgprtm@gmail.com>
Date: Fri, 28 Jun 2024 16:43:41 +0800
Subject: [PATCH 2/2] [#350] Fix benchmark not set notif

---
 frontend/src/pages/cases/components/IncomeDriverDataEntry.js | 2 +-
 frontend/src/pages/cases/components/IncomeDriverTarget.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/cases/components/IncomeDriverDataEntry.js b/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
index f3b518e3..73098825 100644
--- a/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
+++ b/frontend/src/pages/cases/components/IncomeDriverDataEntry.js
@@ -46,7 +46,7 @@ const IncomeDriverDataEntry = ({
   const [currentValues, setCurrentValues] = useState([]);
 
   const isAllSegmentHasBenchmark = useMemo(() => {
-    const check = formValues.filter((f) => f.target === null);
+    const check = formValues.filter((f) => !f.target);
     return check;
   }, [formValues]);
 
diff --git a/frontend/src/pages/cases/components/IncomeDriverTarget.js b/frontend/src/pages/cases/components/IncomeDriverTarget.js
index ddf2247d..6f8588b9 100644
--- a/frontend/src/pages/cases/components/IncomeDriverTarget.js
+++ b/frontend/src/pages/cases/components/IncomeDriverTarget.js
@@ -121,7 +121,7 @@ const IncomeDriverTarget = ({
       setIncomeTarget(0);
       updateFormValues({
         region: region,
-        target: null,
+        target: 0,
         benchmark: {},
         adult: null,
         child: null,