@bahmni/clinical-app 0.0.1-dev.106 → 0.0.1-dev.108

package/dist/index.js

@@ -1,4 +1,4 @@
-import { ac as c } from "./index-C_onZcPP.js";
+import { ae as e } from "./index-jQa2f6J7.js";
 export {
-  c as ClinicalApp
+  e as ClinicalApp
 };

package/dist/locales/locale_en.json

@@ -217,17 +217,26 @@
   "OBSERVATION_FORMS_ERROR_LOADING_FORMS": "Error loading forms. Please try again later.",
   "OBSERVATION_FORMS_FORM_ALREADY_ADDED": "Already added",
   "OBSERVATION_FORMS_LOADING_FORMS": "Loading forms...",
+  "OBSERVATION_FORMS_MANDATORY_ERROR_MESSAGE": "Please fix errors in observation forms before submitting the consultation.",
+  "OBSERVATION_FORMS_MANDATORY_ERROR_TITLE": "Observation Forms Have Errors.",
   "OBSERVATION_FORMS_NO_FORMS_FOUND": "No matching forms found",
   "OBSERVATION_FORMS_SEARCH_ARIA_LABEL": "Search for observation forms",
   "OBSERVATION_FORMS_SEARCH_PLACEHOLDER": "Search to add observation form",
   "OBSERVATION_FORMS_SECTION_TITLE": "Observation Forms",
-  "OBSERVATION_FORM_BACK_BUTTON": "Back",
+  "OBSERVATION_FORM_CONTINUE_ANYWAY_BUTTON": "Continue Anyway",
   "OBSERVATION_FORM_DISCARD_BUTTON": "Discard Form",
   "OBSERVATION_FORM_LOADING_METADATA": "Loading form's metadata...",
   "OBSERVATION_FORM_LOADING_METADATA_ERROR": "Error loading form metadata",
   "OBSERVATION_FORM_SAVE_BUTTON": "Save Form",
-  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE": "Mandatory fields are required",
-  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE": "Please fill in all required fields before saving the form",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_EMPTY": "Please fill in some data before saving.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_INVALID": "Please fill in the fields with valid data.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_MANDATORY": "Please fill in all required fields before saving.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_EMPTY": "The form is empty.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_INVALID": "Invalid data entry:",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_MANDATORY": "Some required fields are missing.",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_INVALID": "Invalid data entry",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_MANDATORY": "Required fields missing",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_EMPTY": "No data filled",
   "PARTICIPANT": "Participant(s)",
   "PATIENT_HEADER_LABEL": "Patient Header",
   "PINNED_FORMS_INVALID_DATA": "Invalid pinned forms data",

package/dist/locales/locale_es.json

@@ -217,17 +217,26 @@
   "OBSERVATION_FORMS_ERROR_LOADING_FORMS": "Error al cargar formularios. Por favor, inténtelo de nuevo más tarde.",
   "OBSERVATION_FORMS_FORM_ALREADY_ADDED": "Ya agregado",
   "OBSERVATION_FORMS_LOADING_FORMS": "Cargando formularios...",
+  "OBSERVATION_FORMS_MANDATORY_ERROR_MESSAGE": "Por favor corrija los errores en los formularios de observación antes de enviar la consulta.",
+  "OBSERVATION_FORMS_MANDATORY_ERROR_TITLE": "Los Formularios de Observación Tienen Errores",
   "OBSERVATION_FORMS_NO_FORMS_FOUND": "No se encontraron formularios coincidentes",
   "OBSERVATION_FORMS_SEARCH_ARIA_LABEL": "Buscar formularios de observación",
   "OBSERVATION_FORMS_SEARCH_PLACEHOLDER": "Buscar para agregar formulario de observación",
   "OBSERVATION_FORMS_SECTION_TITLE": "Formularios de Observación",
