@bahmni/home-app 0.0.1-dev.373 → 0.0.1-dev.374

package/dist/{DocumentsTable-DvzP4zA0-Ctn06ZiV.js → DocumentsTable-Cx3H-xNc-DXm8s6bY.js}

@@ -1,5 +1,5 @@
 import { jsx as r, jsxs as p, Fragment as K } from "react/jsx-runtime";
-import { g as Q, u as W, G as Y, x as J, a as X, b as Z, W as ee, p as te } from "./index-CptkFVlT.js";
+import { g as Q, u as W, G as Y, x as J, a as X, b as Z, W as ee, p as te } from "./index-D7NmN6ZW.js";
 import { useQuery as ae } from "@tanstack/react-query";
 import { useState as l, useCallback as h, useEffect as I, useMemo as _ } from "react";
 const ne = "DocumentsTable-module_documentsTableBody__6iR3w", oe = "DocumentsTable-module_viewAttachmentsLink__aQ1on", re = "DocumentsTable-module_documentViewerContainer__F5m8D", de = "DocumentsTable-module_attachmentItem__17KA7", se = "DocumentsTable-module_attachmentCounter__WFiI3", me = "DocumentsTable-module_attachmentError__RI4U2", ce = "DocumentsTable-module_documentIframe__ptq5I", le = "DocumentsTable-module_documentImage__KQVgS", d = {
@@ -44,7 +44,7 @@ const Te = [
     w(!1), U(null), O(/* @__PURE__ */ new Set());
   }, []), v = h((e) => {
     O((t) => new Set(t).add(e));
-  }, []), { data: i, isLoading: q, isError: y, error: b } = ae({
+  }, []), { data: i, isLoading: q, isError: b, error: y } = ae({
     queryKey: [
       "documents",
       E,
@@ -65,12 +65,12 @@ const Te = [
   }, [i]), I(() => {
     C(1), A(void 0);
   }, [E]), I(() => {
-    y && L({
+    b && L({
       title: n("ERROR_DEFAULT_TITLE"),
-      message: b?.message ?? "",
+      message: y?.message ?? "",
       type: "error"
     });
-  }, [y, b, L, n]), I(() => {
+  }, [b, y, L, n]), I(() => {
     const e = new AbortController();
     return (async () => {
       if (!s || !o) return;
@@ -145,7 +145,7 @@ const Te = [
         ariaLabel: n("DOCUMENTS_TABLE_HEADING"),
         rows: x,
         loading: q,
-        errorStateMessage: y ? b?.message : null,
+        errorStateMessage: b ? y?.message : null,
         sortable: P,
         emptyStateMessage: n("DOCUMENTS_NO_RECORDS"),
         renderCell: z,

package/dist/{FormsTable-BexiFTEe-aR2EeaaS.js → FormsTable-BRgVe8lS-CLFnkEL2.js}

@@ -1,94 +1,94 @@
-import { jsx as i, jsxs as j, Fragment as he } from "react/jsx-runtime";
-import { u as be, g as ye, H as pe, Q as Ne, f as Oe, c as Te, d as Ie, M as Ee, t as Ae, m as _e, S as ve, T as Se, s as z, b as Fe, e as K, n as Q, a as Ce, W as Y, I as Re, k as Be, p as Le, J as Me, P as Ue } from "./index-CptkFVlT.js";
-import { useQueryClient as De, useQuery as O } from "@tanstack/react-query";
-import { useState as G, useMemo as d, useCallback as l } from "react";
-const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_modalHeading__wnTmA", He = "FormsTable-module_customAccordianItem__isszs", T = {
-  formsTableBody: ke,
-  modalHeading: qe,
+import { jsx as i, jsxs as K, Fragment as ge } from "react/jsx-runtime";
+import { u as ye, g as be, H as Oe, Q as Te, f as Ne, c as Ie, d as Ee, M as Ae, t as _e, m as ve, S as Se, T as Fe, s as P, b as Me, e as Q, n as Y, a as Re, W as z, I as Be, k as Ce, p as Le, J as Ue, P as ke } from "./index-D7NmN6ZW.js";
+import { useQueryClient as De, useQuery as T } from "@tanstack/react-query";
+import { useState as G, useMemo as d, useCallback as c } from "react";
+const qe = "FormsTable-module_formsTableBody__SvGha", we = "FormsTable-module_modalHeading__wnTmA", He = "FormsTable-module_customAccordianItem__isszs", N = {
+  formsTableBody: qe,
+  modalHeading: we,
   customAccordianItem: He
-}, we = "startConsultation", je = ({
-  episodeOfCareUuids: C,
-  encounterUuids: u,
+}, Ve = "startConsultation", Pe = ({
+  episodeOfCareUuids: M,
+  encounterUuids: m,
   config: J,
   disableActions: W = !1,
-  activeEncounterUuid: h = null
+  activeEncounterUuid: p = null
 }) => {
-  const { t: n } = be(), c = ye(), [b, R] = G(!1), [s, B] = G(null), {
+  const { t: n } = ye(), u = be(), [g, R] = G(!1), [s, B] = G(null), {
     numberOfVisits: X,
     hideThumbnail: Z = !1,
     forms: y
-  } = J ?? {}, ee = pe(
-    Ue.EDIT_OBSERVATIONS
-  ), { userPrivileges: p } = Ne(), I = ee && !W && !!h, L = Oe(
-    C,
-    u
+  } = J ?? {}, ee = Oe(
+    ke.EDIT_OBSERVATIONS
+  ), { userPrivileges: b } = Te(), I = ee && !W && !!p, C = Ne(
+    M,
+    m
   ), re = De(), {
-    data: M = [],
+    data: L = [],
     isLoading: U,
-    isError: D,
+    isError: k,
     error: oe,
-    refetch: ae
-  } = O({
-    queryKey: ["forms", c, C],
-    queryFn: () => Te(c, void 0, X),
-    enabled: !!c && !L
-  }), k = d(() => {
-    let e = M;
-    return u && u.length > 0 && (e = e.filter(
-      (r) => u.includes(r.encounterUuid)
+    refetch: te
+  } = T({
+    queryKey: ["forms", u, M],
+    queryFn: () => Ie(u, void 0, X),
+    enabled: !!u && !C
+  }), D = d(() => {
+    let e = L;
+    return m && m.length > 0 && (e = e.filter(
+      (r) => m.includes(r.encounterUuid)
     )), Array.isArray(y) && y.length > 0 && (e = e.filter(
       (r) => y.some((o) => o.toLowerCase() === r.formName.toLowerCase())
     )), e;
-  }, [M, u, y]), { data: N = [] } = O({
+  }, [L, m, y]), { data: O = [] } = T({
     queryKey: ["observationForms"],
-    queryFn: () => Ie()
-  }), q = l(
+    queryFn: () => Ee()
+  }), q = c(
     (e) => {
-      const r = N.find((a) => a.name === e);
+      const r = O.find((a) => a.name === e);
       if (!r?.privileges || r.privileges.length === 0) return !0;
-      if (!p || p.length === 0) return !1;
-      const o = new Set(p.map((a) => a.name));
+      if (!b || b.length === 0) return !1;
+      const o = new Set(b.map((a) => a.name));
       return r.privileges.some(
         (a) => o.has(a.privilegeName) && a.editable
       );
     },
-    [N, p]
-  ), f = l(
-    (e) => !h || e.encounterUuid !== h ? !1 : q(e.formName),
-    [h, q]
-  ), H = l(
-    (e) => N.find((r) => r.name === e)?.uuid,
-    [N]
+    [O, b]
+  ), f = c(
+    (e) => !p || e.encounterUuid !== p ? !1 : q(e.formName),
+    [p, q]
+  ), w = c(
+    (e) => O.find((r) => r.name === e)?.uuid,
+    [O]
   ), E = d(() => {
     if (s)
-      return H(s.formName);
-  }, [s, H]), {
-    data: m,
-    isLoading: te,
+      return w(s.formName);
+  }, [s, w]), {
+    data: l,
+    isLoading: ae,
     isError: se,
     error: A
-  } = O({
+  } = T({
     queryKey: ["formMetadata", E],
-    queryFn: () => Ee(E),
-    enabled: !!E && b
+    queryFn: () => Ae(E),
+    enabled: !!E && g
   }), {
     data: _,
     isLoading: ne,
     isError: ie,
     error: v
-  } = O({
+  } = T({
     queryKey: ["formsEncounterFHIR", s?.encounterUuid],
-    queryFn: () => Ae(s.encounterUuid),
-    enabled: !!s?.encounterUuid && b
+    queryFn: () => _e(s.encounterUuid),
+    enabled: !!s?.encounterUuid && g
   });
-  _e(
+  ve(
     (e) => {
-      e.patientUUID === c && e.updatedConcepts.size > 0 && (ae(), re.invalidateQueries({ queryKey: ["formsEncounterFHIR"] }));
+      e.patientUUID === u && (te(), re.invalidateQueries({ queryKey: ["formsEncounterFHIR"] }));
     },
-    [c]
+    [u]
   );
-  const de = d(() => !_?.entry || !s?.formName ? [] : _.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => ve(e) ? Se(e)?.toLowerCase() === s.formName.toLowerCase() : !0), [_, s?.formName]), le = d(() => {
-    if (!m?.schema) return;
+  const de = d(() => !_?.entry || !s?.formName ? [] : _.entry.filter((e) => e.resource?.resourceType === "Observation").map((e) => e.resource).filter((e) => Se(e) ? Fe(e)?.toLowerCase() === s.formName.toLowerCase() : !0), [_, s?.formName]), le = d(() => {
+    if (!l?.schema) return;
     const e = [], r = (o) => {
       (o ?? []).forEach((a) => {
         const t = a;
@@ -96,10 +96,10 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
       });
     };
     return r(
-      m.schema.controls ?? []
+      l.schema.controls ?? []
     ), e.length > 0 ? e : void 0;
-  }, [m]), me = d(() => {
-    if (!m?.schema) return;
+  }, [l]), ce = d(() => {
+    if (!l?.schema) return;
     const e = {}, r = (o, a) => {
       for (const t of o)
         if (t.type === "section") {
@@ -109,34 +109,45 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
           t.id != null && a && (e[String(t.id)] = a), t.controls && r(t.controls, a);
     };
     return r(
-      m.schema.controls ?? [],
+      l.schema.controls ?? [],
       null
     ), Object.keys(e).length > 0 ? e : void 0;
-  }, [m]), ue = d(() => {
+  }, [l]), me = d(() => {
+    if (!l?.schema) return;
+    const e = {}, r = (o) => {
+      (o ?? []).forEach((a) => {
+        const t = a;
+        t.concept?.uuid && t.concept?.datatype && (e[t.concept.uuid] = t.concept.datatype), t.controls && r(t.controls);
+      });
+    };
+    return r(
+      l.schema.controls ?? []
+    ), Object.keys(e).length > 0 ? e : void 0;
+  }, [l]), ue = d(() => {
     if (A)
-      return z(A).message;
+      return P(A).message;
     if (v)
-      return z(v).message;
-  }, [A, v]), g = d(
+      return P(v).message;
+  }, [A, v]), h = d(
     () => [
       { key: "recordedOn", header: n("RECORDED_ON") },
       { key: "recordedBy", header: n("RECORDED_BY") }
     ],
     [n]
-  ), w = d(
-    () => [...g, { key: "actions", header: n("ACTIONS") }],
-    [g, n]
-  ), ce = l(
-    (e) => I && e.some((r) => f(r)) ? w : g,
-    [I, f, w, g]
-  ), fe = g, ge = d(
+  ), H = d(
+    () => [...h, { key: "actions", header: n("ACTIONS") }],
+    [h, n]
+  ), fe = c(
+    (e) => I && e.some((r) => f(r)) ? H : h,
+    [I, f, H, h]
+  ), he = h, pe = d(
     () => [
       { key: "recordedOn", sortable: !0 },
       { key: "recordedBy", sortable: !0 }
     ],
     []
   ), V = d(() => {
-    const e = k.reduce(
+    const e = D.reduce(
       (r, o) => {
         const a = o.formName;
         r[a] ??= [];
@@ -144,7 +155,7 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
         return r[a].push({
           id: o.encounterUuid,
           formName: o.formName,
-          recordedOn: Fe(o.encounterDateTime, n, !0).formattedResult,
+          recordedOn: Me(o.encounterDateTime, n, !0).formattedResult,
           recordedBy: t ?? "--",
           encounterDateTime: o.encounterDateTime,
           encounterUuid: o.encounterUuid
@@ -160,13 +171,13 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
         )
       })
     ).sort((r, o) => r.formName.localeCompare(o.formName));
-  }, [k, n]), $ = l((e) => {
+  }, [D, n]), $ = c((e) => {
     B(e), R(!0);
-  }, []), x = l(() => {
+  }, []), j = c(() => {
     R(!1), B(null);
-  }, []), S = l((e) => {
+  }, []), S = c((e) => {
     globalThis.dispatchEvent(
-      new CustomEvent(we, {
+      new CustomEvent(Ve, {
         detail: {
           editOnly: "observationForms",
           editTitle: "EDIT_OBSERVATION_FORM_TITLE",
@@ -176,23 +187,23 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
         }
       })
     );
-  }, []), P = l(
+  }, []), x = c(
     (e, r) => {
       switch (r) {
         case "recordedOn":
-          return /* @__PURE__ */ i(Ce, { onClick: () => $(e), children: e.recordedOn });
+          return /* @__PURE__ */ i(Re, { onClick: () => $(e), children: e.recordedOn });
         case "recordedBy":
           return e.recordedBy;
         case "actions":
           return f(e) ? /* @__PURE__ */ i(
-            K,
+            Q,
             {
               label: n("EDIT_OBSERVATION_FORM"),
               kind: "ghost",
               size: "sm",
               testId: `edit-form-${e.encounterUuid}`,
               onClick: () => S(e),
-              children: /* @__PURE__ */ i(Q, {})
+              children: /* @__PURE__ */ i(Y, {})
             }
           ) : null;
         default:
@@ -201,41 +212,41 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
     },
     [$, S, f, n]
   );
-  return /* @__PURE__ */ j(he, { children: [
-    /* @__PURE__ */ i("div", { id: "forms-table", "data-testid": "forms-table", children: U || D || V.length === 0 || L ? /* @__PURE__ */ i(
-      Y,
+  return /* @__PURE__ */ K(ge, { children: [
+    /* @__PURE__ */ i("div", { id: "forms-table", "data-testid": "forms-table", children: U || k || V.length === 0 || C ? /* @__PURE__ */ i(
+      z,
       {
-        headers: fe,
+        headers: he,
         ariaLabel: n("FORMS_HEADING"),
         rows: [],
         loading: U,
-        errorStateMessage: D ? oe?.message : void 0,
+        errorStateMessage: k ? oe?.message : void 0,
         emptyStateMessage: n("FORMS_UNAVAILABLE"),
-        renderCell: P,
-        className: T.formsTableBody,
+        renderCell: x,
+        className: N.formsTableBody,
         dataTestId: "forms-table"
       }
-    ) : /* @__PURE__ */ i(Re, { align: "start", children: V.map((e, r) => {
-      const { formName: o, records: a } = e, t = ce(a);
+    ) : /* @__PURE__ */ i(Be, { align: "start", children: V.map((e, r) => {
+      const { formName: o, records: a } = e, t = fe(a);
       return /* @__PURE__ */ i(
-        Be,
+        Ce,
         {
           title: o,
-          className: T.customAccordianItem,
+          className: N.customAccordianItem,
           testId: `accordian-title-${o}`,
           open: r === 0,
           children: /* @__PURE__ */ i(
-            Y,
+            z,
             {
               headers: t,
               ariaLabel: n("FORMS_HEADING"),
               rows: a,
               loading: !1,
               errorStateMessage: "",
-              sortable: ge,
+              sortable: pe,
               emptyStateMessage: n("FORMS_UNAVAILABLE"),
-              renderCell: P,
-              className: T.formsTableBody,
+              renderCell: x,
+              className: N.formsTableBody,
               dataTestId: `forms-table-${o}`
             }
           )
@@ -243,26 +254,26 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
         o
       );
     }) }) }),
-    b && s && /* @__PURE__ */ i(
+    g && s && /* @__PURE__ */ i(
       Le,
       {
         id: "modalIdForActionAreaLayout",
         portalId: "main-display-area",
-        open: b,
-        onRequestClose: x,
-        modalHeading: /* @__PURE__ */ j("div", { className: T.modalHeading, children: [
+        open: g,
+        onRequestClose: j,
+        modalHeading: /* @__PURE__ */ K("div", { className: N.modalHeading, children: [
           /* @__PURE__ */ i("span", { children: s.formName }),
           I && f(s) && /* @__PURE__ */ i(
-            K,
+            Q,
             {
               label: n("EDIT_OBSERVATION_FORM"),
               kind: "ghost",
               size: "sm",
               testId: `edit-form-modal-${s.encounterUuid}`,
               onClick: () => {
-                x(), S(s);
+                j(), S(s);
               },
-              children: /* @__PURE__ */ i(Q, {})
+              children: /* @__PURE__ */ i(Y, {})
             }
           )
         ] }),
@@ -271,17 +282,18 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
         size: "md",
         testId: "form-details-modal",
         children: /* @__PURE__ */ i(
-          Me,
+          Ue,
           {
             observations: de,
-            isLoading: te || ne,
+            isLoading: ae || ne,
             isError: se || ie,
             errorMessage: ue,
             emptyStateMessage: n("NO_FORM_DATA_AVAILABLE"),
             testIdPrefix: s.formName,
             hideThumbnail: Z,
             controlOrder: le,
-            sectionMap: me
+            sectionMap: ce,
+            conceptDatatypeMap: me
           }
         )
       }
@@ -289,5 +301,5 @@ const ke = "FormsTable-module_formsTableBody__SvGha", qe = "FormsTable-module_mo
   ] });
 };
 export {
-  je as default
+  Pe as default
 };

package/dist/{LNWAZHJI-Vc_o0Tiw.js → LNWAZHJI-B0_PmrgT.js}

@@ -1,5 +1,5 @@
-import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-DNGYQwaN.js";
-import { a0 as d, a1 as f, a2 as e } from "./index-CptkFVlT.js";
+import { c, T as l, P as m, a as u, D as v, Q as i } from "./YPM2AS64-T0eYli2V.js";
+import { a0 as d, a1 as f, a2 as e } from "./index-D7NmN6ZW.js";
 var p = (a) => {
   const [r, t] = c({
     prefix: "TanstackQueryDevtools"

package/dist/{MWZ6AO7Z-GBbhSrRz.js → MWZ6AO7Z-CsNValOD.js}

@@ -1,5 +1,5 @@
-import { c as s, T as c, P as u, a as i, b as m, C as P, Q as d } from "./YPM2AS64-DNGYQwaN.js";
-import { a0 as v, a1 as C, a2 as e } from "./index-CptkFVlT.js";
+import { c as s, T as c, P as u, a as i, b as m, C as P, Q as d } from "./YPM2AS64-T0eYli2V.js";
+import { a0 as v, a1 as C, a2 as e } from "./index-D7NmN6ZW.js";
 var h = (t) => {
   const [r, o] = s({
     prefix: "TanstackQueryDevtools"

package/dist/{Observations-DIntvvSw-DlFe6p8y.js → Observations-BZ0HyAoB-CshXgU3u.js}

@@ -1,5 +1,5 @@
 import { jsxs as I, jsx as u } from "react/jsx-runtime";
-import { g as K, G as q, u as N, V as G, h as k, m as H, R as M, D as Q, i as j, j as w, W as x, O as z, r as D, L as P, E as W, Z, l as J, o as X, q as ee } from "./index-CptkFVlT.js";
+import { g as q, G as K, u as N, V as G, h as k, m as w, R as H, D as M, i as Q, j, W as x, O as z, r as D, L as P, E as W, Z, l as J, o as X, q as ee } from "./index-D7NmN6ZW.js";
 import { useQueries as ae, useQuery as te } from "@tanstack/react-query";
 import { useRef as se, useEffect as $, useMemo as E } from "react";
 const L = (a, n, d, l, b, r) => {
@@ -113,7 +113,7 @@ const L = (a, n, d, l, b, r) => {
     conceptNames: d = [],
     conceptUuid: l = [],
     hideThumbnail: b = !1
-  } = n, r = se(/* @__PURE__ */ new Set()), t = K(), { addNotification: s } = q(), { t: i } = N(), o = ae({
+  } = n, r = se(/* @__PURE__ */ new Set()), t = q(), { addNotification: s } = K(), { t: i } = N(), o = ae({
     queries: d.map((e) => ({
       queryKey: de(e),
       queryFn: () => G(e),
@@ -142,7 +142,7 @@ const L = (a, n, d, l, b, r) => {
     queryFn: () => k(t, p),
     enabled: !!t && p.length > 0 && y
   });
-  H(
+  w(
     (e) => {
       e.patientUUID === t && e.updatedConcepts.size > 0 && [...e.updatedConcepts.keys()].some(
         (h) => p.includes(h)
@@ -158,8 +158,8 @@ const L = (a, n, d, l, b, r) => {
   }, [O]);
   const g = E(() => {
     if (!c) return [];
-    const e = M(c), h = Q(e);
-    return j(h);
+    const e = H(c), h = M(e);
+    return Q(h);
   }, [c]), A = [
     { key: "name", header: "name" },
     { key: "value", header: "value" },
@@ -174,7 +174,7 @@ const L = (a, n, d, l, b, r) => {
       className: S.observations,
       children: [
         /* @__PURE__ */ u(
-          w,
+          j,
           {
             id: "observations-title",
             testId: v ? `observations-title-${R}` : "observations-title",

package/dist/{YPM2AS64-DNGYQwaN.js → YPM2AS64-T0eYli2V.js}

@@ -1,4 +1,4 @@
-import { a3 as we, a4 as z, a5 as xt, a6 as B, a1 as q, a2 as y, a7 as Ro, a8 as ye, a9 as R, aa as _, ab as k, ac as N, ad as A, ae as bs, af as ir, ag as $e, ah as G, ai as Hn, aj as Vn, ak as dt, al as D, am as xs, an as cn, ao as Be, ap as ws, aq as qt, ar as zt, as as $s, at as Cs, au as $n, av as Ss, aw as Nr, ax as Bt, ay as zo, az as ks, aA as Es, aB as j, aC as Gr, aD as Ms, aE as Ds, aF as sr, aG as As, aH as Ts, aI as zn, aJ as Fs, aK as Is, aL as Z, aM as Ps, aN as Ls } from "./index-CptkFVlT.js";
+import { a3 as we, a4 as z, a5 as xt, a6 as B, a1 as q, a2 as y, a7 as Ro, a8 as ye, a9 as R, aa as _, ab as k, ac as N, ad as A, ae as bs, af as ir, ag as $e, ah as G, ai as Hn, aj as Vn, ak as dt, al as D, am as xs, an as cn, ao as Be, ap as ws, aq as qt, ar as zt, as as $s, at as Cs, au as $n, av as Ss, aw as Nr, ax as Bt, ay as zo, az as ks, aA as Es, aB as j, aC as Gr, aD as Ms, aE as Ds, aF as sr, aG as As, aH as Ts, aI as zn, aJ as Fs, aK as Is, aL as Z, aM as Ps, aN as Ls } from "./index-D7NmN6ZW.js";
 var Os = (e) => e != null, qs = (e) => e.filter(Os);
 function _s(e) {
   return (...t) => {

package/dist/{index-CptkFVlT.js → index-D7NmN6ZW.js}

@@ -99141,17 +99141,22 @@ const QK1 = (t) => t ? t.extension?.find(
   const r = e.split("/")[0].split("^").pop()?.replace(/\.\d+$/, "");
   if (r)
     return r;
-}, fyt = (t, e) => t?.date ? n2(t.date, e).formattedResult : e("DATE_ERROR_PARSE"), IE = (t, e) => {
+}, fyt = (t, e) => t?.date ? n2(t.date, e).formattedResult : e("DATE_ERROR_PARSE"), IE = (t, e, r) => {
   if (t.observationValue?.value == null)
     return "";
-  const { value: r, unit: o, type: a } = t.observationValue;
-  if (a === "dateTime")
-    return n2(String(r), e).formattedResult;
-  if (a === "boolean") {
-    const c = (l) => l === !0 || l === "true" ? e ? e("YES") : "Yes" : e ? e("NO") : "No";
-    return typeof r == "boolean" ? c(r) : String(r).split(", ").map(c).join(", ");
-  }
-  return o ? `${r} ${o}` : String(r);
+  const { value: o, unit: a, type: c } = t.observationValue;
+  if (c === "dateTime") {
+    const l = t.conceptId ? r?.[t.conceptId] : void 0, i = (s) => {
+      const d = l != null ? l === "Datetime" : /T\d{2}:\d{2}:\d{2}/.test(s) && !/T00:00:00/.test(s);
+      return n2(s, e, d).formattedResult;
+    };
+    return String(o).split(", ").map(i).join(", ");
+  }
+  if (c === "boolean") {
+    const l = (i) => i === !0 || i === "true" ? e ? e("YES") : "Yes" : e ? e("NO") : "No";
+    return typeof o == "boolean" ? l(o) : String(o).split(", ").map(l).join(", ");
+  }
+  return a ? `${o} ${a}` : String(o);
 }, kc0 = (t) => {
   const e = t.display;
   if (!t.observationValue)
@@ -99309,53 +99314,55 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
   depth: e = 0,
   memberIndex: r = 0,
   testIdPrefix: o = "",
-  hideThumbnail: a = !1
+  hideThumbnail: a = !1,
+  conceptDatatypeMap: c
 }) => {
-  const { t: c } = X1(), l = t.members && t.members.length > 0, i = t.display, s = o ? `${o}-` : "";
-  if (l)
+  const { t: l } = X1(), i = t.members && t.members.length > 0, s = t.display, d = o ? `${o}-` : "";
+  if (i)
     return /* @__PURE__ */ Ge(
       "div",
       {
         className: N2.nestedGroup,
-        "data-testid": `${s}obs-nested-group-${i}-${r}`,
+        "data-testid": `${d}obs-nested-group-${s}-${r}`,
         children: [
           /* @__PURE__ */ ae(
             "div",
             {
               className: N2.nestedGroupLabel,
-              "data-testid": `${s}obs-nested-group-label-${i}-${r}`,
+              "data-testid": `${d}obs-nested-group-label-${s}-${r}`,
               style: { paddingLeft: `${e * 16}px` },
-              children: i
+              children: s
             }
           ),
           /* @__PURE__ */ ae(
             "div",
             {
               className: N2.nestedGroupMembers,
-              "data-testid": `${s}obs-nested-group-members-${i}-${r}`,
-              children: t.members?.map((m, M) => /* @__PURE__ */ ae(
+              "data-testid": `${d}obs-nested-group-members-${s}-${r}`,
+              children: t.members?.map((M, w) => /* @__PURE__ */ ae(
                 PE,
                 {
-                  member: m,
+                  member: M,
                   depth: e + 1,
-                  memberIndex: M,
+                  memberIndex: w,
                   testIdPrefix: o,
-                  hideThumbnail: a
+                  hideThumbnail: a,
+                  conceptDatatypeMap: c
                 },
-                m.id
+                M.id
               ))
             }
           )
         ]
       }
     );
-  const { rangeString: d, isAbnormal: u } = YK1(t), h = IE(t, c), f = h ? BE(h, a) : null;
+  const { rangeString: u, isAbnormal: h } = YK1(t), f = IE(t, l, c), m = f ? BE(f, a) : null;
   return /* @__PURE__ */ Ge(o0, { children: [
     /* @__PURE__ */ Ge(
       "div",
       {
         className: N2.memberRow,
-        "data-testid": `${s}obs-member-row-${i}-${r}`,
+        "data-testid": `${d}obs-member-row-${s}-${r}`,
         style: { paddingLeft: `${e * 16}px` },
         children: [
           /* @__PURE__ */ Ge(
@@ -99363,12 +99370,12 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
             {
               className: E2(
                 N2.memberLabel,
-                u ? N2.abnormalValue : ""
+                h ? N2.abnormalValue : ""
               ),
-              "data-testid": `${s}obs-member-label-${i}-${r}`,
+              "data-testid": `${d}obs-member-label-${s}-${r}`,
               children: [
-                /* @__PURE__ */ ae("span", { children: i }),
-                d && /* @__PURE__ */ ae("p", { className: N2.rangeInfo, children: d })
+                /* @__PURE__ */ ae("span", { children: s }),
+                u && /* @__PURE__ */ ae("p", { className: N2.rangeInfo, children: u })
               ]
             }
           ),
@@ -99377,10 +99384,10 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
             {
               className: E2(
                 N2.memberValue,
-                u ? N2.abnormalValue : ""
+                h ? N2.abnormalValue : ""
               ),
-              "data-testid": `${s}obs-member-value-${i}-${r}`,
-              children: f
+              "data-testid": `${d}obs-member-value-${s}-${r}`,
+              children: m
             }
           )
         ]
@@ -99390,7 +99397,7 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
       "p",
       {
         className: N2.commentSection,
-        "data-testid": `${s}obs-member-comment-${i}-${r}`,
+        "data-testid": `${d}obs-member-comment-${s}-${r}`,
         style: { paddingLeft: `${e * 16}px` },
         children: [
           t.comment,
@@ -99399,49 +99406,54 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
       }
     )
   ] });
-}, al0 = (t, e, r, o = "", a = !1) => {
-  const c = t.members && t.members.length > 0, { rangeString: l, isAbnormal: i } = YK1(t), s = IE(t, r), d = s ? BE(s, a) : null, u = o ? `${o}-` : "";
+}, al0 = (t, e, r, o = "", a = !1, c) => {
+  const l = t.members && t.members.length > 0, { rangeString: i, isAbnormal: s } = YK1(t), d = IE(
+    t,
+    r,
+    c
+  ), u = d ? BE(d, a) : null, h = o ? `${o}-` : "";
   return /* @__PURE__ */ Ge(
     "div",
     {
       className: N2.observation,
-      "data-testid": `${u}observation-item-${t.display}-${e}`,
+      "data-testid": `${h}observation-item-${t.display}-${e}`,
       children: [
         /* @__PURE__ */ Ge(
           "div",
           {
-            className: c ? N2.groupContainer : N2.rowContainer,
-            "data-testid": `${u}observation-container-${t.display}-${e}`,
+            className: l ? N2.groupContainer : N2.rowContainer,
+            "data-testid": `${h}observation-container-${t.display}-${e}`,
             children: [
               /* @__PURE__ */ Ge(
                 "div",
                 {
                   className: E2(
-                    c ? N2.groupLabel : N2.rowLabel,
-                    !c && i ? N2.abnormalValue : ""
+                    l ? N2.groupLabel : N2.rowLabel,
+                    !l && s ? N2.abnormalValue : ""
                   ),
-                  "data-testid": `${u}observation-label-${t.display}-${e}`,
+                  "data-testid": `${h}observation-label-${t.display}-${e}`,
                   children: [
                     /* @__PURE__ */ ae("span", { children: t.display }),
-                    !c && l && /* @__PURE__ */ ae("p", { className: N2.rangeInfo, children: l })
+                    !l && i && /* @__PURE__ */ ae("p", { className: N2.rangeInfo, children: i })
                   ]
                 }
               ),
-              c ? /* @__PURE__ */ ae(
+              l ? /* @__PURE__ */ ae(
                 "div",
                 {
                   className: N2.groupMembers,
-                  "data-testid": `${u}observation-group-members-${t.display}-${e}`,
-                  children: t.members?.map((h, f) => /* @__PURE__ */ ae(
+                  "data-testid": `${h}observation-group-members-${t.display}-${e}`,
+                  children: t.members?.map((f, m) => /* @__PURE__ */ ae(
                     PE,
                     {
-                      member: h,
+                      member: f,
                       depth: 0,
-                      memberIndex: f,
+                      memberIndex: m,
                       testIdPrefix: o,
-                      hideThumbnail: a
+                      hideThumbnail: a,
+                      conceptDatatypeMap: c
                     },
-                    h.id
+                    f.id
                   ))
                 }
               ) : /* @__PURE__ */ ae(
@@ -99449,10 +99461,10 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
                 {
                   className: E2(
                     N2.rowValue,
-                    i ? N2.abnormalValue : ""
+                    s ? N2.abnormalValue : ""
                   ),
-                  "data-testid": `${u}observation-value-${t.display}-${e}`,
-                  children: d
+                  "data-testid": `${h}observation-value-${t.display}-${e}`,
+                  children: u
                 }
               )
             ]
@@ -99462,7 +99474,7 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
           "p",
           {
             className: N2.commentSection,
-            "data-testid": `${u}observation-comment-${t.display}-${e}`,
+            "data-testid": `${h}observation-comment-${t.display}-${e}`,
             children: [
               t.comment,
               t.encounter?.provider && ` - by ${t.encounter.provider}`
@@ -99483,13 +99495,14 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
   testIdPrefix: l = "",
   hideThumbnail: i = !1,
   controlOrder: s,
-  sectionMap: d
+  sectionMap: d,
+  conceptDatatypeMap: u
 }) => {
-  const { t: u } = X1(), h = t1(() => {
+  const { t: h } = X1(), f = t1(() => {
     if (t.length === 0) return [];
-    const y = Sc0(t), p = s && s.length > 0 ? Rc0(y, s) : JK1(y);
-    return XK1(p);
-  }, [t, s]), f = [
+    const p = Sc0(t), g = s && s.length > 0 ? Rc0(p, s) : JK1(p);
+    return XK1(g);
+  }, [t, s]), m = [
     { key: "label", header: "label" },
     { key: "value", header: "value" }
   ];
@@ -99497,7 +99510,7 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
     return /* @__PURE__ */ ae(
       F0,
       {
-        headers: f,
+        headers: m,
         rows: [],
         loading: !0,
         ariaLabel: "Loading observations",
@@ -99509,68 +99522,70 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
     return /* @__PURE__ */ ae(
       F0,
       {
-        headers: f,
+        headers: m,
         rows: [],
-        errorStateMessage: o ?? u("ERROR_LOADING_OBSERVATIONS"),
+        errorStateMessage: o ?? h("ERROR_LOADING_OBSERVATIONS"),
         ariaLabel: "Observations error",
         className: E2(N2.fullWidth, c)
       }
     );
-  if (h.length === 0)
+  if (f.length === 0)
     return /* @__PURE__ */ ae(
       F0,
       {
-        headers: f,
+        headers: m,
         rows: [],
-        emptyStateMessage: a ?? u("NO_OBSERVATIONS_AVAILABLE"),
+        emptyStateMessage: a ?? h("NO_OBSERVATIONS_AVAILABLE"),
         ariaLabel: "No observations",
         className: E2(N2.fullWidth, c)
       }
     );
-  const m = [];
-  let M = null;
-  h.forEach((y, p) => {
-    const g = y.sortId?.split("-")[0] ?? "", C = d?.[g] ?? null;
-    C ? (M?.name !== C && (M = {
+  const M = [];
+  let w = null;
+  f.forEach((p, g) => {
+    const C = p.sortId?.split("-")[0] ?? "", v = d?.[C] ?? null;
+    v ? (w?.name !== v && (w = {
       kind: "section",
-      name: C,
+      name: v,
       members: []
-    }, m.push(M)), M.members.push({ obs: y, index: p })) : (M = null, m.push({ kind: "obs", obs: y, index: p }));
+    }, M.push(w)), w.members.push({ obs: p, index: g })) : (w = null, M.push({ kind: "obs", obs: p, index: g }));
   });
-  const w = l ? `${l}-` : "", E = m.map((y) => y.kind === "obs" ? al0(
-    y.obs,
-    y.index,
-    u,
+  const E = l ? `${l}-` : "", y = M.map((p) => p.kind === "obs" ? al0(
+    p.obs,
+    p.index,
+    h,
     l,
-    i
+    i,
+    u
   ) : /* @__PURE__ */ ae(
     "div",
     {
       className: N2.observation,
-      "data-testid": `${w}section-${y.name}`,
+      "data-testid": `${E}section-${p.name}`,
       children: /* @__PURE__ */ Ge("div", { className: N2.groupContainer, children: [
         /* @__PURE__ */ ae(
           "div",
           {
             className: N2.groupLabel,
-            "data-testid": `${w}section-label-${y.name}`,
-            children: y.name
+            "data-testid": `${E}section-label-${p.name}`,
+            children: p.name
           }
         ),
-        /* @__PURE__ */ ae("div", { className: N2.groupMembers, children: y.members.map(({ obs: p, index: g }) => /* @__PURE__ */ ae(
+        /* @__PURE__ */ ae("div", { className: N2.groupMembers, children: p.members.map(({ obs: g, index: C }) => /* @__PURE__ */ ae(
           PE,
           {
-            member: p,
+            member: g,
             depth: 0,
-            memberIndex: g,
+            memberIndex: C,
             testIdPrefix: l,
-            hideThumbnail: i
+            hideThumbnail: i,
+            conceptDatatypeMap: u
           },
-          p.id
+          g.id
         )) })
       ] })
     },
-    `section-${y.name}`
+    `section-${p.name}`
   ));
   return /* @__PURE__ */ ae(
     "div",
@@ -99579,7 +99594,7 @@ const Ic0 = "ObservationsRenderer-module_resultsContainer__xvAwi", Bc0 = "Observ
       "data-testid": "observations-renderer-test-id",
       "aria-label": "observations-renderer-aria-label",
       className: E2(N2.resultsContainer, c),
-      children: E
+      children: y
     }
   );
 }, tG1 = ({ reportId: t }) => {
@@ -110042,7 +110057,7 @@ lG1({
   key: "commonSearch",
   component: nd0
 });
-Y0(() => Promise.resolve().then(() => do0)), Y0(() => Promise.resolve().then(() => So0)), Y0(() => Promise.resolve().then(() => w40)), Y0(() => Promise.resolve().then(() => H40)), Y0(() => import("./DocumentsTable-DvzP4zA0-Ctn06ZiV.js")), Y0(() => Promise.resolve().then(() => E60)), Y0(() => import("./FormsTable-BexiFTEe-aR2EeaaS.js")), Y0(() => Promise.resolve().then(() => hi0)), Y0(() => import("./Observations-DIntvvSw-DlFe6p8y.js")), Y0(
+Y0(() => Promise.resolve().then(() => do0)), Y0(() => Promise.resolve().then(() => So0)), Y0(() => Promise.resolve().then(() => w40)), Y0(() => Promise.resolve().then(() => H40)), Y0(() => import("./DocumentsTable-Cx3H-xNc-DXm8s6bY.js")), Y0(() => Promise.resolve().then(() => E60)), Y0(() => import("./FormsTable-BRgVe8lS-CLFnkEL2.js")), Y0(() => Promise.resolve().then(() => hi0)), Y0(() => import("./Observations-BZ0HyAoB-CshXgU3u.js")), Y0(
   () => Promise.resolve().then(() => ns0)
 ), Y0(
   () => Promise.resolve().then(() => $l0)
@@ -192094,7 +192109,7 @@ var AVt = (t, e = !1) => {
     const e = Fo2(() => {
       const r = this, [o] = this.#n, [a] = this.#o, [c] = this.#a, [l] = this.#c, [i] = this.#p, [s] = this.#t;
       let d;
-      return this.#l ? d = this.#l : (d = Po2(() => import("./LNWAZHJI-Vc_o0Tiw.js")), this.#l = d), s42(this.#h, this.#r), Io2(d, Bo2({
+      return this.#l ? d = this.#l : (d = Po2(() => import("./LNWAZHJI-B0_PmrgT.js")), this.#l = d), s42(this.#h, this.#r), Io2(d, Bo2({
         get queryFlavor() {
           return r.#d;
         },
@@ -192192,7 +192207,7 @@ var AVt = (t, e = !1) => {
     const e = Fo2(() => {
       const r = this, [o] = this.#n, [a] = this.#o, [c] = this.#a, [l] = this.#c, [i] = this.#p, [s] = this.#t, [d] = this.#l;
       let u;
-      return this.#i ? u = this.#i : (u = Po2(() => import("./MWZ6AO7Z-GBbhSrRz.js")), this.#i = u), s42(this.#h, this.#r), Io2(u, Bo2({
+      return this.#i ? u = this.#i : (u = Po2(() => import("./MWZ6AO7Z-CsNValOD.js")), this.#i = u), s42(this.#h, this.#r), Io2(u, Bo2({
         get queryFlavor() {
           return r.#d;
         },
@@ -192322,7 +192337,7 @@ const xMt = {
     }
   }
 }, bMt = "home", $Vt = "/bahmni/home/index.html#/login", DVt = "/bahmni/home/index.html#/changePassword", RVt = 6, NMt = Y0(
-  () => import("./index-BDA93bdX.js").then((t) => ({
+  () => import("./index-DDyGV6fU.js").then((t) => ({
     default: t.HomePage
   }))
 ), CMt = [
@@ -192353,7 +192368,7 @@ function SVt() {
 }
 export {
   Qyt as $,
-  RVt as A,
+  eVt as A,
   oVt as B,
   aVt as C,
   gyt as D,
@@ -192456,5 +192471,5 @@ export {
   cV as w,
   dyt as x,
   tVt as y,
-  eVt as z
+  RVt as z
 };

package/dist/{index-BDA93bdX.js → index-DDyGV6fU.js}

@@ -1,5 +1,5 @@
 import { jsxs as Ne, jsx as ne, Fragment as Qi } from "react/jsx-runtime";
-import { u as ot, v as Xi, N as Ji, w as ec, y as tc, Q as rc, z as nc, A as oc, B as hi, C as ac, F as lc, G as ic, K as cc, $ as sc, U as fc, Y as pc, X as hc, _ as uc } from "./index-CptkFVlT.js";
+import { u as ot, v as Xi, N as Ji, w as ec, y as tc, Q as rc, A as nc, z as oc, B as hi, C as ac, F as lc, G as ic, K as cc, $ as sc, U as fc, Y as pc, X as hc, _ as uc } from "./index-D7NmN6ZW.js";
 import * as Q from "react";
 import r, { createContext as at, useContext as $e, Children as q1, useState as pe, useLayoutEffect as V1, useEffect as ie, useMemo as lt, useCallback as Me, useRef as oe, forwardRef as y1, useReducer as dc, cloneElement as G1, isValidElement as wc } from "react";
 import { useQuery as mc } from "@tanstack/react-query";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { aO as a } from "./index-CptkFVlT.js";
+import { aO as a } from "./index-D7NmN6ZW.js";
 export {
   a as HomeApp
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bahmni/home-app",
-  "version": "0.0.1-dev.373",
+  "version": "0.0.1-dev.374",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",