@openmrs/esm-fast-data-entry-app 1.0.1-pre.127 → 1.0.1-pre.128

package/dist/openmrs-esm-fast-data-entry-app.js.buildmanifest.json

@@ -5,10 +5,35 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 3686,
+      "reason": "split chunk (cache group: default)",
+      "size": 33069,
+      "sizes": {
+        "javascript": 33069
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-fast-data-entry-app",
+        "main"
+      ],
+      "files": [
+        "129.js"
+      ],
+      "auxiliaryFiles": [
+        "129.js.map"
+      ],
+      "hash": "e8ae4551aa0d5373",
+      "childrenByOrder": {}
+    },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 4296,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 3644
+        "javascript": 4254
       },
       "names": [],
       "idHints": [],
@@ -21,7 +46,7 @@
       "auxiliaryFiles": [
         "153.js.map"
       ],
-      "hash": "126e60e969bd28b8",
+      "hash": "fae59810468fd55f",
       "childrenByOrder": {}
     },
     {
@@ -29,10 +54,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 25371,
+      "size": 25981,
       "sizes": {
         "consume-shared": 42,
-        "javascript": 3644,
+        "javascript": 4254,
         "share-init": 336,
         "runtime": 21349
       },
@@ -49,7 +74,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "73f7b8341c1676ce",
+      "hash": "6efd2ce10c1955f8",
       "childrenByOrder": {}
     },
     {
@@ -94,7 +119,7 @@
       "auxiliaryFiles": [
         "208.js.map"
       ],
-      "hash": "b1b1d768a028963c",
+      "hash": "5e0e7e25b7483016",
       "childrenByOrder": {}
     },
     {
@@ -102,11 +127,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 57424,
+      "size": 7103,
       "sizes": {
-        "javascript": 57382,
-        "consume-shared": 42
+        "javascript": 7103
       },
       "names": [],
       "idHints": [],
@@ -115,12 +138,12 @@
         "main"
       ],
       "files": [
-        "262.js"
+        "294.js"
       ],
       "auxiliaryFiles": [
-        "262.js.map"
+        "294.js.map"
       ],
-      "hash": "e5d903fa6f684231",
+      "hash": "8eb39e4e55a4f546",
       "childrenByOrder": {}
     },
     {
@@ -128,10 +151,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 160059,
+      "size": 3299,
       "sizes": {
-        "javascript": 160017,
-        "consume-shared": 42
+        "javascript": 3299
       },
       "names": [],
       "idHints": [],
@@ -140,12 +162,10 @@
         "main"
       ],
       "files": [
-        "279.js"
-      ],
-      "auxiliaryFiles": [
-        "279.js.map"
+        "319.js"
       ],
-      "hash": "6a85219975d70c1d",
+      "auxiliaryFiles": [],
+      "hash": "c015935a478dda18",
       "childrenByOrder": {}
     },
     {
@@ -153,9 +173,10 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 7103,
+      "size": 134801,
       "sizes": {
-        "javascript": 7103
+        "javascript": 134759,
+        "consume-shared": 42
       },
       "names": [],
       "idHints": [],
@@ -164,34 +185,12 @@
         "main"
       ],
       "files": [
-        "294.js"
+        "365.js"
       ],
       "auxiliaryFiles": [
-        "294.js.map"
-      ],
-      "hash": "8eb39e4e55a4f546",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 3064,
-      "sizes": {
-        "javascript": 3064
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-fast-data-entry-app",
-        "main"
+        "365.js.map"
       ],
-      "files": [
-        "319.js"
-      ],
-      "auxiliaryFiles": [],
-      "hash": "0949ab32d9aeff5a",
+      "hash": "2e6b0af471e92920",
       "childrenByOrder": {}
     },
     {
@@ -243,14 +242,13 @@
       "childrenByOrder": {}
     },
     {
-      "rendered": false,
+      "rendered": true,
       "initial": false,
       "entry": false,
       "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 42,
+      "size": 400,
       "sizes": {
-        "consume-shared": 42
+        "javascript": 400
       },
       "names": [],
       "idHints": [],
@@ -258,9 +256,13 @@
         "@openmrs/esm-fast-data-entry-app",
         "main"
       ],