-  "OBSERVATION_FORM_BACK_BUTTON": "Atrás",
+  "OBSERVATION_FORM_CONTINUE_ANYWAY_BUTTON": "Continuar de todos modos",
   "OBSERVATION_FORM_DISCARD_BUTTON": "Descartar Formulario",
   "OBSERVATION_FORM_LOADING_METADATA": "Cargando los metadatos del formulario...",
   "OBSERVATION_FORM_LOADING_METADATA_ERROR": "Error al cargar los metadatos del formulario",
   "OBSERVATION_FORM_SAVE_BUTTON": "Guardar Formulario",
-  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE": "Los campos obligatorios son requeridos",
-  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE": "Por favor complete todos los campos obligatorios antes de guardar el formulario",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_EMPTY": "Por favor complete algunos datos antes de guardar.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_INVALID": "Por favor complete los campos con datos válidos.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_SUBTITLE_MANDATORY": "Por favor complete todos los campos obligatorios antes de guardar.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_EMPTY": "No se han completado datos.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_INVALID": "Entrada de datos inválida.",
+  "OBSERVATION_FORM_VALIDATION_ERROR_TITLE_MANDATORY": "Faltan campos obligatorios",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_INVALID": "Entrada de datos inválida",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_MANDATORY": "Faltan campos obligatorios",
+  "OBSERVATION_ADDED_FORM_VALIDATION_ERROR_TITLE_EMPTY": "No se han introducido datos",
   "PARTICIPANT": "Partícipe(es)",
   "PATIENT_HEADER_LABEL": "Cabecera del Paciente",
   "PINNED_FORMS_INVALID_DATA": "Datos de formularios anclados no válidos",

package/dist/stores/observationFormsStore.d.ts

@@ -1,9 +1,11 @@
 import { ObservationForm, Form2Observation } from '@bahmni/services';
