From 5613788d360d3140ad00f8300ea309a392aa957c Mon Sep 17 00:00:00 2001
From: dedenbangkit <mail@dedenbangkit.com>
Date: Fri, 19 Jan 2024 10:40:37 +0700
Subject: [PATCH] [#916] Add display only to config.js, modify data expand

---
 backend/api/v1/v1_forms/serializers.py          |  2 +-
 frontend/src/pages/approvals/ApprovalDetail.jsx |  2 +-
 frontend/src/pages/manage-data/DataDetail.jsx   |  2 +-
 frontend/src/pages/submissions/BatchDetail.jsx  | 11 ++++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/api/v1/v1_forms/serializers.py b/backend/api/v1/v1_forms/serializers.py
index bf83d030b..07026fb72 100644
--- a/backend/api/v1/v1_forms/serializers.py
+++ b/backend/api/v1/v1_forms/serializers.py
@@ -318,7 +318,7 @@ class Meta:
         fields = [
             'id', 'form', 'question_group', 'name', 'text', 'order', 'meta',
             'api', 'type', 'required', 'rule', 'option', 'dependency',
-            'attributes'
+            'display_only', 'attributes'
         ]
 
 
diff --git a/frontend/src/pages/approvals/ApprovalDetail.jsx b/frontend/src/pages/approvals/ApprovalDetail.jsx
index 970c12942..ada3b63ce 100644
--- a/frontend/src/pages/approvals/ApprovalDetail.jsx
+++ b/frontend/src/pages/approvals/ApprovalDetail.jsx
@@ -340,7 +340,7 @@ const ApprovalDetail = ({
           return {
             ...qg,
             question: qg.question
-              .filter((item) => !item.displayOnly)
+              .filter((item) => !item?.display_only)
               .map((q) => {
                 const findValue = res.data.find(
                   (d) => d.question === q.id
diff --git a/frontend/src/pages/manage-data/DataDetail.jsx b/frontend/src/pages/manage-data/DataDetail.jsx
index b9701f3ad..8f2b1fe51 100644
--- a/frontend/src/pages/manage-data/DataDetail.jsx
+++ b/frontend/src/pages/manage-data/DataDetail.jsx
@@ -126,7 +126,7 @@ const DataDetail = ({
         .then((res) => {
           const data = questionGroups.map((qg) => {
             const question = qg.question
-              .filter((item) => !item.displayOnly)
+              .filter((item) => !item?.display_only)
               .map((q) => {
                 const findData = res.data.find((d) => d.question === q.id);
                 return {
diff --git a/frontend/src/pages/submissions/BatchDetail.jsx b/frontend/src/pages/submissions/BatchDetail.jsx
index c6bb2553a..85ba72f9f 100644
--- a/frontend/src/pages/submissions/BatchDetail.jsx
+++ b/frontend/src/pages/submissions/BatchDetail.jsx
@@ -16,8 +16,13 @@ const BatchDetail = ({ expanded, setReload, deleting, handleDelete }) => {
     return uiText[activeLang];
   }, [activeLang]);
 
-  const questionGroups = window.forms.find((f) => f.id === expanded.form)
-    ?.content?.question_group;
+  const questionGroups = window.forms
+    .find((f) => f.id === expanded.form)
+    ?.content?.question_group?.filter(
+      (qg) =>
+        qg.question?.length ===
+        qg.question.filter((q) => !q?.display_only).length
+    );
 
   useEffect(() => {
     if (questionGroups) {
@@ -29,7 +34,7 @@ const BatchDetail = ({ expanded, setReload, deleting, handleDelete }) => {
             return {
               ...qg,
               question: qg.question
-                .filter((item) => !item.displayOnly)
+                .filter((item) => !item?.display_only)
                 .map((q) => {
                   const findValue = res.data.find(
                     (d) => d.question === q.id