add json_ext (#27)

Co-authored-by: Jan <j.dolkowski@soldevelo.com>
openimis · Jan 19, 2024 · 483ba93 · 483ba93
1 parent 4c5f4ab
commit 483ba93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/components/TaskPreviewCell.js b/src/components/TaskPreviewCell.js
@@ -2,11 +2,11 @@ import React from 'react';
 import { HYPHEN } from '../constants';
 
 function TaskPreviewCell({
-  formatterIndex, itemData, incomingData, formatter,
+  formatterIndex, itemData, incomingData, formatter, jsonExt,
 }) {
   const showHistorical = (itemIncomingData) => {
-    if (formatter(itemData, formatterIndex) === formatter(itemIncomingData, formatterIndex)
-        || !formatter(itemIncomingData, formatterIndex)) {
+    if (formatter(itemData, jsonExt, formatterIndex) === formatter(itemIncomingData, jsonExt, formatterIndex)
+        || !formatter(itemIncomingData, jsonExt, formatterIndex)) {
       return HYPHEN;
     }
     return formatter(itemIncomingData, formatterIndex);
@@ -15,7 +15,7 @@ function TaskPreviewCell({
   return (
     <>
       <p>
-        {formatter(itemData, formatterIndex) ?? HYPHEN}
+        {formatter(itemData, jsonExt, formatterIndex) ?? HYPHEN}
       </p>
       <p style={{ fontWeight: 'bold' }}>
         {showHistorical(incomingData)}

diff --git a/src/components/TaskPreviewTable.js b/src/components/TaskPreviewTable.js
@@ -81,6 +81,7 @@ function TaskPreviewTable({
                 <TaskPreviewCell
                   formatter={formatter}
                   formatterIndex={formatterIndex}
+                  jsonExt={!previewItem?.jsonExt || JSON.parse(previewItem.jsonExt)}
                   itemData={previewItem.businessData?.current_data}
                   incomingData={previewItem.businessData?.incoming_data}
                 />