-      "files": [],
-      "auxiliaryFiles": [],
-      "hash": "97a5374ef7355233",
+      "files": [
+        "415.js"
+      ],
+      "auxiliaryFiles": [
+        "415.js.map"
+      ],
+      "hash": "dede8f046ad98c9b",
       "childrenByOrder": {}
     },
     {
@@ -268,9 +270,11 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 400,
+      "reason": "split chunk (cache group: default)",
+      "size": 82756,
       "sizes": {
-        "javascript": 400
+        "javascript": 82714,
+        "consume-shared": 42
       },
       "names": [],
       "idHints": [],
@@ -279,12 +283,12 @@
         "main"
       ],
       "files": [
-        "415.js"
+        "436.js"
       ],
       "auxiliaryFiles": [
-        "415.js.map"
+        "436.js.map"
       ],
-      "hash": "dede8f046ad98c9b",
+      "hash": "e650ac391294ec04",
       "childrenByOrder": {}
     },
     {
@@ -311,7 +315,7 @@
       "auxiliaryFiles": [
         "openmrs-esm-fast-data-entry-app.js.map"
       ],
-      "hash": "d67a6ac76ee7d773",
+      "hash": "ececcaf6ccc4ed45",
       "childrenByOrder": {}
     },
     {
@@ -319,9 +323,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2613,
+      "size": 2814,
       "sizes": {
-        "javascript": 2613
+        "javascript": 2814
       },
       "names": [],
       "idHints": [],
@@ -333,7 +337,7 @@
         "460.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "3f81d8a7f6ab4a6a",
+      "hash": "ba8802233b03121d",
       "childrenByOrder": {}
     },
     {
@@ -422,9 +426,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 79976,
+      "size": 61957,
       "sizes": {
-        "javascript": 79976
+        "javascript": 61957
       },
       "names": [],
       "idHints": [],
@@ -438,7 +442,7 @@
       "auxiliaryFiles": [
         "540.js.map"
       ],
-      "hash": "fe9a7e7357e69061",
+      "hash": "ac99f86398137b46",
       "childrenByOrder": {}
     },
     {
@@ -473,9 +477,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2693,
+      "size": 2894,
       "sizes": {
-        "javascript": 2693
+        "javascript": 2894
       },
       "names": [],
       "idHints": [],
@@ -487,7 +491,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "e110ffd83ac1f796",
+      "hash": "0c5a8a30f7b9dd9e",
       "childrenByOrder": {}
     },
     {
@@ -514,7 +518,7 @@
       "auxiliaryFiles": [
         "591.js.map"
       ],
-      "hash": "8012cc220c8b3404",
+      "hash": "29819f58e854e7cc",
       "childrenByOrder": {}
     },
     {
@@ -538,7 +542,7 @@
       "auxiliaryFiles": [
         "593.js.map"
       ],
-      "hash": "27530c0417ab2d57",
+      "hash": "142d85a741dfee21",
       "childrenByOrder": {}
     },
     {
@@ -584,7 +588,7 @@
       "auxiliaryFiles": [
         "706.js.map"
       ],
-      "hash": "7569369529f6dbb4",
+      "hash": "16ef31285eabbf1b",
       "childrenByOrder": {}
     },
     {
@@ -619,9 +623,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2996,
+      "size": 3236,
       "sizes": {
-        "javascript": 2996
+        "javascript": 3236
       },
       "names": [],
       "idHints": [],
@@ -633,7 +637,7 @@
         "757.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "78fe1b3cfb12e8b1",
+      "hash": "af6e35644c6d92c3",
       "childrenByOrder": {}
     },
     {
@@ -641,9 +645,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2693,
+      "size": 2894,
       "sizes": {
-        "javascript": 2693
+        "javascript": 2894
       },
       "names": [],
       "idHints": [],
@@ -655,7 +659,7 @@
         "788.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "aa5d121ccf466adc",
+      "hash": "89dd510675bbac2c",
       "childrenByOrder": {}
     },
     {
@@ -690,9 +694,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2693,
+      "size": 2894,
       "sizes": {
-        "javascript": 2693
+        "javascript": 2894
       },
       "names": [],
       "idHints": [],
@@ -704,7 +708,7 @@
         "807.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "c8051df23a720720",
+      "hash": "9339e1ee968c4dda",
       "childrenByOrder": {}
     },
     {
@@ -712,9 +716,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 2693,
+      "size": 2894,
       "sizes": {
-        "javascript": 2693
+        "javascript": 2894
       },
       "names": [],
       "idHints": [],
@@ -726,7 +730,7 @@
         "833.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "53ab09deb6fa51ed",
+      "hash": "fdbcecc5ce4c889c",
       "childrenByOrder": {}
     },
     {
@@ -734,9 +738,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 44636,
+      "size": 47756,
       "sizes": {
-        "javascript": 44636
+        "javascript": 47756
       },
       "names": [],
       "idHints": [],
@@ -750,32 +754,7 @@
       "auxiliaryFiles": [
         "883.js.map"
       ],
-      "hash": "39d6d7dda0f5b34c",
-      "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "reason": "split chunk (cache group: default)",
-      "size": 25833,
-      "sizes": {
-        "javascript": 25833
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-fast-data-entry-app",
-        "main"
-      ],
-      "files": [
-        "889.js"
-      ],
-      "auxiliaryFiles": [
-        "889.js.map"
-      ],
-      "hash": "7b8112e6a500a6e9",
+      "hash": "def52f9866894b82",
       "childrenByOrder": {}
     },
     {
@@ -831,6 +810,27 @@
       ],
       "hash": "af68757824b57b16",
       "childrenByOrder": {}