+import { VALIDATION_STATE_EMPTY, VALIDATION_STATE_MANDATORY, VALIDATION_STATE_INVALID } from '../constants/forms';
 export interface ObservationFormData {
     formUuid: string;
     formName: string;
     observations: Form2Observation[];
     timestamp: number;
+    validationState?: null | typeof VALIDATION_STATE_EMPTY | typeof VALIDATION_STATE_MANDATORY | typeof VALIDATION_STATE_INVALID;
 }
 export interface ObservationFormsState {
     selectedForms: ObservationForm[];
@@ -11,8 +13,8 @@ export interface ObservationFormsState {
     viewingForm: ObservationForm | null;
     addForm: (form: ObservationForm) => void;
     removeForm: (formUuid: string) => void;
-    updateFormData: (formUuid: string, observations: Form2Observation[]) => void;
-    getFormData: (formUuid: string) => Form2Observation[] | undefined;
+    updateFormData: (formUuid: string, observations: Form2Observation[], validationState?: null | typeof VALIDATION_STATE_EMPTY | typeof VALIDATION_STATE_MANDATORY | typeof VALIDATION_STATE_INVALID) => void;
+    getFormData: (formUuid: string) => ObservationFormData | undefined;
     setViewingForm: (form: ObservationForm | null) => void;
     getAllObservations: () => Form2Observation[];
     getObservationFormsData: () => Record<string, Form2Observation[]>;

package/dist/stores/observationFormsStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observationFormsStore.d.ts","sourceRoot":"","sources":["../../src/stores/observationFormsStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGrE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,gBAAgB,EAAE,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,eAAe,EAAE,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC/C,WAAW,EAAE,eAAe,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;IACzC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,IAAI,CAAC;IAC7E,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,gBAAgB,EAAE,GAAG,SAAS,CAAC;IAClE,cAAc,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,CAAC;IACvD,kBAAkB,EAAE,MAAM,gBAAgB,EAAE,CAAC;IAC7C,uBAAuB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAClE,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,MAAM,qBAAqB,CAAC;CACvC;AAUD,eAAO,MAAM,wBAAwB,oFAwIpC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"observationFormsStore.d.ts","sourceRoot":"","sources":["../../src/stores/observationFormsStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAErE,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,EACzB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,gBAAgB,EAAE,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EACZ,IAAI,GACJ,OAAO,sBAAsB,GAC7B,OAAO,0BAA0B,GACjC,OAAO,wBAAwB,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACpC,aAAa,EAAE,eAAe,EAAE,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC/C,WAAW,EAAE,eAAe,GAAG,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;IACzC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CACd,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,gBAAgB,EAAE,EAChC,eAAe,CAAC,EACZ,IAAI,GACJ,OAAO,sBAAsB,GAC7B,OAAO,0BAA0B,GACjC,OAAO,wBAAwB,KAChC,IAAI,CAAC;IACV,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,mBAAmB,GAAG,SAAS,CAAC;IACnE,cAAc,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,CAAC;IACvD,kBAAkB,EAAE,MAAM,gBAAgB,EAAE,CAAC;IAC7C,uBAAuB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAClE,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,QAAQ,EAAE,MAAM,qBAAqB,CAAC;CACvC;AAUD,eAAO,MAAM,wBAAwB,oFAwJpC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bahmni/clinical-app",
-  "version": "0.0.1-dev.106",
+  "version": "0.0.1-dev.108",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/dist/FormsTable-C7PUueUt-BJlenAuA.js

@@ -1,259 +0,0 @@
-import { jsx as e, jsxs as _, Fragment as K } from "react/jsx-runtime";
-import { u as Q, C as J, a as p, b as X, V as z, Q as I, A as Y, _ as W, l as Z, E as ee, t as S, G as re, e as ae, X as oe, c as ne, J as te } from "./index-C_onZcPP.js";
-import { useState as U, useMemo as u, useCallback as f } from "react";
-import { createPortal as se } from "react-dom";
-const de = "_formsTableBody_ua0cn_1", me = "_customAccordianItem_ua0cn_6", ie = "_formContent_ua0cn_18", ce = "_formDetailsContainer_ua0cn_25", le = "_observation_ua0cn_30", ue = "_groupContainer_ua0cn_39", _e = "_rowContainer_ua0cn_43", be = "_groupLabel_ua0cn_48", pe = "_rowLabel_ua0cn_58", fe = "_rowValue_ua0cn_67", he = "_groupMembers_ua0cn_75", Ne = "_memberRow_ua0cn_81", ge = "_memberLabel_ua0cn_86", ye = "_memberValue_ua0cn_94", ve = "_commentSection_ua0cn_102", Me = "_commentText_ua0cn_108", Ce = "_nestedGroup_ua0cn_117", Le = "_nestedGroupLabel_ua0cn_124", Ae = "_nestedGroupMembers_ua0cn_133", o = {
-  formsTableBody: de,
-  customAccordianItem: me,
-  formContent: ie,
-  formDetailsContainer: ce,
-  observation: le,
-  groupContainer: ue,
-  rowContainer: _e,
-  groupLabel: be,
-  rowLabel: pe,
-  rowValue: fe,
-  groupMembers: he,
-  memberRow: Ne,
-  memberLabel: ge,
-  memberValue: ye,
-  commentSection: ve,
-  commentText: Me,
-  nestedGroup: Ce,
-  nestedGroupLabel: Le,
-  nestedGroupMembers: Ae
-}, V = ({
-  member: r,
-  depth: m = 0
-}) => {
-  const i = r.groupMembers && r.groupMembers.length > 0, n = r.conceptNameToDisplay ?? r.concept?.shortName ?? r.concept?.name;
-  return i ? /* @__PURE__ */ _("div", { className: o.nestedGroup, children: [
-    /* @__PURE__ */ e(
-      "div",
-      {
-        className: o.nestedGroupLabel,
-        style: { paddingLeft: `${m * 16}px` },
-        children: n
-      }
-    ),
-    /* @__PURE__ */ e("div", { className: o.nestedGroupMembers, children: r.groupMembers?.map((c, b) => /* @__PURE__ */ e(
-      V,
-      {
-        member: c,
-        depth: m + 1
-      },
-      `${c.concept.uuid}`
-    )) })
-  ] }) : /* @__PURE__ */ _(
-    "div",
-    {
-      className: o.memberRow,
-      style: { paddingLeft: `${m * 16}px` },
-      children: [
-        /* @__PURE__ */ e("p", { className: o.memberLabel, children: n }),
-        /* @__PURE__ */ e("p", { className: o.memberValue, children: r.valueAsString })
-      ]
-    }
-  );
-}, Oe = ({
-  observation: r,
-  index: m
-}) => {
-  const i = r.groupMembers && r.groupMembers.length > 0;
-  return /* @__PURE__ */ _(
-    "div",
-    {
-      className: o.observation,
-      children: [
-        /* @__PURE__ */ _(
-          "div",
-          {
-            className: i ? o.groupContainer : o.rowContainer,
-            children: [
-              /* @__PURE__ */ e("p", { className: i ? o.groupLabel : o.rowLabel, children: r.conceptNameToDisplay }),
-              i ? /* @__PURE__ */ e("div", { className: o.groupMembers, children: r.groupMembers?.map((n, c) => /* @__PURE__ */ e(
-                V,
-                {
-                  member: n,
-                  depth: 0
-                },
-                `${n.concept.uuid}`
-              )) }) : /* @__PURE__ */ e("p", { className: o.rowValue, children: r.valueAsString })
-            ]
-          }
-        ),
-        r.comment && /* @__PURE__ */ e("div", { className: o.commentSection, children: /* @__PURE__ */ _("span", { className: o.commentText, children: [
-          r.comment,
-          r.providers?.[0]?.name && ` - by ${r.providers[0].name}`
-        ] }) })
-      ]
-    },
-    `${r.concept.uuid}-${m}`
-  );
-}, Ge = ({
-  episodeOfCareUuids: r,
-  encounterUuids: m,
-  config: i
-}) => {
-  const { t: n } = Q(), c = J(), [b, v] = U(!1), [d, M] = U(null), $ = i?.numberOfVisits, {
-    data: h = [],
-    isLoading: C,
-    isError: L,
-    error: q
-  } = p({
-    queryKey: ["forms", c, r],
-    queryFn: () => ae(c, void 0, $),
-    enabled: !!c
-  }), A = u(() => !m || m.length === 0 ? h : h.filter(
-    (a) => m.includes(a.encounterUuid)
-  ), [h, m]), { data: O = [] } = p({
-    queryKey: ["observationForms"],
-    queryFn: oe
-  }), R = f(
-    (a) => O.find((t) => t.name === a)?.uuid,
-    [O]
-  ), N = u(() => {
-    if (d)
-      return R(d.formName);
-  }, [d, R]), {
-    data: Re,
-    isLoading: x,
-    error: T
-  } = p({
-    queryKey: ["formMetadata", N],
-    queryFn: () => ne(N),
-    enabled: !!N && b
-  }), {
-    data: g,
-    isLoading: k,
-    error: D
-  } = p({
-    queryKey: ["formsEncounter", d?.encounterUuid],
-    queryFn: () => te(d.encounterUuid, !0),
-    enabled: !!d?.encounterUuid && b
-  }), F = u(() => !g?.observations || !d?.formName ? [] : g.observations.filter(
-    (a) => "formFieldPath" in a && typeof a.formFieldPath == "string" && a.formFieldPath.includes(d.formName)
-  ), [g?.observations, d?.formName]), E = u(
-    () => [
-      { key: "recordedOn", header: n("FORM_RECORDED_ON") },
-      { key: "recordedBy", header: n("FORM_RECORDED_BY") }
-    ],
-    [n]
-  ), H = u(
-    () => [
-      { key: "recordedOn", sortable: !0 },
-      { key: "recordedBy", sortable: !0 }
-    ],
-    []
-  ), G = u(() => {
-    const a = A.reduce(
-      (t, s) => {
-        const l = s.formName;
-        t[l] ??= [];
-        const y = s.providers.map((P) => P.providerName).filter(Boolean).join(", ");
-        return t[l].push({
-          id: s.encounterUuid,
-          formName: s.formName,
-          recordedOn: X(s.encounterDateTime, n, re).formattedResult,
-          recordedBy: y ?? "--",
-          encounterDateTime: s.encounterDateTime,
-          encounterUuid: s.encounterUuid
-        }), t;
-      },
-      {}
-    );
-    return Object.entries(a).map(
-      ([t, s]) => ({
-        formName: t,
-        records: s.sort(
-          (l, y) => y.encounterDateTime - l.encounterDateTime
-        )
-      })
-    ).sort((t, s) => t.formName.localeCompare(s.formName));
-  }, [A, n]), w = f((a) => {
-    M(a), v(!0);
-  }, []), j = f(() => {
-    v(!1), M(null);
-  }, []), B = f(
-    (a, t) => {
-      switch (t) {
-        case "recordedOn":
-          return /* @__PURE__ */ e(z, { onClick: () => w(a), children: a.recordedOn });
-        case "recordedBy":
-          return a.recordedBy;
-        default:
-          return null;
-      }
-    },
-    [w]
-  );
-  return /* @__PURE__ */ _(K, { children: [
-    /* @__PURE__ */ e("div", { "data-testid": "forms-table", children: C || L || G.length === 0 ? /* @__PURE__ */ e(
-      I,
-      {
-        headers: E,
-        ariaLabel: n("FORMS_HEADING"),
-        rows: [],
-        loading: C,
-        errorStateMessage: L ? q?.message : void 0,
-        emptyStateMessage: n("FORMS_UNAVAILABLE"),
-        renderCell: B,
-        className: o.formsTableBody,
-        "data-testid": "sortable-data-table"
-      }
-    ) : /* @__PURE__ */ e(Y, { align: "start", children: G.map((a, t) => {
-      const { formName: s, records: l } = a;
-      return /* @__PURE__ */ e(
-        W,
-        {
-          title: s,
-          className: o.customAccordianItem,
-          testId: "accordian-table-title",
-          open: t === 0,
-          children: /* @__PURE__ */ e(
-            I,
-            {
-              headers: E,
-              ariaLabel: n("FORMS_HEADING"),
-              rows: l,
-              loading: !1,
-              errorStateMessage: "",
-              sortable: H,
-              emptyStateMessage: n("FORMS_UNAVAILABLE"),
-              renderCell: B,
-              className: o.formsTableBody,
-              "data-testid": "sortable-data-table"
-            }
-          )
-        },
-        s
-      );
-    }) }) }),
-    b && d && se(
-      /* @__PURE__ */ e(
-        Z,
-        {
-          open: b,
-          onRequestClose: j,
-          modalHeading: d.formName,
-          modalLabel: `${d.recordedOn} | ${d.recordedBy}`,
-          passiveModal: !0,
-          size: "md",
-          testId: "form-details-modal",
-          children: /* @__PURE__ */ e("div", { className: o.formContent, children: x || k ? /* @__PURE__ */ e(ee, { width: "100%", lineCount: 3 }) : T ? /* @__PURE__ */ e("div", { children: S(T).message ?? n("ERROR_FETCHING_FORM_METADATA") }) : D ? /* @__PURE__ */ e("div", { children: S(D).message ?? n("ERROR_FETCHING_FORM_DATA") }) : F.length > 0 ? /* @__PURE__ */ e("div", { className: o.formDetailsContainer, children: F.map((a, t) => /* @__PURE__ */ e(
-            Oe,
-            {
-              observation: a,
-              index: t
-            },
-            `${a.concept.uuid}`
-          )) }) : /* @__PURE__ */ e("div", { children: n("NO_FORM_DATA_AVAILABLE") }) })
-        }
-      ),
-      document.getElementById("actionAreaLayout") ?? document.body
-    )
-  ] });
-};
-export {
-  Ge as default
-};