@aehrc/smart-forms-renderer 0.6.5 → 0.6.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/FormComponents/DateItem/DateItem.js +7 -2
- package/lib/components/FormComponents/DateItem/DateItem.js.map +1 -1
- package/lib/components/FormComponents/DateTimeItem/DateTimeItem.js +7 -2
- package/lib/components/FormComponents/DateTimeItem/DateTimeItem.js.map +1 -1
- package/lib/components/FormComponents/GridGroup/GridRow.js +5 -0
- package/lib/components/FormComponents/GridGroup/GridRow.js.map +1 -1
- package/lib/components/FormComponents/SingleItem/SingleItem.d.ts +1 -1
- package/lib/components/FormComponents/SingleItem/SingleItem.js +5 -0
- package/lib/components/FormComponents/SingleItem/SingleItem.js.map +1 -1
- package/lib/interfaces/questionnaireStore.interface.d.ts +1 -1
- package/lib/utils/removeHidden.d.ts +1 -1
- package/lib/utils/removeHidden.js.map +1 -1
- package/package.json +1 -1
- package/src/components/FormComponents/DateItem/DateItem.tsx +7 -2
- package/src/components/FormComponents/DateTimeItem/DateTimeItem.tsx +6 -2
- package/src/components/FormComponents/GridGroup/GridRow.tsx +6 -0
- package/src/components/FormComponents/SingleItem/SingleItem.tsx +6 -0
- package/src/interfaces/questionnaireStore.interface.ts +1 -1
- package/src/utils/removeHidden.ts +1 -4
|
@@ -27,8 +27,13 @@ function DateItem(props) {
|
|
|
27
27
|
const { displayPrompt, displayInstructions, readOnly, entryFormat } = useRenderingExtensions(qItem);
|
|
28
28
|
// Init input value
|
|
29
29
|
let dateString = null;
|
|
30
|
-
if (
|
|
31
|
-
|
|
30
|
+
if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) {
|
|
31
|
+
if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer[0].valueDate) {
|
|
32
|
+
dateString = qrItem.answer[0].valueDate;
|
|
33
|
+
}
|
|
34
|
+
else if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer[0].valueDateTime) {
|
|
35
|
+
dateString = qrItem.answer[0].valueDateTime;
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
const dateDayJs = dateString ? dayjs(dateString) : null;
|
|
34
39
|
// Event handlers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/DateItem/DateItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,SAAS,QAAQ,CAAC,KAAoB;IACpC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAEtE,sCAAsC;IACtC,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,EAAE,GACjE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEhC,mBAAmB;IACnB,IAAI,UAAU,GAAkB,IAAI,CAAC;IAErC,IAAI,
|
|
1
|
+
{"version":3,"file":"DateItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/DateItem/DateItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,SAAS,QAAQ,CAAC,KAAoB;IACpC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAEtE,sCAAsC;IACtC,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,EAAE,GACjE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEhC,mBAAmB;IACnB,IAAI,UAAU,GAAkB,IAAI,CAAC;IAErC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;QAClB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE;YAC/B,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;SACzC;aAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAC,EAAE,aAAa,EAAE;YAC1C,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;SAC7C;KACF;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAExD,iBAAiB;IACjB,SAAS,gBAAgB,CAAC,QAAsB;QAC9C,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,QAAQ,EAAE;YACZ,cAAc,iCAAM,WAAW,KAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,IAAG,CAAC;SAC5F;aAAM;YACL,cAAc,CAAC,WAAW,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,IAAI,UAAU,EAAE;QACd,OAAO,CACL,oBAAC,SAAS,IACR,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;KACH;IAED,OAAO,CACL,oBAAC,yBAAyB,iBAAW,iBAAiB;QACpD,oBAAC,aAAa,IAAC,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,mBAAmB;YACnE,oBAAC,SAAS,IACR,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,QAAQ,GAClB,CACY,CACU,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,QAAQ,CAAC"}
|
|
@@ -27,8 +27,13 @@ function DateTimeItem(props) {
|
|
|
27
27
|
const { displayPrompt, displayInstructions, readOnly, entryFormat } = useRenderingExtensions(qItem);
|
|
28
28
|
// Init input value
|
|
29
29
|
let dateTimeString = null;
|
|
30
|
-
if (
|
|
31
|
-
|
|
30
|
+
if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) {
|
|
31
|
+
if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer[0].valueDate) {
|
|
32
|
+
dateTimeString = qrItem.answer[0].valueDate;
|
|
33
|
+
}
|
|
34
|
+
else if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer[0].valueDateTime) {
|
|
35
|
+
dateTimeString = qrItem.answer[0].valueDateTime;
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
const dateTimeDayJs = dateTimeString ? dayjs(dateTimeString) : null;
|
|
34
39
|
// Event handlers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTimeItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/DateTimeItem/DateTimeItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,SAAS,YAAY,CAAC,KAAwB;IAC5C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAEtE,sCAAsC;IACtC,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,EAAE,GACjE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEhC,mBAAmB;IACnB,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,IAAI,
|
|
1
|
+
{"version":3,"file":"DateTimeItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/DateTimeItem/DateTimeItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,SAAS,YAAY,CAAC,KAAwB;IAC5C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAEtE,sCAAsC;IACtC,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,EAAE,GACjE,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEhC,mBAAmB;IACnB,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;QAClB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE;YAC/B,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;SAC7C;aAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAC,EAAE,aAAa,EAAE;YAC1C,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;SACjD;KACF;IACD,MAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpE,iBAAiB;IACjB,SAAS,oBAAoB,CAAC,QAAsB;QAClD,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,QAAQ,EAAE;YACZ,cAAc,iCAAM,WAAW,KAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,IAAG,CAAC;SACpF;aAAM;YACL,cAAc,CAAC,WAAW,CAAC,CAAC;SAC7B;IACH,CAAC;IAED,IAAI,UAAU,EAAE;QACd,OAAO,CACL,oBAAC,aAAa,IACZ,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;KACH;IAED,OAAO,CACL,oBAAC,yBAAyB,iBAAW,sBAAsB;QACzD,oBAAC,aAAa,IAAC,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,mBAAmB;YACnE,oBAAC,aAAa,IACZ,KAAK,EAAE,aAAa,EACpB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,oBAAoB,EACtC,QAAQ,EAAE,QAAQ,GAClB,CACY,CACU,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -20,12 +20,17 @@ import { GridAnswerTableCell, GridTextTableCell } from '../Tables/Table.styles';
|
|
|
20
20
|
import SingleItem from '../SingleItem/SingleItem';
|
|
21
21
|
import { getQrItemsIndex, mapQItemsIndex } from '../../../utils/mapItem';
|
|
22
22
|
import Typography from '@mui/material/Typography';
|
|
23
|
+
import useHidden from '../../../hooks/useHidden';
|
|
23
24
|
function GridRow(props) {
|
|
24
25
|
const { qItem, qrItem, columnLabels, numOfColumns, onQrItemChange } = props;
|
|
25
26
|
const rowQItems = qItem.item;
|
|
26
27
|
const row = qrItem && qrItem.item ? qrItem : createQrGroup(qItem);
|
|
27
28
|
const rowQrItems = row.item;
|
|
28
29
|
const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
|
|
30
|
+
const itemIsHidden = useHidden(qItem);
|
|
31
|
+
if (itemIsHidden) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
29
34
|
if (!rowQItems || !rowQrItems) {
|
|
30
35
|
return null;
|
|
31
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GridRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridRow.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,UAAU,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"GridRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridRow.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,SAAS,MAAM,0BAA0B,CAAC;AASjD,SAAS,OAAO,CAAC,KAAmB;IAClC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAE5E,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAE5B,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IAED,SAAS,qBAAqB,CAAC,YAAuC;QACpE,MAAM,KAAK,qBAAmC,GAAG,CAAE,CAAC;QACpD,aAAa,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QACzD,cAAc,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9E,OAAO,CACL;QACE,oBAAC,iBAAiB;YAChB,oBAAC,UAAU,IAAC,UAAU,EAAC,MAAM,IAAE,KAAK,CAAC,IAAI,CAAc,CACrC;QACnB,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YAClC,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAEzC,2EAA2E;YAC3E,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,IAAI,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACb;YAED,OAAO,CACL,oBAAC,mBAAmB,IAAC,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY;gBACzD,oBAAC,UAAU,IACT,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,cAAc,EAAE,qBAAqB,GACrC,CACkB,CACvB,CAAC;QACJ,CAAC,CAAC,CACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -5,5 +5,5 @@ interface SingleItemProps extends PropsWithQrItemChangeHandler<QuestionnaireResp
|
|
|
5
5
|
qItem: QuestionnaireItem;
|
|
6
6
|
qrItem: QuestionnaireResponseItem;
|
|
7
7
|
}
|
|
8
|
-
declare function SingleItem(props: SingleItemProps): React.JSX.Element;
|
|
8
|
+
declare function SingleItem(props: SingleItemProps): React.JSX.Element | null;
|
|
9
9
|
export default SingleItem;
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
import React, { useCallback } from 'react';
|
|
18
18
|
import useQuestionnaireStore from '../../../stores/useQuestionnaireStore';
|
|
19
19
|
import SingleItemSwitcher from './SingleItemSwitcher';
|
|
20
|
+
import useHidden from '../../../hooks/useHidden';
|
|
20
21
|
function SingleItem(props) {
|
|
21
22
|
const { qItem, qrItem, isRepeated, isTabled, onQrItemChange } = props;
|
|
22
23
|
const updateEnableWhenItem = useQuestionnaireStore((state) => state.updateEnableWhenItem);
|
|
@@ -26,6 +27,10 @@ function SingleItem(props) {
|
|
|
26
27
|
}
|
|
27
28
|
onQrItemChange(newQrItem);
|
|
28
29
|
}, [updateEnableWhenItem, onQrItemChange, qItem.linkId]);
|
|
30
|
+
const itemIsHidden = useHidden(qItem);
|
|
31
|
+
if (itemIsHidden) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
29
34
|
return (React.createElement(SingleItemSwitcher, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, onQrItemChange: handleQrItemChange }));
|
|
30
35
|
}
|
|
31
36
|
export default SingleItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SingleItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/SingleItem/SingleItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAO3C,OAAO,qBAAqB,MAAM,uCAAuC,CAAC;AAC1E,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"SingleItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/SingleItem/SingleItem.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAO3C,OAAO,qBAAqB,MAAM,uCAAuC,CAAC;AAC1E,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAUjD,SAAS,UAAU,CAAC,KAAsB;IACxC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAEtE,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAE1F,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,SAAoC,EAAE,EAAE;QACvC,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;SACtD;QACD,cAAc,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,EACD,CAAC,oBAAoB,EAAE,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CACrD,CAAC;IAEF,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,oBAAC,kBAAkB,IACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,kBAAkB,GAClC,CACH,CAAC;AACJ,CAAC;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tabs } from '
|
|
1
|
+
import type { Tabs } from './tab.interface';
|
|
2
2
|
import type { Variables } from './variables.interface';
|
|
3
3
|
import type { LaunchContext } from './populate.interface';
|
|
4
4
|
import type { EnableWhenExpression, EnableWhenItemProperties } from './enableWhen.interface';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
|
|
2
|
-
import type { EnableWhenExpression, EnableWhenItems } from '
|
|
2
|
+
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
3
3
|
interface removeHiddenAnswersParams {
|
|
4
4
|
questionnaire: Questionnaire;
|
|
5
5
|
questionnaireResponse: QuestionnaireResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeHidden.js","sourceRoot":"","sources":["../../src/utils/removeHidden.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;
|
|
1
|
+
{"version":3,"file":"removeHidden.js","sourceRoot":"","sources":["../../src/utils/removeHidden.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -48,9 +48,14 @@ function DateItem(props: DateItemProps) {
|
|
|
48
48
|
// Init input value
|
|
49
49
|
let dateString: string | null = null;
|
|
50
50
|
|
|
51
|
-
if (qrItem?.answer
|
|
52
|
-
|
|
51
|
+
if (qrItem?.answer) {
|
|
52
|
+
if (qrItem?.answer[0].valueDate) {
|
|
53
|
+
dateString = qrItem.answer[0].valueDate;
|
|
54
|
+
} else if (qrItem?.answer[0].valueDateTime) {
|
|
55
|
+
dateString = qrItem.answer[0].valueDateTime;
|
|
56
|
+
}
|
|
53
57
|
}
|
|
58
|
+
|
|
54
59
|
const dateDayJs = dateString ? dayjs(dateString) : null;
|
|
55
60
|
|
|
56
61
|
// Event handlers
|
|
@@ -47,8 +47,12 @@ function DateTimeItem(props: DateTimeItemProps) {
|
|
|
47
47
|
|
|
48
48
|
// Init input value
|
|
49
49
|
let dateTimeString: string | null = null;
|
|
50
|
-
if (qrItem?.answer
|
|
51
|
-
|
|
50
|
+
if (qrItem?.answer) {
|
|
51
|
+
if (qrItem?.answer[0].valueDate) {
|
|
52
|
+
dateTimeString = qrItem.answer[0].valueDate;
|
|
53
|
+
} else if (qrItem?.answer[0].valueDateTime) {
|
|
54
|
+
dateTimeString = qrItem.answer[0].valueDateTime;
|
|
55
|
+
}
|
|
52
56
|
}
|
|
53
57
|
const dateTimeDayJs = dateTimeString ? dayjs(dateTimeString) : null;
|
|
54
58
|
|
|
@@ -23,6 +23,7 @@ import { GridAnswerTableCell, GridTextTableCell } from '../Tables/Table.styles';
|
|
|
23
23
|
import SingleItem from '../SingleItem/SingleItem';
|
|
24
24
|
import { getQrItemsIndex, mapQItemsIndex } from '../../../utils/mapItem';
|
|
25
25
|
import Typography from '@mui/material/Typography';
|
|
26
|
+
import useHidden from '../../../hooks/useHidden';
|
|
26
27
|
|
|
27
28
|
interface GridRowProps extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem> {
|
|
28
29
|
qItem: QuestionnaireItem;
|
|
@@ -40,6 +41,11 @@ function GridRow(props: GridRowProps) {
|
|
|
40
41
|
|
|
41
42
|
const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
|
|
42
43
|
|
|
44
|
+
const itemIsHidden = useHidden(qItem);
|
|
45
|
+
if (itemIsHidden) {
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
|
|
43
49
|
if (!rowQItems || !rowQrItems) {
|
|
44
50
|
return null;
|
|
45
51
|
}
|
|
@@ -24,6 +24,7 @@ import type {
|
|
|
24
24
|
} from '../../../interfaces/renderProps.interface';
|
|
25
25
|
import useQuestionnaireStore from '../../../stores/useQuestionnaireStore';
|
|
26
26
|
import SingleItemSwitcher from './SingleItemSwitcher';
|
|
27
|
+
import useHidden from '../../../hooks/useHidden';
|
|
27
28
|
|
|
28
29
|
interface SingleItemProps
|
|
29
30
|
extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
|
|
@@ -48,6 +49,11 @@ function SingleItem(props: SingleItemProps) {
|
|
|
48
49
|
[updateEnableWhenItem, onQrItemChange, qItem.linkId]
|
|
49
50
|
);
|
|
50
51
|
|
|
52
|
+
const itemIsHidden = useHidden(qItem);
|
|
53
|
+
if (itemIsHidden) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
|
|
51
57
|
return (
|
|
52
58
|
<SingleItemSwitcher
|
|
53
59
|
qItem={qItem}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
|
|
18
|
-
import type { Tabs } from '
|
|
18
|
+
import type { Tabs } from './tab.interface';
|
|
19
19
|
import type { Variables } from './variables.interface';
|
|
20
20
|
import type { LaunchContext } from './populate.interface';
|
|
21
21
|
import type { EnableWhenExpression, EnableWhenItemProperties } from './enableWhen.interface';
|
|
@@ -21,10 +21,7 @@ import type {
|
|
|
21
21
|
QuestionnaireResponse,
|
|
22
22
|
QuestionnaireResponseItem
|
|
23
23
|
} from 'fhir/r4';
|
|
24
|
-
import type {
|
|
25
|
-
EnableWhenExpression,
|
|
26
|
-
EnableWhenItems
|
|
27
|
-
} from 'smart-forms-app/src/types/enableWhen.interface';
|
|
24
|
+
import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
|
|
28
25
|
import { isHidden } from './qItem';
|
|
29
26
|
|
|
30
27
|
interface removeHiddenAnswersParams {
|