@bahmni/services 0.0.1-dev.281 → 0.0.1-dev.288

package/dist/index.js

@@ -1,5 +1,5 @@
 import { initReactI18next as tc } from "react-i18next";
-import { useTranslation as I_ } from "react-i18next";
+import { useTranslation as D_ } from "react-i18next";
 import { useRef as xt, useCallback as fn, useEffect as tt, useSyncExternalStore as rc } from "react";
 function Ia(t, e) {
   return function() {
@@ -1457,7 +1457,7 @@ const ts = "1.16.0", Ls = 64 * 1024, { isFunction: Bt } = $, xs = (t, ...e) => {
       responseType: L,
       headers: N,
       withCredentials: k = "same-origin",
-      fetchOptions: H,
+      fetchOptions: B,
       maxContentLength: V,
       maxBodyLength: J
     } = Ya(g);
@@ -1512,7 +1512,7 @@ const ts = "1.16.0", Ls = 64 * 1024, { isFunction: Bt } = $, xs = (t, ...e) => {
       }
       N.set("User-Agent", "axios/" + ts, !1);
       const E = {
-        ...H,
+        ...B,
         signal: oe,
         method: b.toUpperCase(),
         headers: N.normalize().toJSON(),
@@ -1521,7 +1521,7 @@ const ts = "1.16.0", Ls = 64 * 1024, { isFunction: Bt } = $, xs = (t, ...e) => {
         credentials: D ? k : void 0
       };
       q = c && new o(p, E);
-      let O = await (c ? re(q, H) : re(p, E));
+      let O = await (c ? re(q, B) : re(p, E));
       if (ne) {
         const j = $.toFiniteNumber(O.headers.get("content-length"));
         if (j != null && j > V)
@@ -2310,7 +2310,7 @@ Ge.interceptors.response.use(
     return r.startsWith("ERROR_") || /^[A-Z_]+$/.test(r) ? Promise.reject(new Error(r)) : Promise.reject(`${e}: ${r}`);
   }
 );
-const B = async (t, e) => (await Ge.get(t, e)).data, Se = async (t, e) => (await Ge.post(t, e)).data, Za = async (t, e) => (await Ge.put(t, e)).data, pw = async (t, e) => (await Ge.patch(t, e)).data, ei = async (t) => (await Ge.delete(t)).data, W = (t) => typeof t == "string", Rt = () => {
+const H = async (t, e) => (await Ge.get(t, e)).data, Se = async (t, e) => (await Ge.post(t, e)).data, Za = async (t, e) => (await Ge.put(t, e)).data, pw = async (t, e) => (await Ge.patch(t, e)).data, ei = async (t) => (await Ge.delete(t)).data, W = (t) => typeof t == "string", Rt = () => {
   let t, e;
   const r = new Promise((n, s) => {
     t = n, e = s;
@@ -2679,10 +2679,10 @@ class jr extends Xr {
         return s ? (h.res = N, h.usedParams = this.getUsedParamsDetails(r), h) : N;
       }
       if (o) {
-        const N = Array.isArray(S), k = N ? [] : {}, H = N ? T : v;
+        const N = Array.isArray(S), k = N ? [] : {}, B = N ? T : v;
         for (const V in S)
           if (Object.prototype.hasOwnProperty.call(S, V)) {
-            const J = `${H}${o}${V}`;
+            const J = `${B}${o}${V}`;
             b && !y ? k[V] = this.translate(J, {
               ...r,
               defaultValue: Ys(w) ? w[V] : void 0,
@@ -3986,7 +3986,7 @@ class oi {
 oi.type = "languageDetector";
 const Vl = "en", ai = "NG_TRANSLATE_LANG_KEY", Hl = (t, e) => sl + `${t}/locales/locale_${e}.json`, Bl = (t, e) => `/bahmni_config/openmrs/i18n/${t}/locale_${e}.json`, Zr = () => localStorage.getItem(ai) ?? Vl, no = async (t) => {
   try {
-    const e = await B(t);
+    const e = await H(t);
     return e || (console.error(`Invalid response from ${t}`), {});
   } catch (e) {
     return console.error(`Failed to load translations from ${t}:`, e), {};
@@ -4210,7 +4210,7 @@ async function Iw() {
     const e = decodeURIComponent(t).replace(
       /^"(.*)"$/,
       "$1"
-    ), r = await B(Xl(e));
+    ), r = await H(Xl(e));
     return !r.results || r.results.length === 0 ? null : r.results[0];
   } catch {
     throw new Error(le.t("ERROR_FETCHING_USER_DETAILS"));
@@ -4226,9 +4226,9 @@ const as = () => {
   if (!e.uuid)
     throw new Error(le.t("ERROR_FETCHING_USER_LOCATION_DETAILS"));
   return e;
-}, $w = async () => (await B(td("commons"))).find(
+}, $w = async () => (await H(td("commons"))).find(
   (r) => r.property === rd
-)?.value ?? null, Dw = async () => (await B(Zl)).results ?? [], Cw = async () => {
+)?.value ?? null, Dw = async () => (await H(Zl)).results ?? [], Cw = async () => {
   try {
     await ei(nd), od.forEach((t) => {
       Wl(t);
@@ -4293,7 +4293,7 @@ const as = () => {
     throw new Error("Invalid patient UUID: UUID cannot be empty");
   if (!vd.test(t))
     throw new Error(`Invalid patient UUID format: ${t}`);
-  return B(li(t));
+  return H(li(t));
 }, Od = (t) => !t.extension || !Array.isArray(t.extension) ? [] : t.extension.flatMap((e) => e.extension && Array.isArray(e.extension) ? e.extension.filter((r) => r.valueString).map((r) => r.valueString) : []), Ad = (t) => {
   if (!t.name || t.name.length === 0)
     return null;
@@ -4325,18 +4325,18 @@ const as = () => {
   const e = await Rd(t);
   return Id(e);
 }, Fw = async (t) => {
-  const e = await B(Sd(t), {
+  const e = await H(Sd(t), {
     responseType: "blob"
   });
   return await Ql(e);
 }, jw = async (t, e) => {
   const r = as();
-  return await B(
+  return await H(
     cd(t, r.uuid, e)
   );
 }, Vw = async (t, e, r, n, s) => {
   const o = as();
-  return await B(
+  return await H(
     ud(
       t,
       e,
@@ -4345,11 +4345,11 @@ const as = () => {
       o.uuid
     )
   );
-}, Hw = async () => B(di), $d = async () => (await B(ld("core"))).find(
+}, Hw = async () => H(di), $d = async () => (await H(ld("core"))).find(
   (r) => r.property === dd
 )?.value ?? null, Bw = async () => {
   const [t, e] = await Promise.all([
-    B(di),
+    H(di),
     $d()
   ]), r = [], n = /* @__PURE__ */ new Map();
   if (!e)
@@ -4378,11 +4378,11 @@ const as = () => {
 }, zw = async (t) => Se(fd, t), Yw = async (t, e) => Se(
   pd(t),
   e
-), Gw = (t) => Se(hd, t), Kw = (t) => Se(md(t), {}), Ww = (t, e) => Za(li(t), e), Jw = async () => B(ii("mrs.genders")), Qw = async (t, e, r = bd, n) => {
+), Gw = (t) => Se(hd, t), Kw = (t) => Se(md(t), {}), Ww = (t, e) => Za(li(t), e), Jw = async () => H(ii("mrs.genders")), Qw = async (t, e, r = bd, n) => {
   if (!e || e.length < _d)
     return [];
   try {
-    return await B(
+    return await H(
       yd(t, e, r, n)
     );
   } catch (s) {
@@ -4390,9 +4390,9 @@ const as = () => {
       `Failed to fetch address hierarchy for field "${t}": ${s instanceof Error ? s.message : "Unknown error"}`
     );
   }
-}, Xw = async () => B(wd), Zw = async (t) => B(gd(t)), eE = async () => {
+}, Xw = async () => H(wd), Zw = async (t) => H(gd(t)), eE = async () => {
   try {
-    return (await B(
+    return (await H(
       Ed
     )).results.map((e) => ({
       uuid: e.uuid,
@@ -4404,7 +4404,7 @@ const as = () => {
       `Failed to fetch relationship types: ${t instanceof Error ? t.message : "Unknown error"}`
     );
   }
-}, tE = async () => B(Td);
+}, tE = async () => H(Td);
 var Dd = /* @__PURE__ */ ((t) => (t.BOOLEAN = "java.lang.Boolean", t.BOOLEAN_DATATYPE = "org.openmrs.customdatatype.datatype.BooleanDatatype", t.CONCEPT = "org.openmrs.Concept", t.CODED_CONCEPT = "org.bahmni.module.bahmnicore.customdatatype.datatype.CodedConceptDatatype", t.CONCEPT_DATATYPE = "org.openmrs.customdatatype.datatype.ConceptDatatype", t.STRING = "java.lang.String", t.FREE_TEXT = "org.openmrs.customdatatype.datatype.FreeTextDatatype", t.REGEX_VALIDATED_TEXT = "org.openmrs.customdatatype.datatype.RegexValidatedTextDatatype", t.INTEGER = "java.lang.Integer", t.FLOAT = "java.lang.Float", t.ATTRIBUTABLE_DATE = "org.openmrs.util.AttributableDate", t.DATE_DATATYPE = "org.openmrs.customdatatype.datatype.DateDatatype", t))(Dd || {}), Cd = /* @__PURE__ */ ((t) => (t.CHECKBOX = "checkbox", t.DROPDOWN = "dropdown", t.TEXT = "text", t.NUMBER = "number", t.DATE = "date", t))(Cd || {});
 const rE = (t) => t === "java.lang.Boolean" || t === "org.openmrs.customdatatype.datatype.BooleanDatatype" ? "checkbox" : t === "org.openmrs.Concept" || t === "org.bahmni.module.bahmnicore.customdatatype.datatype.CodedConceptDatatype" || t === "org.openmrs.customdatatype.datatype.ConceptDatatype" ? "dropdown" : t === "java.lang.Integer" || t === "java.lang.Float" ? "number" : t === "org.openmrs.util.AttributableDate" || t === "org.openmrs.customdatatype.datatype.DateDatatype" ? "date" : "text", nE = (t) => t === "java.lang.Boolean" || t === "org.openmrs.customdatatype.datatype.BooleanDatatype", sE = (t) => t === "org.openmrs.Concept" || t === "org.bahmni.module.bahmnicore.customdatatype.datatype.CodedConceptDatatype" || t === "org.openmrs.customdatatype.datatype.ConceptDatatype", oE = (t) => t === "java.lang.Integer" || t === "java.lang.Float", aE = (t) => t === "org.openmrs.util.AttributableDate" || t === "org.openmrs.customdatatype.datatype.DateDatatype", iE = (t) => t === "java.lang.String" || t === "org.openmrs.customdatatype.datatype.FreeTextDatatype" || t === "org.openmrs.customdatatype.datatype.RegexValidatedTextDatatype", Ld = (t) => {
   const e = new CustomEvent("bahmni-audit-log", { detail: t });
@@ -4459,7 +4459,7 @@ const rE = (t) => t === "java.lang.Boolean" || t === "org.openmrs.customdatatype
   }
 }, kd = K + "/auditlog", Md = {
   UNKNOWN_EVENT_TYPE: "AUDIT_LOG_ERROR_UNKNOWN_EVENT_TYPE"
-}, Ud = () => K + "/bahmnicore/config/bahmniencounter?callerContext=REGISTRATION_CONCEPTS", qd = K + "/visit", Fd = (t) => K + `/visit?patient=${t}&includeInactive=false&v=custom:(uuid,visitType,startDatetime,stopDatetime)`, jd = (t) => K + `/bahmnicore/visitLocation/${t}`, cE = async () => B(Ud()), Vd = async (t) => B(Fd(t)), Hd = async (t) => B(jd(t)), Bd = async (t) => Se(qd, t), uE = async (t) => {
+}, Ud = () => K + "/bahmnicore/config/bahmniencounter?callerContext=REGISTRATION_CONCEPTS", qd = K + "/visit", Fd = (t) => K + `/visit?patient=${t}&includeInactive=false&v=custom:(uuid,visitType,startDatetime,stopDatetime)`, jd = (t) => K + `/bahmnicore/visitLocation/${t}`, cE = async () => H(Ud()), Vd = async (t) => H(Fd(t)), Hd = async (t) => H(jd(t)), Bd = async (t) => Se(qd, t), uE = async (t) => {
   const e = await Vd(t);
   return e?.results && e.results.length > 0;
 }, lE = async (t, e) => {
@@ -7410,10 +7410,10 @@ const dE = {
   return r !== void 0 && r > 0 && (c += `&_count=${r}`), n !== void 0 && n > 0 && (c += `&_getpagesoffset=${n}`), c;
 }, hh = (t) => nn(t, "upcoming"), mh = (t, e) => nn(t, "past", e), gh = (t) => `${Ai}/${t}/status-change`, yh = K + "/appointmentService/all/full", wh = (t) => `${K}/appointmentService?uuid=${t}`, Eh = (t, e = 10, r = 0) => nn(t, "upcoming", e, r), bh = (t, e = 10, r = 0) => nn(t, "past", e, r), Ni = K + "/appointmentUnavailability", pE = async (t) => await Se(fh, t);
 async function hE(t) {
-  return await B(hh(t));
+  return await H(hh(t));
 }
 async function mE(t, e) {
-  return await B(
+  return await H(
     mh(t, e)
   );
 }
@@ -7422,24 +7422,24 @@ const gE = async (t, e, r) => await Se(gh(t), {
   onDate: r
 });
 async function yE(t) {
-  return await B(ph(t));
+  return await H(ph(t));
 }
-const wE = async () => await B(yh), EE = async (t) => {
+const wE = async () => await H(yh), EE = async (t) => {
   await ei(wh(t));
 };
 async function bE(t, e = 10, r = 1) {
-  const n = (r - 1) * e, s = await B(
+  const n = (r - 1) * e, s = await H(
     Eh(t, e, n)
   );
   return { bundle: s, total: s.total ?? s.entry?.length ?? 0 };
 }
 async function _E(t, e = 10, r = 1) {
-  const n = (r - 1) * e, s = await B(
+  const n = (r - 1) * e, s = await H(
     bh(t, e, n)
   );
   return { bundle: s, total: s.total ?? s.entry?.length ?? 0 };
 }
-const vE = async () => await B(Ni), SE = async (t) => {
+const vE = async () => await H(Ni), SE = async (t) => {
   await Se(Ni, t);
 }, Pi = "dd/MM/yyyy", _h = "default_dateFormat", vh = "h:mm a", TE = "yyyy-MM-dd", De = {
   PARSE_ERROR: "DATE_ERROR_PARSE",
@@ -7690,19 +7690,19 @@ const Ah = () => {
   };
 }, xE = Ah(), Nh = (t) => ie + `/ValueSet/${t}/$expand`, Ph = (t) => ie + `/ValueSet/$expand?filter=${encodeURIComponent(t)}`, Ih = (t, e, r) => K + `/bahmni/terminologies/concepts?limit=${e}&locale=${r}&term=${t}`, $h = (t) => K + `/concept/${t}`, Dh = (t) => `${K}/concept?s=byFullySpecifiedName&name=${encodeURIComponent(t)}`, Ch = "SHORT", Lh = "FULLY_SPECIFIED", kE = async (t, e = 20) => {
   const r = Zr(), n = Ih(t, e, r);
-  return B(n);
+  return H(n);
 }, Lr = async (t) => {
   const e = Nh(t);
-  return B(e);
+  return H(e);
 }, xh = async (t) => {
   const e = `${Ph(t)}`;
-  return B(e);
+  return H(e);
 };
 async function ME(t) {
-  return await B($h(t));
+  return await H($h(t));
 }
 async function UE(t) {
-  const e = Dh(t), r = await B(e);
+  const e = Dh(t), r = await H(e);
   return !r.results || r.results.length === 0 ? null : r.results[0];
 }
 function kh(t) {
@@ -7762,7 +7762,7 @@ const Mh = (t) => ie + `/AllergyIntolerance?patient=${t}&_count=100&_sort=-_last
   return (await Lr(e)).compose?.include[0]?.concept ?? [];
 };
 async function jh(t) {
-  return await B(`${Mh(t)}`);
+  return await H(`${Mh(t)}`);
 }
 async function Vh(t) {
   return (await jh(t)).entry?.map(
@@ -7826,13 +7826,13 @@ const HE = "http://fhir.openmrs.org/code-system/encounter-type", $i = "problem-l
   NORMAL: { code: "N", display: "Normal" }
 }, Kh = ie + "/Condition", Wh = (t) => ie + `/Condition?category=${$i}&patient=${t}&_count=100&_sort=-_lastUpdated`, Jh = (t, e = 10, r = 0) => ie + `/Condition?category=${$i}&patient=${t}&_count=${e}&_getpagesoffset=${r}&_sort=-_lastUpdated`;
 async function Qh(t) {
-  return await B(`${Wh(t)}`);
+  return await H(`${Wh(t)}`);
 }
 async function rb(t) {
   return (await Qh(t)).entry?.filter((n) => n.resource?.resourceType === "Condition").map((n) => n.resource) ?? [];
 }
 async function nb(t, e = 10, r = 1) {
-  const n = (r - 1) * e, s = await B(
+  const n = (r - 1) * e, s = await H(
     Jh(t, e, n)
   );
   return {
@@ -7872,10 +7872,10 @@ const Xh = (t) => ie + `/Condition?category=${Di}&patient=${t}&_count=100&_sort=
   }
 ], em = "confirmed", tm = "provisional";
 async function rm(t) {
-  return await B(Xh(t));
+  return await H(Xh(t));
 }
 async function nm(t, e, r) {
-  return await B(
+  return await H(
     Zh(t, e, r)
   );
 }
@@ -7946,7 +7946,7 @@ const Lt = {
 }, cm = (t, e, r) => {
   let s = `${ie + "/MedicationRequest?" + Lt.SORT + "&" + Lt.COUNT + "&" + Lt.INCLUDE_MEDICATION}&patient=${t}`;
   return e && (s += `&code=${e}`), r && (s += `&encounter=${r}`), s;
-}, um = K + "/bahmnicore/config/drugOrders", lm = (t, e) => ie + `/Medication?name=${encodeURIComponent(t)}&_count=${e}&_sort=-_lastUpdated`, dm = ie + "/Medication?code=http://hl7.org/fhir/sid/cvx|&_count=100", fm = (t) => {
+}, um = K + "/bahmnicore/config/drugOrders", lm = (t, e) => ie + `/Medication?name=${encodeURIComponent(t)}&_count=${e}&_sort=-_lastUpdated`, dm = ie + "/Medication?code=http://hl7.org/fhir/sid/cvx|&_count=100", ib = "medication", fm = (t) => {
   switch (t.status) {
     case "active":
       return He.Active;
@@ -7972,7 +7972,7 @@ async function pm(t, e, r, n = !1) {
   let o;
   e && e.length > 0 && (o = e.join(","));
   const i = (n ? cm : im)(t, o, s);
-  return await B(i);
+  return await H(i);
 }
 function hm(t) {
   const e = t?.[0]?.doseAndRate?.[0]?.doseQuantity;
@@ -8095,7 +8095,7 @@ function Tm(t) {
   });
 }
 const po = (t) => t.priority === "stat";
-async function ib(t, e, r, n = !1) {
+async function cb(t, e, r, n = !1) {
   const s = await pm(
     t,
     e,
@@ -8104,22 +8104,22 @@ async function ib(t, e, r, n = !1) {
   );
   return Tm(s);
 }
-async function cb() {
-  return await B(
+async function ub() {
+  return await H(
     um
   );
 }
-async function ub(t, e = 20) {
-  return await B(
+async function lb(t, e = 20) {
+  return await H(
     lm(t, e)
   );
 }
-async function lb() {
-  return await B(dm);
+async function db() {
+  return await H(dm);
 }
 const Rm = (t) => `${ie}/Medication/${t}`;
-async function db(t) {
-  return await B(Rm(t));
+async function fb(t) {
+  return await H(Rm(t));
 }
 const Om = 200, Am = (t, e, r, n, s) => {
   let a = `${ie + `/ServiceRequest?_count=${Om}&_sort=-_lastUpdated`}&category=${t}&patient=${e}`;
@@ -8127,7 +8127,7 @@ const Om = 200, Am = (t, e, r, n, s) => {
 };
 async function Ht(t, e, r, n, s) {
   let o;
-  return r && r.length > 0 && (o = r.join(",")), await B(
+  return r && r.length > 0 && (o = r.join(",")), await H(
     Am(
       t,
       e,
@@ -8138,7 +8138,7 @@ async function Ht(t, e, r, n, s) {
   );
 }
 const Nm = (t) => `${ie}/ImagingStudy/${t}/$fetch-quality-assessment`;
-async function fb(t, e, r, n) {
+async function pb(t, e, r, n) {
   return await Ht(
     e,
     t,
@@ -8146,7 +8146,7 @@ async function fb(t, e, r, n) {
     n
   );
 }
-async function pb(t, e, r, n) {
+async function hb(t, e, r, n) {
   return await Ht(
     e,
     t,
@@ -8155,7 +8155,7 @@ async function pb(t, e, r, n) {
     "ImagingStudy:basedon"
   );
 }
-async function hb(t, e, r, n) {
+async function mb(t, e, r, n) {
   return (await Ht(
     e,
     t,
@@ -8163,10 +8163,10 @@ async function hb(t, e, r, n) {
     n
   )).entry?.filter((a) => a.resource?.resourceType === "ServiceRequest").map((a) => a.resource) ?? [];
 }
-async function mb(t) {
-  return await B(Nm(t));
+async function gb(t) {
+  return await H(Nm(t));
 }
-async function gb(t, e, r, n) {
+async function yb(t, e, r, n) {
   return await Ht(
     e,
     t,
@@ -8178,29 +8178,29 @@ const Pm = (t, e) => {
   const r = `${ie}/DiagnosticReport?patient=${t}`;
   return e ? `${r}&based-on=${e}` : r;
 }, Im = (t) => `${ie}/DiagnosticReport/${t}/$fetch-bundle`, $m = (t) => `${ie}/DiagnosticReport/${t}/$update-bundle`;
-async function yb(t, e = []) {
+async function wb(t, e = []) {
   const r = e.length > 0 ? e.join(",") : void 0, n = Pm(t, r);
-  return await B(n);
+  return await H(n);
 }
-async function wb(t) {
+async function Eb(t) {
   const e = Im(t);
-  return await B(e);
+  return await H(e);
 }
-async function Eb(t, e) {
+async function bb(t, e) {
   const r = $m(t);
   return await Se(r, e);
 }
-const bb = [
+const _b = [
   "preliminary",
   "final",
   "amended",
   "corrected",
   "appended"
-], _b = [
+], vb = [
   "registered",
   "unknown",
   "partial"
-], Dm = "All Orderables", Cm = "/openmrs/ws/rest/v1/ordertype?v=custom:(uuid,display,conceptClasses:(uuid,name))", Lm = "LabSet", xm = "http://fhir.bahmni.org/ext/ValueSet/concept-class", vb = ["orderTypes"], km = async () => await xh(Dm), gs = async () => await B(Cm), Mm = (t) => {
+], Dm = "All Orderables", Cm = "/openmrs/ws/rest/v1/ordertype?v=custom:(uuid,display,conceptClasses:(uuid,name))", Lm = "LabSet", xm = "http://fhir.bahmni.org/ext/ValueSet/concept-class", Sb = ["orderTypes"], km = async () => await xh(Dm), gs = async () => await H(Cm), Mm = (t) => {
   let e = t.display ?? "Unknown investigation";
   return Li(t) === Lm && (e += ` (${le.t("INVESTIGATION_PANEL")})`), e;
 }, Um = (t) => {
@@ -8232,12 +8232,12 @@ const bb = [
       });
     });
   }), r;
-}, Sb = async () => {
+}, Tb = async () => {
   const t = await km(), e = await gs();
   return qm(t, Um(e));
-}, Tb = async (t) => t ? (await gs()).results.find(
+}, Rb = async (t) => t ? (await gs()).results.find(
   (n) => n.display.toLowerCase() === t.toLowerCase()
-)?.uuid ?? null : null, Rb = async () => (await gs()).results.map((e) => e.display), Ob = async (t, e, r) => {
+)?.uuid ?? null : null, Ob = async () => (await gs()).results.map((e) => e.display), Ab = async (t, e, r) => {
   const n = [];
   for (const s of t) {
     const o = s.uuid;
@@ -8587,7 +8587,7 @@ function te() {
       }
       get names() {
         const E = this.lhs instanceof e.Name ? {} : { ...this.lhs.names };
-        return H(E, this.rhs);
+        return B(E, this.rhs);
       }
     }
     class c extends i {
@@ -8711,7 +8711,7 @@ function te() {
       }
       get names() {
         const E = super.names;
-        return H(E, this.condition), this.else && k(E, this.else.names), E;
+        return B(E, this.condition), this.else && k(E, this.else.names), E;
       }
     }
     g.kind = "if";
@@ -8742,8 +8742,8 @@ function te() {
         return `for(${O} ${x}=${z}; ${x}<${j}; ${x}++)` + super.render(E);
       }
       get names() {
-        const E = H(super.names, this.from);
-        return H(E, this.to);
+        const E = B(super.names, this.from);
+        return B(E, this.to);
       }
     }
     class d extends p {
@@ -9025,7 +9025,7 @@ function te() {
         D[O] = (D[O] || 0) + (E[O] || 0);
       return D;
     }
-    function H(D, E) {
+    function B(D, E) {
       return E instanceof e._CodeOrName ? k(D, E.names) : D;
     }
     function V(D, E, O) {
@@ -9147,8 +9147,8 @@ function se() {
   X.eachItem = y;
   function v({ mergeNames: d, mergeToName: m, mergeValues: w, resultToName: S }) {
     return (I, L, N, k) => {
-      const H = N === void 0 ? L : N instanceof t.Name ? (L instanceof t.Name ? d(I, L, N) : m(I, L, N), N) : L instanceof t.Name ? (m(I, N, L), L) : w(L, N);
-      return k === t.Name && !(H instanceof t.Name) ? S(I, H) : H;
+      const B = N === void 0 ? L : N instanceof t.Name ? (L instanceof t.Name ? d(I, L, N) : m(I, L, N), N) : L instanceof t.Name ? (m(I, N, L), L) : w(L, N);
+      return k === t.Name && !(B instanceof t.Name) ? S(I, B) : B;
     };
   }
   X.mergeEvaluated = {
@@ -9623,14 +9623,14 @@ function ke() {
   }
   ce.schemaProperties = y;
   function v({ schemaCode: p, data: b, it: { gen: R, topSchemaRef: d, schemaPath: m, errorPath: w }, it: S }, I, L, N) {
-    const k = N ? (0, t._)`${p}, ${b}, ${d}${m}` : b, H = [
+    const k = N ? (0, t._)`${p}, ${b}, ${d}${m}` : b, B = [
       [r.default.instancePath, (0, t.strConcat)(r.default.instancePath, w)],
       [r.default.parentData, S.parentData],
       [r.default.parentDataProperty, S.parentDataProperty],
       [r.default.rootData, r.default.rootData]
     ];
-    S.opts.dynamicRef && H.push([r.default.dynamicAnchors, r.default.dynamicAnchors]);
-    const V = (0, t._)`${k}, ${R.object(...H)}`;
+    S.opts.dynamicRef && B.push([r.default.dynamicAnchors, r.default.dynamicAnchors]);
+    const V = (0, t._)`${k}, ${R.object(...B)}`;
     return L !== t.nil ? (0, t._)`${I}.call(${L}, ${V})` : (0, t._)`${I}(${V})`;
   }
   ce.callValidateCode = v;
@@ -9709,25 +9709,25 @@ function Hm() {
       if (v.errors === !1)
         N(), v.modifying && a(y), k(() => y.error());
       else {
-        const H = v.async ? I() : L();
-        v.modifying && a(y), k(() => i(y, H));
+        const B = v.async ? I() : L();
+        v.modifying && a(y), k(() => i(y, B));
       }
     }
     function I() {
-      const H = _.let("ruleErrs", null);
-      return _.try(() => N((0, t._)`await `), (V) => _.assign(w, !1).if((0, t._)`${V} instanceof ${R.ValidationError}`, () => _.assign(H, (0, t._)`${V}.errors`), () => _.throw(V))), H;
+      const B = _.let("ruleErrs", null);
+      return _.try(() => N((0, t._)`await `), (V) => _.assign(w, !1).if((0, t._)`${V} instanceof ${R.ValidationError}`, () => _.assign(B, (0, t._)`${V}.errors`), () => _.throw(V))), B;
     }
     function L() {
-      const H = (0, t._)`${m}.errors`;
-      return _.assign(H, null), N(t.nil), H;
+      const B = (0, t._)`${m}.errors`;
+      return _.assign(B, null), N(t.nil), B;
     }
-    function N(H = v.async ? (0, t._)`await ` : t.nil) {
+    function N(B = v.async ? (0, t._)`await ` : t.nil) {
       const V = R.opts.passContext ? e.default.this : e.default.self, J = !("compile" in v && !b || v.schema === !1);
-      _.assign(w, (0, t._)`${H}${(0, r.callValidateCode)(y, m, V, J)}`, v.modifying);
+      _.assign(w, (0, t._)`${B}${(0, r.callValidateCode)(y, m, V, J)}`, v.modifying);
     }
-    function k(H) {
+    function k(B) {
       var V;
-      _.if((0, t.not)((V = v.valid) !== null && V !== void 0 ? V : w), H);
+      _.if((0, t.not)((V = v.valid) !== null && V !== void 0 ? V : w), B);
     }
   }
   Le.funcKeywordCode = o;
@@ -10006,11 +10006,11 @@ function on() {
     if (typeof _ == "boolean")
       return {};
     const { schemaId: g, uriResolver: p } = this.opts, b = h(_[g] || f), R = { "": b }, d = c(p, b, !1), m = {}, w = /* @__PURE__ */ new Set();
-    return r(_, { allKeys: !0 }, (L, N, k, H) => {
-      if (H === void 0)
+    return r(_, { allKeys: !0 }, (L, N, k, B) => {
+      if (B === void 0)
         return;
       const V = d + N;
-      let J = R[H];
+      let J = R[B];
       typeof L[g] == "string" && (J = ne.call(this, L[g])), we.call(this, L.$anchor), we.call(this, L.$dynamicAnchor), R[N] = J;
       function ne(re) {
         const oe = this.opts.uriResolver.resolve;
@@ -10069,7 +10069,7 @@ function an() {
   function f(A) {
     const { schema: C, opts: M, gen: F } = A;
     v(A, () => {
-      M.$comment && C.$comment && H(A), L(A), F.let(c.default.vErrors, null), F.let(c.default.errors, 0), M.unevaluated && g(A), S(A), V(A);
+      M.$comment && C.$comment && B(A), L(A), F.let(c.default.vErrors, null), F.let(c.default.errors, 0), M.unevaluated && g(A), S(A), V(A);
     });
   }
   function g(A) {
@@ -10100,7 +10100,7 @@ function an() {
   }
   function m(A, C) {
     const { schema: M, gen: F, opts: G } = A;
-    G.$comment && M.$comment && H(A), N(A), k(A);
+    G.$comment && M.$comment && B(A), N(A), k(A);
     const ee = F.const("_errs", c.default.errors);
     S(A, ee), F.var(C, (0, i._)`${ee} === ${c.default.errors}`);
   }
@@ -10129,7 +10129,7 @@ function an() {
     if (A.schema.$async && !A.schemaEnv.$async)
       throw new Error("async schema in sync schema");
   }
-  function H({ gen: A, schemaEnv: C, schema: M, errSchemaPath: F, opts: G }) {
+  function B({ gen: A, schemaEnv: C, schema: M, errSchemaPath: F, opts: G }) {
     const ee = M.$comment;
     if (G.$comment === !0)
       A.code((0, i._)`${c.default.self}.logger.log(${ee})`);
@@ -10430,17 +10430,17 @@ function ws() {
       this._compilations.add(f), (0, o.validateFunctionCode)(I), m.optimize(this.opts.code.optimize);
       const N = m.toString();
       L = `${m.scopeRefs(r.default.scope)}return ${N}`, this.opts.code.process && (L = this.opts.code.process(L, f));
-      const H = new Function(`${r.default.self}`, `${r.default.scope}`, L)(this, this.scope.get());
-      if (this.scope.value(S, { ref: H }), H.errors = null, H.schema = f.schema, H.schemaEnv = f, f.$async && (H.$async = !0), this.opts.code.source === !0 && (H.source = { validateName: S, validateCode: N, scopeValues: m._values }), this.opts.unevaluated) {
+      const B = new Function(`${r.default.self}`, `${r.default.scope}`, L)(this, this.scope.get());
+      if (this.scope.value(S, { ref: B }), B.errors = null, B.schema = f.schema, B.schemaEnv = f, f.$async && (B.$async = !0), this.opts.code.source === !0 && (B.source = { validateName: S, validateCode: N, scopeValues: m._values }), this.opts.unevaluated) {
         const { props: V, items: J } = I;
-        H.evaluated = {
+        B.evaluated = {
           props: V instanceof t.Name ? void 0 : V,
           items: J instanceof t.Name ? void 0 : J,
           dynamicProps: V instanceof t.Name,
           dynamicItems: J instanceof t.Name
-        }, H.source && (H.source.evaluated = (0, t.stringify)(H.evaluated));
+        }, B.source && (B.source.evaluated = (0, t.stringify)(B.evaluated));
       }
-      return f.validate = H, f;
+      return f.validate = B, f;
     } catch (N) {
       throw delete f.validate, delete f.validateName, L && this.logger.error("Error compiling schema, function code:", L), N;
     } finally {
@@ -10580,8 +10580,8 @@ function Ui() {
     let m = 0;
     const w = { error: !1, address: "", zone: "" }, S = [], I = [];
     let L = !1, N = !1, k = c;
-    for (let H = 0; H < d.length; H++) {
-      const V = d[H];
+    for (let B = 0; B < d.length; B++) {
+      const V = d[B];
       if (!(V === "[" || V === "]"))
         if (V === ":") {
           if (L === !0 && (N = !0), !k(I, S, w))
@@ -10590,7 +10590,7 @@ function Ui() {
             w.error = !0;
             break;
           }
-          H > 0 && d[H - 1] === ":" && (L = !0), S.push(":");
+          B > 0 && d[B - 1] === ":" && (L = !0), S.push(":");
           continue;
         } else if (V === "%") {
           if (!k(I, S, w))
@@ -10939,12 +10939,12 @@ function eg() {
       resourceName: S.resourceName,
       secure: S.secure,
       error: ""
-    }, N = Object.assign({}, I), k = [], H = l(N.scheme || L.scheme);
-    H && H.serialize && H.serialize(L, N), L.path !== void 0 && (N.skipEscape ? L.path = n(L.path) : (L.path = o(L.path), L.scheme !== void 0 && (L.path = L.path.split("%3A").join(":")))), N.reference !== "suffix" && L.scheme && k.push(L.scheme, ":");
+    }, N = Object.assign({}, I), k = [], B = l(N.scheme || L.scheme);
+    B && B.serialize && B.serialize(L, N), L.path !== void 0 && (N.skipEscape ? L.path = n(L.path) : (L.path = o(L.path), L.scheme !== void 0 && (L.path = L.path.split("%3A").join(":")))), N.reference !== "suffix" && L.scheme && k.push(L.scheme, ":");
     const V = r(L);
     if (V !== void 0 && (N.reference !== "suffix" && k.push("//"), k.push(V), L.path && L.path[0] !== "/" && k.push("/")), L.path !== void 0) {
       let J = L.path;
-      !N.absolutePath && (!H || !H.absolutePath) && (J = e(J)), V === void 0 && J[0] === "/" && J[1] === "/" && (J = "/%2F" + J.slice(2)), k.push(J);
+      !N.absolutePath && (!B || !B.absolutePath) && (J = e(J)), V === void 0 && J[0] === "/" && J[1] === "/" && (J = "/%2F" + J.slice(2)), k.push(J);
     }
     return L.query !== void 0 && k.push("?", L.query), L.fragment !== void 0 && k.push("#", L.fragment), k.join("");
   }
@@ -10965,7 +10965,7 @@ function eg() {
       query: void 0,
       fragment: void 0
     };
-    let k = !1, H = !1;
+    let k = !1, B = !1;
     L.reference === "suffix" && (L.scheme ? S = L.scheme + ":" + S : S = "//" + S);
     const V = S.match(f);
     if (V) {
@@ -10974,18 +10974,18 @@ function eg() {
       if (J !== void 0 && (N.error = N.error || J, k = !0), N.host)
         if (i(N.host) === !1) {
           const re = t(N.host);
-          N.host = re.host.toLowerCase(), H = re.isIPV6;
+          N.host = re.host.toLowerCase(), B = re.isIPV6;
         } else
-          H = !0;
+          B = !0;
       N.scheme === void 0 && N.userinfo === void 0 && N.host === void 0 && N.port === void 0 && N.query === void 0 && !N.path ? N.reference = "same-document" : N.scheme === void 0 ? N.reference = "relative" : N.fragment === void 0 ? N.reference = "absolute" : N.reference = "uri", L.reference && L.reference !== "suffix" && L.reference !== N.reference && (N.error = N.error || "URI is not a " + L.reference + " reference.");
       const ne = l(L.scheme || N.scheme);
-      if (!L.unicodeSupport && (!ne || !ne.unicodeSupport) && N.host && (L.domainHost || ne && ne.domainHost) && H === !1 && c(N.host))
+      if (!L.unicodeSupport && (!ne || !ne.unicodeSupport) && N.host && (L.domainHost || ne && ne.domainHost) && B === !1 && c(N.host))
         try {
           N.host = URL.domainToASCII(N.host.toLowerCase());
         } catch (we) {
           N.error = N.error || "Host's domain name can not be converted to ASCII: " + we;
         }
-      if ((!ne || ne && !ne.skipNormalize) && (S.indexOf("%") !== -1 && (N.scheme !== void 0 && (N.scheme = unescape(N.scheme)), N.host !== void 0 && (N.host = a(unescape(N.host), H))), N.path && (N.path = s(N.path)), N.fragment))
+      if ((!ne || ne && !ne.skipNormalize) && (S.indexOf("%") !== -1 && (N.scheme !== void 0 && (N.scheme = unescape(N.scheme)), N.host !== void 0 && (N.host = a(unescape(N.host), B))), N.path && (N.path = s(N.path)), N.fragment))
         try {
           N.fragment = encodeURI(decodeURIComponent(N.fragment));
         } catch {
@@ -11432,13 +11432,13 @@ function rg() {
         return q;
       throw new Error("logger must implement log, warn and error methods");
     }
-    const H = /^[a-z_$][a-z0-9_$:-]*$/i;
+    const B = /^[a-z_$][a-z0-9_$:-]*$/i;
     function V(q, P) {
       const { RULES: U } = this;
       if ((0, l.eachItem)(q, (D) => {
         if (U.keywords[D])
           throw new Error(`Keyword ${D} is already defined`);
-        if (!H.test(D))
+        if (!B.test(D))
           throw new Error(`Keyword ${D} has invalid name`);
       }), !!P && P.$data && !("code" in P || "validate" in P))
         throw new Error('$data keyword must have "code" or "validate" function');
@@ -12694,10 +12694,10 @@ function Mg() {
             if (k = r.resolveRef.call(y.self, y.schemaEnv.root, y.baseId, V), k instanceof r.SchemaEnv && (k = k.schema), k === void 0)
               throw new n.default(y.opts.uriResolver, y.baseId, V);
           }
-          const H = (R = k?.properties) === null || R === void 0 ? void 0 : R[T];
-          if (typeof H != "object")
+          const B = (R = k?.properties) === null || R === void 0 ? void 0 : R[T];
+          if (typeof B != "object")
             throw new Error(`discriminator: oneOf subschemas (or referenced schemas) must have "properties/${T}"`);
-          w = w && (m || S(k)), I(H, N);
+          w = w && (m || S(k)), I(B, N);
         }
         if (!w)
           throw new Error(`discriminator: "${T}" must be required`);
@@ -12709,8 +12709,8 @@ function Mg() {
           if (N.const)
             L(N.const, k);
           else if (N.enum)
-            for (const H of N.enum)
-              L(H, k);
+            for (const B of N.enum)
+              L(B, k);
           else
             throw new Error(`discriminator: "properties/${T}" must have "const" or "enum"`);
         }
@@ -12785,17 +12785,17 @@ var Yg = zg();
 const Gg = /* @__PURE__ */ Fm(Yg), Aa = {
   CONFIG_NOT_FOUND: "CONFIG_ERROR_NOT_FOUND",
   VALIDATION_FAILED: "CONFIG_ERROR_VALIDATION_FAILED"
-}, Ab = async (t, e) => {
+}, Nb = async (t, e) => {
   const r = await Kg(t);
   if (!r)
     throw new Error(Aa.CONFIG_NOT_FOUND);
   if (!await Wg(r, e))
     throw new Error(Aa.VALIDATION_FAILED);
   return r;
-}, Kg = async (t) => await B(t), Wg = async (t, e) => new Gg().compile(e)(t), Jg = (t) => K + `/form/${t}?v=custom:(resources:(value))`, Qg = (t) => {
+}, Kg = async (t) => await H(t), Wg = async (t, e) => new Gg().compile(e)(t), Jg = (t) => K + `/form/${t}?v=custom:(resources:(value))`, Qg = (t) => {
   const e = K + "/bahmniie/form/latestPublishedForms";
   return t ? e + `?episodeUuid=${t}` : e;
-}, Nb = (t) => K + `/user/${t}?v=full`, Xg = (t, e, r, n) => K + `/bahmniie/form/translations?formName=${encodeURIComponent(t)}&formUuid=${e}&formVersion=${r}&locale=${n}`, xr = "Bahmni", Zg = (t, e, r) => {
+}, Pb = (t) => K + `/user/${t}?v=full`, Xg = (t, e, r, n) => K + `/bahmniie/form/translations?formName=${encodeURIComponent(t)}&formUuid=${e}&formVersion=${r}&locale=${n}`, xr = "Bahmni", Zg = (t, e, r) => {
   let s = K + "/bahmnicore/patient/" + t + "/forms";
   return r ? s += `?patientProgramUuid=${r}` : e && (s += `?numberOfVisits=${e}`), s;
 }, ey = (t, e) => {
@@ -12807,33 +12807,33 @@ const Gg = /* @__PURE__ */ Fm(Yg), Aa = {
 };
 async function ry(t, e) {
   const r = ey(t, e);
-  return await B(r);
+  return await H(r);
 }
-async function Pb(t, e) {
+async function Ib(t, e) {
   const r = ty(t, e);
-  return await B(r);
+  return await H(r);
 }
-async function Ib(t, e) {
+async function $b(t, e) {
   return (await ry(t, e)).entry?.filter((s) => s.resource?.resourceType === "Observation").map((s) => s.resource) ?? [];
 }
 const Vi = (t) => K + `/provider?user=${t}&v=custom:(uuid,display,person,attributes)`, ny = K + "/provider?v=custom:(uuid,display,person,attributes)";
-async function $b(t) {
-  const e = await B(
+async function Db(t) {
+  const e = await H(
     Vi(t)
   );
   return !e.results || e.results.length === 0 ? null : e.results[0];
 }
-async function Db() {
+async function Cb() {
   const t = [];
   let e = ny;
   for (; e; ) {
-    const r = await B(e);
+    const r = await H(e);
     t.push(...r.results ?? []), e = r.links?.find((s) => s.rel === "next")?.uri ?? null;
   }
   return t;
 }
-async function Cb(t) {
-  const e = await B(Vi(t));
+async function Lb(t) {
+  const e = await H(Vi(t));
   if (!e.results || e.results.length === 0)
     return [];
   const r = e.results[0];
@@ -12843,7 +12843,7 @@ async function Cb(t) {
 }
 const sy = (t) => ie + `/Encounter?subject:Patient=${t}&_tag=visit&_sort=-_lastUpdated`, oy = (t) => `${ie}/Observation/$fetch-all?encounter=${t}`;
 async function ay(t) {
-  return await B(sy(t));
+  return await H(sy(t));
 }
 async function iy(t) {
   return (await ay(t)).entry?.map((r) => r.resource).filter((r) => r !== void 0) ?? [];
@@ -12851,19 +12851,24 @@ async function iy(t) {
 async function Hi(t) {
   return (await iy(t)).find((r) => !r.period?.end) ?? null;
 }
-async function Lb(t) {
-  return await B(
+async function xb(t, e) {
+  return await H(
+    `/openmrs/ws/fhir2/R4/Encounter/${t}`,
+    e
+  );
+}
+async function kb(t) {
+  return await H(
     oy(t)
   );
 }
-const xb = (t, e) => t?.length === 0 ? !1 : e?.length === 0, cy = ie + "/Encounter", uy = K + "/systemsetting/bahmni.encountersession.duration", kb = "d34fe3ab-5e07-11ef-8f7c-0242ac120002", Mb = {
+const Mb = (t, e) => t?.length === 0 ? !1 : e?.length === 0, cy = ie + "/Encounter", uy = K + "/systemsetting/bahmni.encountersession.duration", Ub = "d34fe3ab-5e07-11ef-8f7c-0242ac120002", qb = {
   MATCHED: "ENCOUNTER_MATCH_REASON_MATCHED",
   NO_ACTIVE_VISIT: "ENCOUNTER_MATCH_REASON_NO_ACTIVE_VISIT",
   NO_ACTIVE_ENCOUNTER: "ENCOUNTER_MATCH_REASON_NO_ACTIVE_ENCOUNTER",
   SESSION_EXPIRED: "ENCOUNTER_MATCH_REASON_SESSION_EXPIRED",
   PROVIDER_MISMATCH: "ENCOUNTER_MATCH_REASON_PROVIDER_MISMATCH",
-  LOCATION_MISMATCH: "ENCOUNTER_MATCH_REASON_LOCATION_MISMATCH",
-  MULTIPLE_ENCOUNTERS_FOUND: "ENCOUNTER_MATCH_REASON_MULTIPLE_FOUND"
+  LOCATION_MISMATCH: "ENCOUNTER_MATCH_REASON_LOCATION_MISMATCH"
 };
 async function Gn(t) {
   const e = new URLSearchParams();
@@ -12871,11 +12876,11 @@ async function Gn(t) {
     o && e.append(s, o);
   });
   const r = `${cy}?${e.toString()}`;
-  return (await B(r)).entry?.map((s) => s.resource).filter((s) => s !== void 0) ?? [];
+  return (await H(r)).entry?.map((s) => s.resource).filter((s) => s !== void 0) ?? [];
 }
 async function Bi() {
   try {
-    const t = await B(
+    const t = await H(
       uy
     ), e = Number(t.value);
     return !isNaN(e) && e > 0 ? e : 60;
@@ -12895,7 +12900,7 @@ async function ly(t, e) {
     return null;
   }
 }
-async function Ub(t, e, r, n) {
+async function Fb(t, e, r, n) {
   try {
     if (!t) return null;
     const s = r ?? await Bi(), a = `ge${new Date(Date.now() - s * 60 * 1e3).toISOString()}`, i = {
@@ -12926,7 +12931,7 @@ function Pa(t, e) {
     (r) => bs(r.partOf?.reference) === e
   );
 }
-async function qb(t, e, r, n) {
+async function jb(t, e, r, n) {
   try {
     const s = await Hi(t);
     if (!s?.id)
@@ -12966,13 +12971,10 @@ async function qb(t, e, r, n) {
     ), T = l.filter(
       (g) => !y(g, e)
     );
-    if (v.length > 1)
-      return {
-        matched: !1,
-        encounter: v[0],
-        reasons: ["MULTIPLE_ENCOUNTERS_FOUND"]
-      };
-    if (v.length === 1) {
+    if (v.length >= 1) {
+      v.length > 1 && console.warn(
+        `[EncounterMatchDecision] ${v.length} encounters found for practitioner ${e} within session window; picking first.`
+      );
       const g = v[0];
       return Na(g, r) ? { matched: !0, encounter: g, reasons: ["MATCHED"] } : { matched: !1, encounter: g, reasons: ["LOCATION_MISMATCH"] };
     }
@@ -12994,7 +12996,7 @@ async function qb(t, e, r, n) {
     };
   }
 }
-function Fb(t) {
+function Vb(t) {
   return t.matched || t.reasons.includes("LOCATION_MISMATCH") && !t.reasons.includes("SESSION_EXPIRED") && !t.reasons.includes("PROVIDER_MISMATCH");
 }
 const zi = {
@@ -13021,7 +13023,7 @@ function fy(t) {
 function py() {
   return Mt;
 }
-function jb(t) {
+function Hb(t) {
   const e = t.reasons.some(
     (r) => dy.includes(r)
   );
@@ -13032,21 +13034,21 @@ function jb(t) {
     isLoading: !1
   }, _s();
 }
-function Vb(t) {
+function Bb(t) {
   Mt = { ...Mt, isLoading: t }, _s();
 }
-function Hb() {
+function zb() {
   Mt = { ...zi }, _s();
 }
-function Bb() {
+function Yb() {
   return rc(
     fy,
     py
   );
 }
 const hy = (t) => ie + `/EpisodeOfCare?_revinclude=Encounter:episode-of-care&_id=${t}`;
-async function zb(t) {
-  const e = t.join(","), r = await B(hy(e));
+async function Gb(t) {
+  const e = t.join(","), r = await H(hy(e));
   if (r.total === 0)
     throw new Error(
       "No episode of care found for the provided UUIDs: " + t.join(", ")
@@ -13061,7 +13063,7 @@ async function zb(t) {
 const xn = /* @__PURE__ */ new Map(), my = async (t) => {
   if (xn.has(t))
     return xn.get(t) ?? null;
-  const e = await B(ii(t)), r = e ? String(e) : null;
+  const e = await H(ii(t)), r = e ? String(e) : null;
   return xn.set(t, r), r;
 }, gy = async () => await my(Gl) === "true", yy = async (t, e, r, n = pt.CLINICAL) => {
   if (!await gy())
@@ -13081,21 +13083,21 @@ const xn = /* @__PURE__ */ new Map(), my = async (t) => {
     module: n
   };
   return await Se(kd, a), { logged: !0 };
-}, Yb = () => xd(async (e) => {
+}, Kb = () => xd(async (e) => {
   await yy(
     e.patientUuid,
     e.eventType,
     e.messageParams,
     e.module
   );
-}), Gb = async () => {
+}), Wb = async () => {
   try {
-    return (await B(ss)).user.privileges;
+    return (await H(ss)).user.privileges;
   } catch (t) {
     const { message: e } = Mr(t);
     throw new Error(e);
   }
-}, Kb = (t, e) => {
+}, Jb = (t, e) => {
   if (!t || t.length === 0)
     return !1;
   if (!e || e.length === 0)
@@ -13135,12 +13137,12 @@ const xn = /* @__PURE__ */ new Map(), my = async (t) => {
       editable: n.editable
     }))
   };
-}, Wb = async (t) => {
+}, Qb = async (t) => {
   const e = await wy(t), r = Zr();
   return e.map(
     (n) => by(n, r)
   );
-}, Jb = async (t) => {
+}, Xb = async (t) => {
   const e = await fetch(Jg(t));
   if (!e.ok)
     throw new Error(
@@ -13174,10 +13176,10 @@ const xn = /* @__PURE__ */ new Map(), my = async (t) => {
     schema: n,
     translations: u
   };
-}, Qb = async (t, e, r) => {
+}, Zb = async (t, e, r) => {
   let n;
   e && e.length > 0 && (n = e.join(","));
-  const s = Zg(t, r, n), o = await B(s);
+  const s = Zg(t, r, n), o = await H(s);
   return Array.isArray(o) ? o : [];
 };
 function Yi(t) {
@@ -13219,7 +13221,7 @@ function Ki(t, e) {
   };
   return n(r.controls);
 }
-function Xb(t, e) {
+function e_(t, e) {
   if (!t.controls || t.controls.length === 0)
     return [];
   const r = [], n = (/* @__PURE__ */ new Date()).toISOString();
@@ -13264,7 +13266,7 @@ function Xb(t, e) {
     s.interpretation && (a.interpretation = s.interpretation), s.comment && (a.comment = s.comment), r.push(a);
   }), r;
 }
-function Zb(t, e) {
+function t_(t, e) {
   if (!t || t.length === 0)
     return {
       controls: [],
@@ -13297,7 +13299,7 @@ function Zb(t, e) {
     metadata: { formMetadata: e }
   };
 }
-function e_(t) {
+function r_(t) {
   const e = (n) => {
     const s = (u) => u == null ? null : typeof u == "string" || typeof u == "number" || typeof u == "boolean" || typeof u == "object" ? u : null, o = n.concept, a = typeof o == "object" && o !== null && "uuid" in o ? o.uuid : o, i = typeof o == "object" && o !== null && "datatype" in o ? o.datatype : void 0, c = {
       concept: {
@@ -13317,11 +13319,11 @@ function e_(t) {
   };
   return (t?.filter((n) => n.uuid && n.voided ? !0 : !(!n.uuid && n.voided || n.value && typeof n.value == "string" && n.value.endsWith("voided"))) ?? []).map(e);
 }
-function t_(t) {
+function n_(t) {
   if (!(!t || typeof t != "object"))
     return "toJS" in t && typeof t.toJS == "function" ? t.toJS() : t;
 }
-function r_(t, e) {
+function s_(t, e) {
   !t || !Array.isArray(t.children) || t.children.forEach((r) => {
     r && typeof r == "object" && Wi(
       r,
@@ -13351,7 +13353,7 @@ function Wi(t, e) {
     );
   });
 }
-const _y = K + "/bahmnicore/diseaseSummaryData?", n_ = async (t, e, r, n) => {
+const _y = K + "/bahmnicore/diseaseSummaryData?", o_ = async (t, e, r, n) => {
   const s = new URLSearchParams({
     groupBy: n,
     latestCount: e.toString(),
@@ -13361,16 +13363,16 @@ const _y = K + "/bahmnicore/diseaseSummaryData?", n_ = async (t, e, r, n) => {
     s.append("obsConcepts", a);
   });
   const o = _y + s.toString();
-  return B(o);
-}, vs = "custom:(uuid,episodeUuid,patient,program,display,dateEnrolled,dateCompleted,location,voided,allowedStates,outcome,states:(uuid,startDate,endDate,voided,state:(uuid,concept:(uuid,display,name,names)),auditInfo),auditInfo,attributes)", vy = (t) => `${K}/bahmniprogramenrollment?patient=${t}&v=${vs}`, Sy = (t, e = 15, r = 0) => `${K}/bahmniprogramenrollment?patient=${t}&v=${vs}&limit=${e}&startIndex=${r}&totalCount=true`, Ji = (t) => `${K}/bahmniprogramenrollment/${t}`, Ty = (t) => `${Ji(t)}?v=${vs}`, s_ = async (t) => await B(vy(t)), o_ = async (t, e = 15, r = 1) => {
-  const n = (r - 1) * e, s = await B(
+  return H(o);
+}, vs = "custom:(uuid,episodeUuid,patient,program,display,dateEnrolled,dateCompleted,location,voided,allowedStates,outcome,states:(uuid,startDate,endDate,voided,state:(uuid,concept:(uuid,display,name,names)),auditInfo),auditInfo,attributes)", vy = (t) => `${K}/bahmniprogramenrollment?patient=${t}&v=${vs}`, Sy = (t, e = 15, r = 0) => `${K}/bahmniprogramenrollment?patient=${t}&v=${vs}&limit=${e}&startIndex=${r}&totalCount=true`, Ji = (t) => `${K}/bahmniprogramenrollment/${t}`, Ty = (t) => `${Ji(t)}?v=${vs}`, a_ = async (t) => await H(vy(t)), i_ = async (t, e = 15, r = 1) => {
+  const n = (r - 1) * e, s = await H(
     Sy(t, e, n)
   );
   return {
     programs: s.results,
     total: s.totalCount
   };
-}, a_ = async (t) => await B(Ty(t)), i_ = async (t, e) => {
+}, c_ = async (t) => await H(Ty(t)), u_ = async (t, e) => {
   const r = {
     uuid: t,
     states: [
@@ -13384,7 +13386,7 @@ const _y = K + "/bahmnicore/diseaseSummaryData?", n_ = async (t, e, r, n) => {
     r
   );
 };
-function c_(t) {
+function l_(t) {
   if (t.states.length === 0)
     return null;
   let e;
@@ -13400,7 +13402,7 @@ function c_(t) {
     e = t.states.find((r) => r.endDate === null);
   return e ? kh(e.state.concept.names) ?? e.state.concept.display : null;
 }
-function u_(t, e) {
+function d_(t, e) {
   if (e.length === 0)
     return {};
   const r = {};
@@ -13412,12 +13414,12 @@ function u_(t, e) {
   }
   return r;
 }
-const Wn = "consultation:saved", l_ = (t) => {
+const Wn = "consultation:saved", f_ = (t) => {
   const e = new CustomEvent(Wn, {
     detail: t
   });
   window.dispatchEvent(e);
-}, d_ = (t, e = []) => {
+}, p_ = (t, e = []) => {
   const r = xt(t);
   tt(() => {
     r.current = t;
@@ -13430,17 +13432,17 @@ const Wn = "consultation:saved", l_ = (t) => {
       window.removeEventListener(Wn, n);
     };
   }, e);
-}, Jn = "cdss:check", Qn = "cdss:results", f_ = (t) => {
+}, Jn = "cdss:check", Qn = "cdss:results", h_ = (t) => {
   const e = new CustomEvent(Jn, {
     detail: t
   });
   globalThis.dispatchEvent(e);
-}, p_ = (t) => {
+}, m_ = (t) => {
   const e = new CustomEvent(Qn, {
     detail: t
   });
   globalThis.dispatchEvent(e);
-}, h_ = (t) => {
+}, g_ = (t) => {
   const e = xt(t);
   tt(() => {
     e.current = t;
@@ -13453,7 +13455,7 @@ const Wn = "consultation:saved", l_ = (t) => {
       globalThis.removeEventListener(Jn, r);
     };
   }, []);
-}, m_ = (t) => {
+}, y_ = (t) => {
   const e = xt(t);
   tt(() => {
     e.current = t;
@@ -13487,21 +13489,21 @@ function Xi(t) {
 }
 async function Ry(t, e) {
   const r = Qi(t, e);
-  return B(r);
+  return H(r);
 }
-async function g_(t, e) {
+async function w_(t, e) {
   const n = ((await Ry(t, e)).entry ?? []).filter(
     (s) => !!s.resource
   );
   return Xi(n);
 }
-async function y_(t, e, r = 10, n = 1) {
+async function E_(t, e, r = 10, n = 1) {
   const s = (n - 1) * r, o = Qi(
     t,
     e,
     r,
     s
-  ), a = await B(o), i = (a.entry ?? []).filter(
+  ), a = await H(o), i = (a.entry ?? []).filter(
     (c) => !!c.resource
   );
   return {
@@ -13510,21 +13512,21 @@ async function y_(t, e, r = 10, n = 1) {
   };
 }
 const Oy = (t) => `${K}/location?operator=ALL&s=byTags&tags=${encodeURIComponent(t)}&v=custom:(uuid,display,childLocations:(uuid,display,retired))`, Ay = (t) => `${ie}/Location?_tag=${encodeURIComponent(t)}`;
-async function w_(t) {
-  return (await B(Oy(t))).results ?? [];
+async function b_(t) {
+  return (await H(Oy(t))).results ?? [];
 }
-async function E_(t) {
-  return await B(Ay(t));
+async function __(t) {
+  return await H(Ay(t));
 }
 const Ny = ie + "/Immunization", Py = (t, e) => {
   let r = `${Ny}?patient=${t}&_sort=-date&_count=100`;
   return e && (r += `&status=${e}`), r;
 };
-async function b_(t, e) {
+async function v_(t, e) {
   return (await Iy(t, e)).entry?.filter((n) => n.resource?.resourceType === "Immunization").map((n) => n.resource) ?? [];
 }
 async function Iy(t, e) {
-  return B(
+  return H(
     Py(t, e)
   );
 }
@@ -13554,7 +13556,7 @@ async function Cy(t) {
     }, n.readAsDataURL(t);
   });
 }
-async function __(t, e, r) {
+async function S_(t, e, r) {
   const n = await Cy(t), s = {
     content: n.content,
     encounterTypeName: e,
@@ -13580,10 +13582,10 @@ const Ly = "/bahmni_config/openmrs/apps", Zi = "org.bahmni.home.dashboard", xy =
 }), Uy = (t, e) => e === void 0 ? t : t.filter((r) => r.requiredPrivilege ? e.includes(r.requiredPrivilege) : !0), qy = (t) => {
   const e = navigator.onLine;
   return t.filter((r) => !(r.exclusiveOnlineModule && !e || r.exclusiveOfflineModule && e));
-}, Fy = (t) => [...t].sort((e, r) => (e.order ?? 0) - (r.order ?? 0)), v_ = async (t = Zi, e) => {
+}, Fy = (t) => [...t].sort((e, r) => (e.order ?? 0) - (r.order ?? 0)), T_ = async (t = Zi, e) => {
   const r = await ky("home"), n = My(r, t), s = Uy(n, e), o = qy(s);
   return Fy(o);
-}, jy = (t, e) => K + `/availableStocks?productUuid=${t}&locationUuid=${e}`, S_ = async (t, e) => await B(
+}, jy = (t, e) => K + `/availableStocks?productUuid=${t}&locationUuid=${e}`, R_ = async (t, e) => await H(
   jy(t, e)
 ), Vy = (t, e, r) => {
   const n = t.find((o) => o.server === e);
@@ -13611,7 +13613,7 @@ const Ly = "/bahmni_config/openmrs/apps", Zi = "org.bahmni.home.dashboard", xy =
       entry: s
     });
   }), r;
-}, T_ = async (t, e, r, n) => {
+}, O_ = async (t, e, r, n) => {
   const s = Vy(t, e.server, e.service), { serverConfig: o, serviceConfig: a } = s, i = Hy(
     n,
     a.contextResourceMap
@@ -13629,7 +13631,7 @@ const Ly = "/bahmni_config/openmrs/apps", Zi = "org.bahmni.home.dashboard", xy =
     c,
     u
   )).cards || [];
-}, R_ = (t, e) => {
+}, A_ = (t, e) => {
   const r = [];
   return t.forEach((n) => {
     !n.suggestions || n.suggestions.length === 0 || n.suggestions.forEach((s) => {
@@ -13646,10 +13648,10 @@ const Ly = "/bahmni_config/openmrs/apps", Zi = "org.bahmni.home.dashboard", xy =
     });
   }), r;
 };
-async function O_() {
-  return B(`${os}/templates`);
+async function N_() {
+  return H(`${os}/templates`);
 }
-async function A_(t) {
+async function P_(t) {
   return (await Se(
     `${os}/render`,
     t
@@ -13669,7 +13671,7 @@ export {
   Qn as CDSS_RESULTS_EVENT,
   QE as CONCEPT_DATATYPE_COMPLEX,
   JE as CONCEPT_DATATYPE_NUMERIC,
-  kb as CONSULTATION_ENCOUNTER_TYPE_UUID,
+  Ub as CONSULTATION_ENCOUNTER_TYPE_UUID,
   Wn as CONSULTATION_SAVED_EVENT,
   Gh as DATETIME_REGEX_PATTERN,
   eb as DATE_REGEX_PATTERN,
@@ -13691,25 +13693,26 @@ export {
   BE as HL7_CONDITION_VERIFICATION_STATUS_CODE_SYSTEM,
   tb as INTERPRETATION_TO_CODE,
   TE as ISO_DATE_FORMAT,
-  Mb as MATCH_REASON_MESSAGES,
+  qb as MATCH_REASON_MESSAGES,
   Mw as MAX_NAME_LENGTH,
   kw as MAX_PATIENT_AGE_YEARS,
   Uw as MAX_PHONE_NUMBER_LENGTH,
+  ib as MEDICATIONS_INPUT_CONTROL_KEY,
   He as MedicationStatus,
   ie as OPENMRS_FHIR_R4,
   K as OPENMRS_REST_V1,
-  vb as ORDER_TYPE_QUERY_KEY,
-  _b as PENDING_REPORT_STATUSES,
-  bb as PROCESSED_REPORT_STATUSES,
-  Nb as USER_PINNED_PREFERENCE_URL,
+  Sb as ORDER_TYPE_QUERY_KEY,
+  vb as PENDING_REPORT_STATUSES,
+  _b as PROCESSED_REPORT_STATUSES,
+  Pb as USER_PINNED_PREFERENCE_URL,
   RE as calculateAge,
   $E as calculateEndDate,
   AE as calculateOnsetDate,
   Aw as camelToScreamingSnakeCase,
-  Fb as canResumeOwnInSessionEncounter,
+  Vb as canResumeOwnInSessionEncounter,
   Ew as capitalize,
   uE as checkIfActiveVisitExists,
-  t_ as convertImmutableToPlainObject,
+  n_ as convertImmutableToPlainObject,
   Oh as convertTo24HourFormat,
   Pw as convertToSentenceCase,
   SE as createAppointmentUnavailability,
@@ -13720,32 +13723,32 @@ export {
   EE as deleteAppointmentService,
   Wl as deleteCookie,
   Ld as dispatchAuditEvent,
-  f_ as dispatchCDSSCheck,
-  p_ as dispatchCDSSResults,
-  l_ as dispatchConsultationSaved,
+  h_ as dispatchCDSSCheck,
+  m_ as dispatchCDSSResults,
+  f_ as dispatchConsultationSaved,
   DE as doDateRangesOverlap,
-  u_ as extractAttributes,
-  r_ as extractNotesFromFormData,
-  Db as fetchAllProviders,
+  d_ as extractAttributes,
+  s_ as extractNotesFromFormData,
+  Cb as fetchAllProviders,
   qE as fetchAndFormatAllergenConcepts,
-  Jb as fetchFormMetadata,
-  cb as fetchMedicationOrdersMetadata,
+  Xb as fetchFormMetadata,
+  ub as fetchMedicationOrdersMetadata,
   ky as fetchModuleExtensions,
-  Wb as fetchObservationForms,
-  mb as fetchQualityAssessment,
+  Qb as fetchObservationForms,
+  gb as fetchQualityAssessment,
   FE as fetchReactionConcepts,
   qy as filterByOnlineStatus,
   Uy as filterByPrivilege,
-  R_ as filterCdsCardsForItems,
+  A_ as filterCdsCardsForItems,
   Tw as filterReplacementEntries,
-  Ub as findActiveEncounterInSession,
+  Fb as findActiveEncounterInSession,
   NE as formatDateDistance,
   OE as formatDateTime,
   Rw as formatUrl,
   ww as generateId,
   Kw as generateIdentifier,
   Kl as generateUUID,
-  B as get,
+  H as get,
   Hi as getActiveVisit,
   Vd as getActiveVisitByPatient,
   Qw as getAddressHierarchyEntries,
@@ -13754,88 +13757,89 @@ export {
   yE as getAppointmentById,
   vE as getAppointmentUnavailabilities,
   Dw as getAvailableLocations,
-  S_ as getAvailableStocks,
-  Tb as getCategoryUuidFromOrderTypes,
+  R_ as getAvailableStocks,
+  Rb as getCategoryUuidFromOrderTypes,
   ME as getConceptById,
   nb as getConditionPage,
   rb as getConditions,
-  Ab as getConfig,
+  Nb as getConfig,
   ci as getCookieByName,
-  $b as getCurrentProvider,
-  c_ as getCurrentStateName,
+  Db as getCurrentProvider,
+  l_ as getCurrentStateName,
   Iw as getCurrentUser,
-  Gb as getCurrentUserPrivileges,
+  Wb as getCurrentUserPrivileges,
   $w as getDefaultDateFormat,
   ab as getDiagnosesPage,
-  wb as getDiagnosticReportBundle,
-  yb as getDiagnosticReports,
-  y_ as getDocumentReferencePage,
+  Eb as getDiagnosticReportBundle,
+  wb as getDiagnosticReports,
+  E_ as getDocumentReferencePage,
   Ry as getDocumentReferences,
+  xb as getEncounterByUuid,
   py as getEncounterSessionSnapshot,
-  zb as getEncountersAndVisitsForEOC,
-  Ob as getExistingServiceRequestsForAllCategories,
+  Gb as getEncountersAndVisitsForEOC,
+  Ab as getExistingServiceRequestsForAllCategories,
   My as getExtensionsByPoint,
-  E_ as getFHIRLocationsByTag,
-  Sb as getFlattenedInvestigations,
+  __ as getFHIRLocationsByTag,
+  Tb as getFlattenedInvestigations,
   IE as getFormattedAge,
   jE as getFormattedAllergies,
-  g_ as getFormattedDocumentReferences,
+  w_ as getFormattedDocumentReferences,
   Mr as getFormattedError,
   qw as getFormattedPatientById,
   Jw as getGenders,
   Bw as getIdentifierData,
   Hw as getIdentifierTypes,
   rE as getInputTypeForFormat,
-  gb as getLabInvestigationsBundle,
-  w_ as getLocationByTag,
-  db as getMedicationByUuid,
-  Lb as getObservationsBundleByEncounterUuid,
-  Rb as getOrderTypeNames,
+  yb as getLabInvestigationsBundle,
+  b_ as getLocationByTag,
+  fb as getMedicationByUuid,
+  kb as getObservationsBundleByEncounterUuid,
+  Ob as getOrderTypeNames,
   gs as getOrderTypes,
   Xw as getOrderedAddressHierarchyLevels,
   mE as getPastAppointments,
   _E as getPastAppointmentsPage,
   Rd as getPatientById,
   ob as getPatientDiagnoses,
-  Qb as getPatientFormData,
-  b_ as getPatientImmunizations,
+  Zb as getPatientFormData,
+  v_ as getPatientImmunizations,
   pm as getPatientMedicationBundle,
-  ib as getPatientMedications,
-  Ib as getPatientObservations,
+  cb as getPatientMedications,
+  $b as getPatientObservations,
   ry as getPatientObservationsBundle,
-  Pb as getPatientObservationsWithEncounterBundle,
+  Ib as getPatientObservationsWithEncounterBundle,
   Fw as getPatientPhotoDataUrl,
   Zw as getPatientProfile,
-  s_ as getPatientPrograms,
-  o_ as getPatientProgramsPage,
-  fb as getPatientRadiologyInvestigationBundle,
-  pb as getPatientRadiologyInvestigationBundleWithImagingStudy,
-  hb as getPatientRadiologyInvestigations,
+  a_ as getPatientPrograms,
+  i_ as getPatientProgramsPage,
+  pb as getPatientRadiologyInvestigationBundle,
+  hb as getPatientRadiologyInvestigationBundleWithImagingStudy,
+  mb as getPatientRadiologyInvestigations,
   tE as getPersonAttributeTypes,
   $d as getPrimaryIdentifierType,
   vw as getPriorityByOrder,
-  a_ as getProgramByUUID,
-  Cb as getProviderLoginLocations,
+  c_ as getProgramByUUID,
+  Lb as getProviderLoginLocations,
   eE as getRelationshipTypes,
   Ht as getServiceRequests,
-  O_ as getTemplates,
+  N_ as getTemplates,
   LE as getTimeInMinutes,
   PE as getTodayDate,
   hE as getUpcomingAppointments,
   bE as getUpcomingAppointmentsPage,
   as as getUserLoginLocation,
   Zr as getUserPreferredLocale,
-  lb as getVaccinations,
+  db as getVaccinations,
   Ow as getValueType,
-  v_ as getVisibleModules,
+  T_ as getVisibleModules,
   cE as getVisitTypes,
   iy as getVisits,
-  n_ as getVitalFlowSheetData,
+  o_ as getVitalFlowSheetData,
   Sw as groupByDate,
-  Kb as hasPrivilege,
+  Jb as hasPrivilege,
   mw as initAppI18n,
-  Yb as initializeAuditListener,
-  T_ as invokeCDSSRule,
+  Kb as initializeAuditListener,
+  O_ as invokeCDSSRule,
   nE as isBooleanFormat,
   sE as isConceptFormat,
   aE as isDateFormat,
@@ -13853,40 +13857,40 @@ export {
   Se as post,
   Za as put,
   yw as refreshQueries,
-  A_ as renderAsHtml,
-  Hb as resetEncounterSession,
+  P_ as renderAsHtml,
+  zb as resetEncounterSession,
   Nw as resolveComboBoxItems,
-  qb as resolveEncounterMatchDecision,
+  jb as resolveEncounterMatchDecision,
   Lw as saveUserLocation,
   pE as searchAppointmentsByAttribute,
   UE as searchConceptByName,
   kE as searchConcepts,
   Lr as searchFHIRConcepts,
   xh as searchFHIRConceptsByName,
-  ub as searchMedications,
+  lb as searchMedications,
   Vw as searchPatientByCustomAttribute,
   jw as searchPatientByNameOrId,
   bw as setCookie,
-  jb as setEncounterSessionDecision,
-  Vb as setEncounterSessionLoading,
-  xb as shouldEnableEncounterFilter,
+  Hb as setEncounterSessionDecision,
+  Bb as setEncounterSessionLoading,
+  Mb as shouldEnableEncounterFilter,
   CE as sortByDate,
   Fy as sortByOrder,
   fy as subscribeEncounterSession,
-  e_ as transformContainerObservationsToForm2Observations,
-  Xb as transformFormDataToObservations,
-  Zb as transformObservationsToFormData,
+  r_ as transformContainerObservationsToForm2Observations,
+  e_ as transformFormDataToObservations,
+  t_ as transformObservationsToFormData,
   gE as updateAppointmentStatus,
-  Eb as updateDiagnosticReportBundle,
+  bb as updateDiagnosticReportBundle,
   Ww as updateFhirPatient,
   Yw as updatePatient,
-  i_ as updateProgramState,
+  u_ as updateProgramState,
   xw as updateSessionLocation,
-  __ as uploadDocument,
-  h_ as useCDSSCheckListener,
-  m_ as useCDSSResultsListener,
+  S_ as uploadDocument,
+  g_ as useCDSSCheckListener,
+  y_ as useCDSSResultsListener,
   gw as useCamera,
-  Bb as useEncounterSessionStore,
-  d_ as useSubscribeConsultationSaved,
-  I_ as useTranslation
+  Yb as useEncounterSessionStore,
+  p_ as useSubscribeConsultationSaved,
+  D_ as useTranslation
 };