Resolve populate bugs

aehrc · Sep 4, 2023 · 97257d2 · 97257d2
1 parent 8c7ff37
commit 97257d2
Show file tree

Hide file tree

Showing 9 changed files with 71,233 additions and 4,001 deletions.
diff --git a/apps/smart-forms-app/src/data/resources/FormsServerBundle.json b/apps/smart-forms-app/src/data/resources/FormsServerBundle.json
diff --git a/...ata/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheckAssembled-0.1.0.json b/...ata/resources/Questionnaire-AboriginalTorresStraitIslanderHealthCheckAssembled-0.1.0.json
diff --git a/packages/sdc-populate/src/constructResponse.ts b/packages/sdc-populate/src/constructResponse.ts
@@ -288,7 +288,7 @@ function getAnswerValues(
     }
 
     // Value is string at this point
-    if (qItem.type === 'date' && checkIsDate(value)) {
+    if (qItem.type === 'date' && checkIsDateTime(value)) {
       return { valueDate: value };
     }
 
@@ -319,24 +319,15 @@ function itemIsHidden(item: QuestionnaireItem): boolean {
   );
 }
 
-/**
- * Check if an answer is a date in the formats YYYY, YYYY-MM, YYYY-MM-DD
- *
- * @author Sean Fong
- */
-export function checkIsDate(value: string): boolean {
-  const acceptedFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
-  return dayjs(value, acceptedFormats, true).isValid();
-}
-
 /**
  * Check if an answer is a datetime in the format YYYY, YYYY-MM, YYYY-MM-DD, YYYY-MM-DDThh:mm:ss+zz:zz
  *
  * @author Sean Fong
  */
 export function checkIsDateTime(value: string): boolean {
   const acceptedFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD', 'YYYY-MM-DDTHH:mm:ssZ'];
-  return moment(value, acceptedFormats, true).isValid();
+  const formattedDate = dayjs(value).format();
+  return moment(formattedDate, acceptedFormats, true).isValid();
 }
 
 /**

diff --git a/packages/sdc-populate/src/evaluateExpressions.ts b/packages/sdc-populate/src/evaluateExpressions.ts
@@ -48,6 +48,7 @@ export function evaluateExpressions(
         }
         continue;
       }
+
       initialExpressions[linkId] = initialExpression;
     }
   }

diff --git a/packages/sdc-populate/src/readPopulationExpressions.ts b/packages/sdc-populate/src/readPopulationExpressions.ts
@@ -32,7 +32,7 @@ export function readPopulationExpressions(questionnaire: Questionnaire): Populat
   if (!questionnaire.item) return populationExpressions;
 
   questionnaire.item.forEach((item) => {
-    readQuestionnaireItem(item, populationExpressions);
+    readQuestionnaireItemRecursive(item, populationExpressions);
   });
   return populationExpressions;
 }
@@ -42,15 +42,15 @@ export function readPopulationExpressions(questionnaire: Questionnaire): Populat
  *
  * @author Sean Fong
  */
-function readQuestionnaireItem(
+function readQuestionnaireItemRecursive(
   item: QuestionnaireItem,
   populationExpressions: PopulationExpressions
 ): PopulationExpressions {
   const items = item.item;
   if (items && items.length > 0) {
     // iterate through items of item recursively
     items.forEach((item) => {
-      readQuestionnaireItem(item, populationExpressions);
+      readQuestionnaireItemRecursive(item, populationExpressions);
     });
 
     // Read item population context of qGroup

diff --git a/packages/smart-forms-renderer/src/components/FormComponents/DateItem/DateItem.tsx b/packages/smart-forms-renderer/src/components/FormComponents/DateItem/DateItem.tsx
@@ -48,9 +48,14 @@ function DateItem(props: DateItemProps) {
   // Init input value
   let dateString: string | null = null;
 
-  if (qrItem?.answer && qrItem?.answer[0].valueDate) {
-    dateString = qrItem.answer[0].valueDate;
+  if (qrItem?.answer) {
+    if (qrItem?.answer[0].valueDate) {
+      dateString = qrItem.answer[0].valueDate;
+    } else if (qrItem?.answer[0].valueDateTime) {
+      dateString = qrItem.answer[0].valueDateTime;
+    }
   }
+
   const dateDayJs = dateString ? dayjs(dateString) : null;
 
   // Event handlers

diff --git a/packages/smart-forms-renderer/src/components/FormComponents/DateTimeItem/DateTimeItem.tsx b/packages/smart-forms-renderer/src/components/FormComponents/DateTimeItem/DateTimeItem.tsx
@@ -47,8 +47,12 @@ function DateTimeItem(props: DateTimeItemProps) {
 
   // Init input value
   let dateTimeString: string | null = null;
-  if (qrItem?.answer && qrItem?.answer[0].valueDateTime) {
-    dateTimeString = qrItem.answer[0].valueDateTime;
+  if (qrItem?.answer) {
+    if (qrItem?.answer[0].valueDate) {
+      dateTimeString = qrItem.answer[0].valueDate;
+    } else if (qrItem?.answer[0].valueDateTime) {
+      dateTimeString = qrItem.answer[0].valueDateTime;
+    }
   }
   const dateTimeDayJs = dateTimeString ? dayjs(dateTimeString) : null;
 

diff --git a/packages/smart-forms-renderer/src/components/FormComponents/GridGroup/GridRow.tsx b/packages/smart-forms-renderer/src/components/FormComponents/GridGroup/GridRow.tsx
@@ -23,6 +23,7 @@ import { GridAnswerTableCell, GridTextTableCell } from '../Tables/Table.styles';
 import SingleItem from '../SingleItem/SingleItem';
 import { getQrItemsIndex, mapQItemsIndex } from '../../../utils/mapItem';
 import Typography from '@mui/material/Typography';
+import useHidden from '../../../hooks/useHidden';
 
 interface GridRowProps extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem> {
   qItem: QuestionnaireItem;
@@ -40,6 +41,11 @@ function GridRow(props: GridRowProps) {
 
   const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
 
+  const itemIsHidden = useHidden(qItem);
+  if (itemIsHidden) {
+    return null;
+  }
+
   if (!rowQItems || !rowQrItems) {
     return null;
   }

diff --git a/packages/smart-forms-renderer/src/components/FormComponents/SingleItem/SingleItem.tsx b/packages/smart-forms-renderer/src/components/FormComponents/SingleItem/SingleItem.tsx
@@ -24,6 +24,7 @@ import type {
 } from '../../../interfaces/renderProps.interface';
 import useQuestionnaireStore from '../../../stores/useQuestionnaireStore';
 import SingleItemSwitcher from './SingleItemSwitcher';
+import useHidden from '../../../hooks/useHidden';
 
 interface SingleItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
@@ -48,6 +49,11 @@ function SingleItem(props: SingleItemProps) {
     [updateEnableWhenItem, onQrItemChange, qItem.linkId]
   );
 
+  const itemIsHidden = useHidden(qItem);
+  if (itemIsHidden) {
+    return null;
+  }
+
   return (
     <SingleItemSwitcher
       qItem={qItem}
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,7 @@ export function evaluateExpressions( @@
             }
             continue;
           }
           initialExpressions[linkId] = initialExpression;
         }
       }
@@ Expand Down @@