Merge pull request #917 from akvo/feature/916-remove-question-in-expa…

…nded-datapoint-answer [#916] Remove question in expanded datapoint answer
akvo · Jan 15, 2024 · 818f290 · 818f290
2 parents 8e1ec9f + 5a16dcb
commit 818f290
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 33 deletions.
diff --git a/frontend/src/pages/approvals/ApprovalDetail.jsx b/frontend/src/pages/approvals/ApprovalDetail.jsx
@@ -340,17 +340,19 @@ const ApprovalDetail = ({
         const data = questionGroups.map((qg) => {
           return {
             ...qg,
-            question: qg.question.map((q) => {
-              const findValue = res.data.find(
-                (d) => d.question === q.id
-              )?.value;
-              return {
-                ...q,
-                value: findValue || findValue === 0 ? findValue : null,
-                history:
-                  res.data.find((d) => d.question === q.id)?.history || false,
-              };
-            }),
+            question: qg.question
+              .filter((item) => !item.displayOnly)
+              .map((q) => {
+                const findValue = res.data.find(
+                  (d) => d.question === q.id
+                )?.value;
+                return {
+                  ...q,
+                  value: findValue || findValue === 0 ? findValue : null,
+                  history:
+                    res.data.find((d) => d.question === q.id)?.history || false,
+                };
+              }),
           };
         });
         setRawValues((rv) =>

diff --git a/frontend/src/pages/manage-data/DataDetail.jsx b/frontend/src/pages/manage-data/DataDetail.jsx
@@ -125,17 +125,19 @@ const DataDetail = ({
         .get(`data/${id}`)
         .then((res) => {
           const data = questionGroups.map((qg) => {
-            const question = qg.question.map((q) => {
-              const findData = res.data.find((d) => d.question === q.id);
-              return {
-                ...q,
-                value:
-                  findData?.value || findData?.value === 0
-                    ? findData.value
-                    : null,
-                history: findData?.history || false,
-              };
-            });
+            const question = qg.question
+              .filter((item) => !item.displayOnly)
+              .map((q) => {
+                const findData = res.data.find((d) => d.question === q.id);
+                return {
+                  ...q,
+                  value:
+                    findData?.value || findData?.value === 0
+                      ? findData.value
+                      : null,
+                  history: findData?.history || false,
+                };
+              });
             return {
               ...qg,
               question: question,

diff --git a/frontend/src/pages/submissions/BatchDetail.jsx b/frontend/src/pages/submissions/BatchDetail.jsx
@@ -28,17 +28,20 @@ const BatchDetail = ({ expanded, setReload, deleting, handleDelete }) => {
           const data = questionGroups.map((qg) => {
             return {
               ...qg,
-              question: qg.question.map((q) => {
-                const findValue = res.data.find(
-                  (d) => d.question === q.id
-                )?.value;
-                return {
-                  ...q,
-                  value: findValue || findValue === 0 ? findValue : null,
-                  history:
-                    res.data.find((d) => d.question === q.id)?.history || false,
-                };
-              }),
+              question: qg.question
+                .filter((item) => !item.displayOnly)
+                .map((q) => {
+                  const findValue = res.data.find(
+                    (d) => d.question === q.id
+                  )?.value;
+                  return {
+                    ...q,
+                    value: findValue || findValue === 0 ? findValue : null,
+                    history:
+                      res.data.find((d) => d.question === q.id)?.history ||
+                      false,
+                  };
+                }),
             };
           });
           setRawValue({ ...expanded, data, loading: false });