@aehrc/smart-forms-renderer 1.0.0-alpha.10 → 1.0.0-alpha.11
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/ItemParts/ItemLabelText.js +0 -2
- package/lib/components/FormComponents/ItemParts/ItemLabelText.js.map +1 -1
- package/lib/utils/manageForm.js +1 -1
- package/lib/utils/manageForm.js.map +1 -1
- package/lib/utils/mapItem.d.ts +2 -2
- package/lib/utils/mapItem.js +2 -2
- package/package.json +4 -1
- package/src/components/FormComponents/ItemParts/ItemLabelText.tsx +1 -3
- package/src/utils/manageForm.ts +1 -1
- package/src/utils/mapItem.ts +2 -2
|
@@ -52,7 +52,6 @@ const ItemLabelText = memo(function ItemLabelText(props) {
|
|
|
52
52
|
return (React.createElement(Box, { display: "flex" },
|
|
53
53
|
React.createElement(ReactMarkdown, null, markdownString),
|
|
54
54
|
required && requiredIndicatorPosition === 'end' ? (React.createElement(RequiredAsterisk, null, "*")) : null,
|
|
55
|
-
React.createElement(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly }),
|
|
56
55
|
displayFlyover !== '' ? (React.createElement(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly })) : null));
|
|
57
56
|
}
|
|
58
57
|
// labelText is empty, return null
|
|
@@ -68,7 +67,6 @@ const ItemLabelText = memo(function ItemLabelText(props) {
|
|
|
68
67
|
required && requiredIndicatorPosition === 'end' ? (React.createElement(RequiredAsterisk, null, "*")) : null,
|
|
69
68
|
displayFlyover !== '' ? (React.createElement(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly })) : null));
|
|
70
69
|
}
|
|
71
|
-
const textFontWeight = itemLabelFontWeight != 'default' ? itemLabelFontWeight : 'normal';
|
|
72
70
|
// parse regular text
|
|
73
71
|
return (React.createElement(Typography, { color: readOnly ? 'text.disabled' : 'text.primary', fontWeight: itemLabelFontWeight ? itemLabelFontWeight : 'normal', sx: { mt: 0.25 } },
|
|
74
72
|
labelText,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ItemLabelText.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemLabelText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,oCAAoC,MAAM,qDAAqD,CAAC;AACvG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAOlD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,KAAyB;;IACzE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAElC,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,yBAAyB,GAAG,uBAAuB,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC;IAE1F,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEnE,IAAI,SAAS,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,0BAA0B,GAAG,MAAA,oCAAoC,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;IACrF,IAAI,0BAA0B,EAAE;QAC9B,SAAS,GAAG,0BAA0B,CAAC;KACxC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE;QACf,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,QAAQ,EAAE,CAAC;YAC5B,WAAW;YACX,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,YAAqB,CACvC,CAAC,CAAC,CAAC,IAAI;YACP,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,CACvB,oBAAC,WAAW,IAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACpE,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAC;KACH;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE;QAClB,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM;YACjB,oBAAC,aAAa,QAAE,cAAc,CAAiB;YAC9C,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,YAAqB,CACvC,CAAC,CAAC,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"ItemLabelText.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemLabelText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,oCAAoC,MAAM,qDAAqD,CAAC;AACvG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAOlD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,KAAyB;;IACzE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAElC,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,yBAAyB,GAAG,uBAAuB,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC;IAE1F,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEnE,IAAI,SAAS,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,0BAA0B,GAAG,MAAA,oCAAoC,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;IACrF,IAAI,0BAA0B,EAAE;QAC9B,SAAS,GAAG,0BAA0B,CAAC;KACxC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE;QACf,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,QAAQ,EAAE,CAAC;YAC5B,WAAW;YACX,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,YAAqB,CACvC,CAAC,CAAC,CAAC,IAAI;YACP,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,CACvB,oBAAC,WAAW,IAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACpE,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAC;KACH;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE;QAClB,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM;YACjB,oBAAC,aAAa,QAAE,cAAc,CAAiB;YAC9C,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,YAAqB,CACvC,CAAC,CAAC,CAAC,IAAI;YAEP,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,CACvB,oBAAC,WAAW,IAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACpE,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAC;KACH;IAED,kCAAkC;IAClC,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,wBAAwB;IACxB,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjE,IAAI,YAAY,EAAE;QAChB,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QACxC,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM;YACjB,6BAAK,KAAK,EAAE,MAAM,IAAG,SAAS,CAAO;YACpC,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,YAAqB,CACvC,CAAC,CAAC,CAAC,IAAI;YACP,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,CACvB,oBAAC,WAAW,IAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACpE,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAC;KACH;IAED,qBAAqB;IACrB,OAAO,CACL,oBAAC,UAAU,IACT,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAClD,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,EAChE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;QACf,SAAS;QACT,QAAQ,IAAI,yBAAyB,KAAK,KAAK,CAAC,CAAC,CAAC,CACjD,oBAAC,gBAAgB,IACf,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAC,MAAM,EAChB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,EAChE,EAAE,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,QAEd,CACpB,CAAC,CAAC,CAAC,IAAI;QACR,oBAAC,UAAU,IAAC,SAAS,EAAC,MAAM,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAI;QAChD,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,CACvB,oBAAC,UAAU,IAAC,SAAS,EAAC,MAAM;YAC1B,oBAAC,WAAW,IAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACxD,CACd,CAAC,CAAC,CAAC,IAAI,CACG,CACd,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
|
package/lib/utils/manageForm.js
CHANGED
|
@@ -43,7 +43,7 @@ export function buildForm(questionnaire, questionnaireResponse, readOnly, termin
|
|
|
43
43
|
.buildSourceQuestionnaire(questionnaire, undefined, additionalVariables, terminologyServerUrl, undefined, qItemOverrideComponents, sdcUiOverrideComponents);
|
|
44
44
|
const initialisedQuestionnaireResponse = initialiseQuestionnaireResponse(questionnaire, questionnaireResponse);
|
|
45
45
|
questionnaireResponseStore.getState().buildSourceResponse(initialisedQuestionnaireResponse);
|
|
46
|
-
questionnaireStore.getState().updatePopulatedProperties(initialisedQuestionnaireResponse);
|
|
46
|
+
yield questionnaireStore.getState().updatePopulatedProperties(initialisedQuestionnaireResponse);
|
|
47
47
|
if (readOnly) {
|
|
48
48
|
questionnaireStore.getState().setFormAsReadOnly(readOnly);
|
|
49
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manageForm.js","sourceRoot":"","sources":["../../src/utils/manageForm.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AAIpE;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAgB,SAAS,CAC7B,aAA4B,EAC5B,qBAA6C,EAC7C,QAAkB,EAClB,oBAA6B,EAC7B,mBAA4C,EAC5C,uBAAoF,EACpF,uBAAoF;;QAEpF,2BAA2B;QAC3B,IAAI,oBAAoB,EAAE;YACxB,sBAAsB,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SAChE;aAAM;YACL,sBAAsB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;SAC9C;QAED,yIAAyI;QACzI,MAAM,kBAAkB;aACrB,QAAQ,EAAE;aACV,wBAAwB,CACvB,aAAa,EACb,SAAS,EACT,mBAAmB,EACnB,oBAAoB,EACpB,SAAS,EACT,uBAAuB,EACvB,uBAAuB,CACxB,CAAC;QAEJ,MAAM,gCAAgC,GAAG,+BAA+B,CACtE,aAAa,EACb,qBAAqB,CACtB,CAAC;QACF,0BAA0B,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;QAC5F,kBAAkB,CAAC,QAAQ,EAAE,CAAC,yBAAyB,CAAC,gCAAgC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"manageForm.js","sourceRoot":"","sources":["../../src/utils/manageForm.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/mapItem.d.ts
CHANGED
|
@@ -11,8 +11,8 @@ import type { Questionnaire, QuestionnaireItem, QuestionnaireResponseItem } from
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function getQrItemsIndex(qItems: QuestionnaireItem[], qrItems: QuestionnaireResponseItem[], qItemsIndexMap: Record<string, number>): (QuestionnaireResponseItem | QuestionnaireResponseItem[] | undefined)[];
|
|
13
13
|
/**
|
|
14
|
-
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes
|
|
15
|
-
* i.e. { ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }
|
|
14
|
+
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes `<linkId, QItemIndex>`
|
|
15
|
+
* i.e. `{ ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }`
|
|
16
16
|
* where ee2589d5, f9aaa187 and 88cab112 are linkIds of QItem0, QItem1 and QItem2 respectively
|
|
17
17
|
*
|
|
18
18
|
* @author Sean Fong
|
package/lib/utils/mapItem.js
CHANGED
|
@@ -63,8 +63,8 @@ export function getQrItemsIndex(qItems, qrItems, qItemsIndexMap) {
|
|
|
63
63
|
}, []);
|
|
64
64
|
}
|
|
65
65
|
/**
|
|
66
|
-
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes
|
|
67
|
-
* i.e. { ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }
|
|
66
|
+
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes `<linkId, QItemIndex>`
|
|
67
|
+
* i.e. `{ ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }`
|
|
68
68
|
* where ee2589d5, f9aaa187 and 88cab112 are linkIds of QItem0, QItem1 and QItem2 respectively
|
|
69
69
|
*
|
|
70
70
|
* @author Sean Fong
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aehrc/smart-forms-renderer",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.11",
|
|
4
4
|
"description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
"test": "jest",
|
|
12
12
|
"test:watch": "jest --watch",
|
|
13
13
|
"storybook": "storybook dev -p 6006",
|
|
14
|
+
"storybook-watch": "concurrently -n \"STORYBOOK,TSC\" -c \"cyan.bold,green.bold\" \"storybook dev -p 6006\" \"tsc -w\"",
|
|
14
15
|
"build-storybook": "storybook build",
|
|
15
16
|
"chromatic": "chromatic --exit-zero-on-changes"
|
|
16
17
|
},
|
|
@@ -67,6 +68,7 @@
|
|
|
67
68
|
"@storybook/addon-interactions": "^8.3.4",
|
|
68
69
|
"@storybook/addon-links": "^8.3.4",
|
|
69
70
|
"@storybook/addon-onboarding": "^8.3.4",
|
|
71
|
+
"@storybook/addon-styling": "^1.3.7",
|
|
70
72
|
"@storybook/blocks": "^8.3.4",
|
|
71
73
|
"@storybook/react": "^8.3.4",
|
|
72
74
|
"@storybook/react-vite": "^8.3.4",
|
|
@@ -90,6 +92,7 @@
|
|
|
90
92
|
"@types/react-beautiful-dnd": "^13.1.7",
|
|
91
93
|
"@types/react-dom": ">=18.2.22",
|
|
92
94
|
"chokidar": "^3.6.0",
|
|
95
|
+
"concurrently": "^9.1.0",
|
|
93
96
|
"jest": "^29.7.0",
|
|
94
97
|
"jest-environment-jsdom": "^29.7.0",
|
|
95
98
|
"storybook": "^8.3.4",
|
|
@@ -75,7 +75,7 @@ const ItemLabelText = memo(function ItemLabelText(props: ItemLabelTextProps) {
|
|
|
75
75
|
{required && requiredIndicatorPosition === 'end' ? (
|
|
76
76
|
<RequiredAsterisk>*</RequiredAsterisk>
|
|
77
77
|
) : null}
|
|
78
|
-
|
|
78
|
+
|
|
79
79
|
{displayFlyover !== '' ? (
|
|
80
80
|
<FlyoverItem displayFlyover={displayFlyover} readOnly={readOnly} />
|
|
81
81
|
) : null}
|
|
@@ -105,8 +105,6 @@ const ItemLabelText = memo(function ItemLabelText(props: ItemLabelTextProps) {
|
|
|
105
105
|
);
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
const textFontWeight = itemLabelFontWeight != 'default' ? itemLabelFontWeight : 'normal';
|
|
109
|
-
|
|
110
108
|
// parse regular text
|
|
111
109
|
return (
|
|
112
110
|
<Typography
|
package/src/utils/manageForm.ts
CHANGED
|
@@ -63,7 +63,7 @@ export async function buildForm(
|
|
|
63
63
|
questionnaireResponse
|
|
64
64
|
);
|
|
65
65
|
questionnaireResponseStore.getState().buildSourceResponse(initialisedQuestionnaireResponse);
|
|
66
|
-
questionnaireStore.getState().updatePopulatedProperties(initialisedQuestionnaireResponse);
|
|
66
|
+
await questionnaireStore.getState().updatePopulatedProperties(initialisedQuestionnaireResponse);
|
|
67
67
|
|
|
68
68
|
if (readOnly) {
|
|
69
69
|
questionnaireStore.getState().setFormAsReadOnly(readOnly);
|
package/src/utils/mapItem.ts
CHANGED
|
@@ -80,8 +80,8 @@ export function getQrItemsIndex(
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
/**
|
|
83
|
-
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes
|
|
84
|
-
* i.e. { ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }
|
|
83
|
+
* Generate a dictionary of QuestionnaireItems linkIds mapped to their respective array indexes `<linkId, QItemIndex>`
|
|
84
|
+
* i.e. `{ ee2589d5: 0, f9aaa187: 1, 88cab112: 2 }`
|
|
85
85
|
* where ee2589d5, f9aaa187 and 88cab112 are linkIds of QItem0, QItem1 and QItem2 respectively
|
|
86
86
|
*
|
|
87
87
|
* @author Sean Fong
|