+    },
+    {
+      "rendered": false,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "reason": "split chunk (cache group: default)",
+      "size": 42,
+      "sizes": {
+        "consume-shared": 42
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-fast-data-entry-app",
+        "main"
+      ],
+      "files": [],
+      "auxiliaryFiles": [],
+      "hash": "b2db37983a098c95",
+      "childrenByOrder": {}
     }
   ]
 }

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","webservices.rest":"^2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.0.1-pre.127"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","webservices.rest":"^2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.0.1-pre.128"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-fast-data-entry-app",
-  "version": "1.0.1-pre.127",
+  "version": "1.0.1-pre.128",
   "license": "MPL-2.0",
   "description": "An OpenMRS 3.x microfrontend",
   "browser": "dist/openmrs-esm-fast-data-entry-app.js",

package/src/FormBootstrap.tsx

@@ -1,6 +1,7 @@
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { detach, ExtensionSlot } from "@openmrs/esm-framework";
 import useGetPatient from "./hooks/useGetPatient";
+import GroupFormWorkflowContext from "./context/GroupFormWorkflowContext";
 
 export interface Order {
   uuid: string;
@@ -98,12 +99,18 @@ export interface Encounter {
   obs: Array<Observation>;
   orders: Array<Order>;
 }
+
+type PreFilledQuestions = {
+  [key: string]: string;
+};
+
 interface FormParams {
   formUuid: string;
   patientUuid: string;
   visitUuid?: string;
   visitTypeUuid?: string;
   encounterUuid?: string;
+  preFilledQuestions?: PreFilledQuestions;
   showDiscardSubmitButtons?: boolean;
   handlePostResponse?: (Encounter) => void;
   handleEncounterCreate?: (Object) => void;
@@ -121,6 +128,7 @@ const FormBootstrap = ({
   handleOnValidate,
 }: FormParams) => {
   const patient = useGetPatient(patientUuid);
+  const { activeSessionMeta } = useContext(GroupFormWorkflowContext);
 
   useEffect(() => {
     return () => detach("form-widget-slot", "form-widget-slot");
@@ -156,6 +164,7 @@ const FormBootstrap = ({
             handleEncounterCreate,
             handleOnValidate,
             showDiscardSubmitButtons: false,
+            preFilledQuestions: { ...activeSessionMeta },
           }}
         />
       )}

package/src/config-schema.ts

@@ -82,6 +82,26 @@ export const configSchema = {
       _default: "fa8fedc0-c066-4da3-8dc1-2ad8621fc480",
     },
   },
+  specificQuestions: {
+    _type: Type.Array,
+    _description: "List of specific questions to populate forms.",
+    _elements: {
+      forms: {
+        _type: Type.Array,
+        _description: "List of form UUIDs for which the question applies.",
+        _elements: {
+          _type: Type.UUID,
+        },
+        _default: [],
+      },
+      questionId: {
+        _type: Type.String,
+        _description: "ID of the question.",
+        _default: "",
+      },
+    },
+    _default: [],
+  },
 };
 
 export type Form = {

package/src/group-form-entry-workflow/SessionDetailsForm.tsx

@@ -7,14 +7,26 @@ import {
   DatePickerInput,
 } from "@carbon/react";
 import React, { useContext } from "react";
+import { useConfig } from "@openmrs/esm-framework";
+import { useParams } from "react-router-dom";
 import styles from "./styles.scss";
 import { useTranslation } from "react-i18next";
 import { Controller, useFormContext } from "react-hook-form";
 import { AttendanceTable } from "./attendance-table";
 import GroupFormWorkflowContext from "../context/GroupFormWorkflowContext";
 import useGetPatients from "../hooks/useGetPatients";
+import ConfigurableQuestionsSection from "./configurable-questions/ConfigurableQuestionsSection";
+import useSpecificQuestions from "../hooks/useForm";
+
+interface ParamTypes {
+  formUuid?: string;
+}
 
 const SessionDetailsForm = () => {
+  const { specificQuestions } = useConfig();
+  const { formUuid } = useParams() as ParamTypes;
+  const { questions } = useSpecificQuestions(formUuid, specificQuestions);
+
   const { t } = useTranslation();
   const {
     register,
@@ -54,7 +66,7 @@ const SessionDetailsForm = () => {
                     labelText={t("sessionName", "Session Name")}
                     {...register("sessionName", { required: true })}
                     invalid={errors.sessionName}
-                    invalidText={"This field is required"}
+                    invalidText={t("requiredField", "This field is required")}
                   />
                   <TextInput
                     id="text"
@@ -62,7 +74,7 @@ const SessionDetailsForm = () => {
                     labelText={t("practitionerName", "Practitioner Name")}
                     {...register("practitionerName", { required: true })}
                     invalid={errors.practitionerName}
-                    invalidText={"This field is required"}
+                    invalidText={t("requiredField", "This field is required")}
                   />
                   <Controller
                     name="sessionDate"
@@ -81,7 +93,10 @@ const SessionDetailsForm = () => {
                           placeholder="mm/dd/yyyy"
                           size="md"
                           invalid={errors.sessionDate}
-                          invalidText={"This field is required"}
+                          invalidText={t(
+                            "requiredField",
+                            "This field is required"
+                          )}
                         />
                       </DatePicker>
                     )}
@@ -92,7 +107,7 @@ const SessionDetailsForm = () => {
                     labelText={t("sessionNotes", "Session Notes")}
                     {...register("sessionNotes", { required: true })}
                     invalid={errors.sessionNotes}
-                    invalidText={"This field is required"}
+                    invalidText={t("requiredField", "This field is required")}
                   />
                 </div>
               </Layer>
@@ -122,6 +137,37 @@ const SessionDetailsForm = () => {
               </Layer>
             </Tile>
           </Layer>
+          {questions?.length > 0 ? (
+            <>
+              <h4>{t("sessionSpecificDetails", "3. Specific details")}</h4>
+              <div>
+                <p>
+                  {t(
+                    "sessionSpecificDetailsDescription",
+                    "They will be mapped to form responses for all patients as pre-filled data."
+                  )}
+                </p>
+              </div>
+              <Layer>
+                <Tile className={styles.formSectionTile}>
+                  <Layer>
+                    <div
+                      style={{
+                        display: "flex",
+                        flexDirection: "column",
+                        rowGap: "1.5rem",
+                      }}
+                    >
+                      <ConfigurableQuestionsSection
+                        register={register}
+                        specificQuestions={questions}
+                      />
+                    </div>
+                  </Layer>
+                </Tile>
+              </Layer>
+            </>
+          ) : null}
         </div>
       )}
     </div>