@ovok/native 1.10.14 → 1.10.15

package/lib/module/modules/questionnaire-response-form/utils/conditions/date-condition.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { compareWithOperator } from "./compare.js";
 const normalizeToDateOnly = date => {
   const normalized = new Date(date);
   normalized.setHours(0, 0, 0, 0);
@@ -19,50 +20,9 @@ export const checkDateCondition = (condition, response) => {
       return false;
     }
     const isDateOnly = condition.answerDate !== undefined;
-    if (isDateOnly) {
-      responseDate = normalizeToDateOnly(responseDate);
-      const normalizedConditionDate = normalizeToDateOnly(conditionDate);
-      if (operator === "=") {
-        return responseDate.getTime() === normalizedConditionDate.getTime();
-      }
-      if (operator === "!=") {
-        return responseDate.getTime() !== normalizedConditionDate.getTime();
-      }
-      if (operator === "<") {
-        return responseDate < normalizedConditionDate;
-      }
-      if (operator === "<=") {
-        return responseDate <= normalizedConditionDate;
-      }
-      if (operator === ">") {
-        return responseDate > normalizedConditionDate;
-      }
-      if (operator === ">=") {
-        return responseDate >= normalizedConditionDate;
-      }
-    } else {
-      if (operator === "=") {
-        return responseDate.getTime() === conditionDate.getTime();
-      }
-      if (operator === "!=") {
-        return responseDate.getTime() !== conditionDate.getTime();
-      }
-      if (operator === "<") {
-        return responseDate < conditionDate;
-      }
-      if (operator === "<=") {
-        return responseDate <= conditionDate;
-      }
-      if (operator === ">") {
-        return responseDate > conditionDate;
-      }
-      if (operator === ">=") {
-        return responseDate >= conditionDate;
-      }
-    }
+    return isDateOnly ? compareWithOperator(operator, normalizeToDateOnly(responseDate).getTime(), normalizeToDateOnly(conditionDate).getTime()) : compareWithOperator(operator, responseDate.getTime(), conditionDate.getTime());
   } catch {
     return false;
   }
-  return false;
 };
 //# sourceMappingURL=date-condition.js.map

package/lib/module/modules/questionnaire-response-form/utils/conditions/date-condition.js.map

@@ -1 +1 @@
-{"version":3,"names":["normalizeToDateOnly","date","normalized","Date","setHours","checkDateCondition","condition","response","conditionDateStr","answerDate","answerDateTime","operator","conditionDate","responseDate","isNaN","getTime","isDateOnly","undefined","normalizedConditionDate"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/date-condition.ts"],"mappings":";;AAEA,MAAMA,mBAAmB,GAAIC,IAAU,IAAW;EAChD,MAAMC,UAAU,GAAG,IAAIC,IAAI,CAACF,IAAI,CAAC;EAEjCC,UAAU,CAACE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;EAE/B,OAAOF,UAAU;AACnB,CAAC;AAED,OAAO,MAAMG,kBAAkB,GAAGA,CAChCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,UAAU,IAAIH,SAAS,CAACI,cAAc;EACzE,MAAMC,QAAQ,GAAGL,SAAS,CAACK,QAAQ;EAEnC,IAAI,CAACH,gBAAgB,EAAE;IACrB,OAAO,KAAK;EACd;EAEA,MAAMI,aAAa,GAAG,IAAIT,IAAI,CAACK,gBAAgB,CAAC;EAChD,IAAIK,YAAkB;EAEtB,IAAI;IACFA,YAAY,GAAG,IAAIV,IAAI,CAACI,QAAkB,CAAC;IAE3C,IAAIO,KAAK,CAACD,YAAY,CAACE,OAAO,CAAC,CAAC,CAAC,IAAID,KAAK,CAACF,aAAa,CAACG,OAAO,CAAC,CAAC,CAAC,EAAE;MACnE,OAAO,KAAK;IACd;IAEA,MAAMC,UAAU,GAAGV,SAAS,CAACG,UAAU,KAAKQ,SAAS;IAErD,IAAID,UAAU,EAAE;MACdH,YAAY,GAAGb,mBAAmB,CAACa,YAAY,CAAC;MAChD,MAAMK,uBAAuB,GAAGlB,mBAAmB,CAACY,aAAa,CAAC;MAElE,IAAID,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,CAACE,OAAO,CAAC,CAAC,KAAKG,uBAAuB,CAACH,OAAO,CAAC,CAAC;MACrE;MACA,IAAIJ,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,CAACE,OAAO,CAAC,CAAC,KAAKG,uBAAuB,CAACH,OAAO,CAAC,CAAC;MACrE;MACA,IAAIJ,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,GAAGK,uBAAuB;MAC/C;MACA,IAAIP,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,IAAIK,uBAAuB;MAChD;MACA,IAAIP,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,GAAGK,uBAAuB;MAC/C;MACA,IAAIP,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,IAAIK,uBAAuB;MAChD;IACF,CAAC,MAAM;MACL,IAAIP,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,CAACE,OAAO,CAAC,CAAC,KAAKH,aAAa,CAACG,OAAO,CAAC,CAAC;MAC3D;MACA,IAAIJ,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,CAACE,OAAO,CAAC,CAAC,KAAKH,aAAa,CAACG,OAAO,CAAC,CAAC;MAC3D;MACA,IAAIJ,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,GAAGD,aAAa;MACrC;MACA,IAAID,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,IAAID,aAAa;MACtC;MACA,IAAID,QAAQ,KAAK,GAAG,EAAE;QACpB,OAAOE,YAAY,GAAGD,aAAa;MACrC;MACA,IAAID,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOE,YAAY,IAAID,aAAa;MACtC;IACF;EACF,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"names":["compareWithOperator","normalizeToDateOnly","date","normalized","Date","setHours","checkDateCondition","condition","response","conditionDateStr","answerDate","answerDateTime","operator","conditionDate","responseDate","isNaN","getTime","isDateOnly","undefined"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/date-condition.ts"],"mappings":";;AAEA,SAASA,mBAAmB,QAAQ,cAAW;AAE/C,MAAMC,mBAAmB,GAAIC,IAAU,IAAW;EAChD,MAAMC,UAAU,GAAG,IAAIC,IAAI,CAACF,IAAI,CAAC;EAEjCC,UAAU,CAACE,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;EAE/B,OAAOF,UAAU;AACnB,CAAC;AAED,OAAO,MAAMG,kBAAkB,GAAGA,CAChCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,UAAU,IAAIH,SAAS,CAACI,cAAc;EACzE,MAAMC,QAAQ,GAAGL,SAAS,CAACK,QAAQ;EAEnC,IAAI,CAACH,gBAAgB,EAAE;IACrB,OAAO,KAAK;EACd;EAEA,MAAMI,aAAa,GAAG,IAAIT,IAAI,CAACK,gBAAgB,CAAC;EAChD,IAAIK,YAAkB;EAEtB,IAAI;IACFA,YAAY,GAAG,IAAIV,IAAI,CAACI,QAAkB,CAAC;IAE3C,IAAIO,KAAK,CAACD,YAAY,CAACE,OAAO,CAAC,CAAC,CAAC,IAAID,KAAK,CAACF,aAAa,CAACG,OAAO,CAAC,CAAC,CAAC,EAAE;MACnE,OAAO,KAAK;IACd;IAEA,MAAMC,UAAU,GAAGV,SAAS,CAACG,UAAU,KAAKQ,SAAS;IAErD,OAAOD,UAAU,GACbjB,mBAAmB,CACjBY,QAAQ,EACRX,mBAAmB,CAACa,YAAY,CAAC,CAACE,OAAO,CAAC,CAAC,EAC3Cf,mBAAmB,CAACY,aAAa,CAAC,CAACG,OAAO,CAAC,CAC7C,CAAC,GACDhB,mBAAmB,CACjBY,QAAQ,EACRE,YAAY,CAACE,OAAO,CAAC,CAAC,EACtBH,aAAa,CAACG,OAAO,CAAC,CACxB,CAAC;EACP,CAAC,CAAC,MAAM;IACN,OAAO,KAAK;EACd;AACF,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/conditions/decimal-condition.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { compareWithOperator } from "./compare.js";
 export const checkDecimalCondition = (condition, response) => {
   const answerDecimal = condition.answerDecimal;
   const operator = condition.operator;
@@ -10,24 +11,6 @@ export const checkDecimalCondition = (condition, response) => {
   if (isNaN(responseDecimal)) {
     return false;
   }
-  if (operator === "=") {
-    return responseDecimal === answerDecimal;
-  }
-  if (operator === "!=") {
-    return responseDecimal !== answerDecimal;
-  }
-  if (operator === "<") {
-    return responseDecimal < answerDecimal;
-  }
-  if (operator === "<=") {
-    return responseDecimal <= answerDecimal;
-  }
-  if (operator === ">") {
-    return responseDecimal > answerDecimal;
-  }
-  if (operator === ">=") {
-    return responseDecimal >= answerDecimal;
-  }
-  return false;
+  return compareWithOperator(operator, responseDecimal, answerDecimal);
 };
 //# sourceMappingURL=decimal-condition.js.map

package/lib/module/modules/questionnaire-response-form/utils/conditions/decimal-condition.js.map

@@ -1 +1 @@
-{"version":3,"names":["checkDecimalCondition","condition","response","answerDecimal","operator","undefined","responseDecimal","parseFloat","isNaN"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/decimal-condition.ts"],"mappings":";;AAEA,OAAO,MAAMA,qBAAqB,GAAGA,CACnCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,aAAa,GAAGF,SAAS,CAACE,aAAa;EAC7C,MAAMC,QAAQ,GAAGH,SAAS,CAACG,QAAQ;EAEnC,IAAID,aAAa,KAAKE,SAAS,EAAE;IAC/B,OAAO,KAAK;EACd;EAEA,MAAMC,eAAe,GAAGC,UAAU,CAACL,QAAkB,CAAC;EAEtD,IAAIM,KAAK,CAACF,eAAe,CAAC,EAAE;IAC1B,OAAO,KAAK;EACd;EAEA,IAAIF,QAAQ,KAAK,GAAG,EAAE;IACpB,OAAOE,eAAe,KAAKH,aAAa;EAC1C;EACA,IAAIC,QAAQ,KAAK,IAAI,EAAE;IACrB,OAAOE,eAAe,KAAKH,aAAa;EAC1C;EACA,IAAIC,QAAQ,KAAK,GAAG,EAAE;IACpB,OAAOE,eAAe,GAAGH,aAAa;EACxC;EACA,IAAIC,QAAQ,KAAK,IAAI,EAAE;IACrB,OAAOE,eAAe,IAAIH,aAAa;EACzC;EACA,IAAIC,QAAQ,KAAK,GAAG,EAAE;IACpB,OAAOE,eAAe,GAAGH,aAAa;EACxC;EACA,IAAIC,QAAQ,KAAK,IAAI,EAAE;IACrB,OAAOE,eAAe,IAAIH,aAAa;EACzC;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"names":["compareWithOperator","checkDecimalCondition","condition","response","answerDecimal","operator","undefined","responseDecimal","parseFloat","isNaN"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/decimal-condition.ts"],"mappings":";;AAEA,SAASA,mBAAmB,QAAQ,cAAW;AAE/C,OAAO,MAAMC,qBAAqB,GAAGA,CACnCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,aAAa,GAAGF,SAAS,CAACE,aAAa;EAC7C,MAAMC,QAAQ,GAAGH,SAAS,CAACG,QAAQ;EAEnC,IAAID,aAAa,KAAKE,SAAS,EAAE;IAC/B,OAAO,KAAK;EACd;EAEA,MAAMC,eAAe,GAAGC,UAAU,CAACL,QAAkB,CAAC;EAEtD,IAAIM,KAAK,CAACF,eAAe,CAAC,EAAE;IAC1B,OAAO,KAAK;EACd;EAEA,OAAOP,mBAAmB,CAACK,QAAQ,EAAEE,eAAe,EAAEH,aAAa,CAAC;AACtE,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/conditions/fhir-condition.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { parseFhirTimeSeconds } from "../fhir-time.js";
+import { compareWithOperator } from "./compare.js";
 const getComparableResponse = value => {
   if (!value || typeof value !== "object") {
     return value;
@@ -37,44 +39,12 @@ const getComparableResponse = value => {
   return value;
 };
 const checkTimeCondition = (condition, response) => {
-  const actualSeconds = parseTime(response);
-  const expectedSeconds = parseTime(condition.answerTime);
+  const actualSeconds = parseFhirTimeSeconds(response);
+  const expectedSeconds = parseFhirTimeSeconds(condition.answerTime);
   if (actualSeconds === undefined || expectedSeconds === undefined) {
     return false;
   }
-  switch (condition.operator) {
-    case "=":
-      return actualSeconds === expectedSeconds;
-    case "!=":
-      return actualSeconds !== expectedSeconds;
-    case "<":
-      return actualSeconds < expectedSeconds;
-    case "<=":
-      return actualSeconds <= expectedSeconds;
-    case ">":
-      return actualSeconds > expectedSeconds;
-    case ">=":
-      return actualSeconds >= expectedSeconds;
-    default:
-      return false;
-  }
-};
-const parseTime = value => {
-  if (typeof value !== "string") {
-    return undefined;
-  }
-  const match = /^(\d{2}):(\d{2})(?::(\d{2})(\.\d+)?)?$/.exec(value);
-  if (!match) {
-    return undefined;
-  }
-  const [, hours, minutes, seconds = "0", fraction = ""] = match;
-  const parsedHours = Number(hours);
-  const parsedMinutes = Number(minutes);
-  const parsedSeconds = Number(seconds);
-  if (parsedHours > 23 || parsedMinutes > 59 || parsedSeconds > 59) {
-    return undefined;
-  }
-  return parsedHours * 3600 + parsedMinutes * 60 + parsedSeconds + (fraction ? Number(fraction) : 0);
+  return compareWithOperator(condition.operator, actualSeconds, expectedSeconds);
 };
 const checkCodingCondition = (condition, response) => {
   const actual = getCoding(response);
@@ -102,22 +72,7 @@ const checkQuantityCondition = (condition, response) => {
   if (!actual || !expected || actual.value === undefined || expected.value === undefined || actual.code !== expected.code || actual.system !== expected.system || actual.unit !== expected.unit) {
     return false;
   }
-  switch (condition.operator) {
-    case "=":
-      return actual.value === expected.value;
-    case "!=":
-      return actual.value !== expected.value;
-    case "<":
-      return actual.value < expected.value;
-    case "<=":
-      return actual.value <= expected.value;
-    case ">":
-      return actual.value > expected.value;
-    case ">=":
-      return actual.value >= expected.value;
-    default:
-      return false;
-  }
+  return compareWithOperator(condition.operator, actual.value, expected.value);
 };
 const getQuantity = value => {
   if (!value || typeof value !== "object" || !("value" in value)) {

package/lib/module/modules/questionnaire-response-form/utils/conditions/fhir-condition.js.map

@@ -1 +1 @@
-{"version":3,"names":["getComparableResponse","value","valueBoolean","valueString","valueDecimal","valueInteger","valueDate","valueDateTime","valueTime","valueUri","valueQuantity","valueReference","checkTimeCondition","condition","response","actualSeconds","parseTime","expectedSeconds","answerTime","undefined","operator","match","exec","hours","minutes","seconds","fraction","parsedHours","Number","parsedMinutes","parsedSeconds","checkCodingCondition","actual","getCoding","expected","answerCoding","matches","code","system","valueCoding","checkQuantityCondition","getQuantity","answerQuantity","unit","checkReferenceCondition","getReference","answerReference","reference"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/fhir-condition.ts"],"mappings":";;AAIA,MAAMA,qBAAqB,GAAIC,KAA6B,IAAc;EACxE,IAAI,CAACA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IACvC,OAAOA,KAAK;EACd;EAEA,IAAI,cAAc,IAAIA,KAAK,EAAE;IAC3B,OAAOA,KAAK,CAACC,YAAY;EAC3B;EACA,IAAI,aAAa,IAAID,KAAK,EAAE;IAC1B,OAAOA,KAAK,CAACE,WAAW;EAC1B;EACA,IAAI,cAAc,IAAIF,KAAK,EAAE;IAC3B,OAAOA,KAAK,CAACG,YAAY;EAC3B;EACA,IAAI,cAAc,IAAIH,KAAK,EAAE;IAC3B,OAAOA,KAAK,CAACI,YAAY;EAC3B;EACA,IAAI,WAAW,IAAIJ,KAAK,EAAE;IACxB,OAAOA,KAAK,CAACK,SAAS;EACxB;EACA,IAAI,eAAe,IAAIL,KAAK,EAAE;IAC5B,OAAOA,KAAK,CAACM,aAAa;EAC5B;EACA,IAAI,WAAW,IAAIN,KAAK,EAAE;IACxB,OAAOA,KAAK,CAACO,SAAS;EACxB;EACA,IAAI,UAAU,IAAIP,KAAK,EAAE;IACvB,OAAOA,KAAK,CAACQ,QAAQ;EACvB;EACA,IAAI,eAAe,IAAIR,KAAK,EAAE;IAC5B,OAAOA,KAAK,CAACS,aAAa;EAC5B;EACA,IAAI,gBAAgB,IAAIT,KAAK,EAAE;IAC7B,OAAOA,KAAK,CAACU,cAAc;EAC7B;EAEA,OAAOV,KAAK;AACd,CAAC;AAED,MAAMW,kBAAkB,GAAGA,CACzBC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,aAAa,GAAGC,SAAS,CAACF,QAAQ,CAAC;EACzC,MAAMG,eAAe,GAAGD,SAAS,CAACH,SAAS,CAACK,UAAU,CAAC;EAEvD,IAAIH,aAAa,KAAKI,SAAS,IAAIF,eAAe,KAAKE,SAAS,EAAE;IAChE,OAAO,KAAK;EACd;EAEA,QAAQN,SAAS,CAACO,QAAQ;IACxB,KAAK,GAAG;MACN,OAAOL,aAAa,KAAKE,eAAe;IAC1C,KAAK,IAAI;MACP,OAAOF,aAAa,KAAKE,eAAe;IAC1C,KAAK,GAAG;MACN,OAAOF,aAAa,GAAGE,eAAe;IACxC,KAAK,IAAI;MACP,OAAOF,aAAa,IAAIE,eAAe;IACzC,KAAK,GAAG;MACN,OAAOF,aAAa,GAAGE,eAAe;IACxC,KAAK,IAAI;MACP,OAAOF,aAAa,IAAIE,eAAe;IACzC;MACE,OAAO,KAAK;EAChB;AACF,CAAC;AAED,MAAMD,SAAS,GAAIf,KAAc,IAAyB;EACxD,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOkB,SAAS;EAClB;EAEA,MAAME,KAAK,GAAG,wCAAwC,CAACC,IAAI,CAACrB,KAAK,CAAC;EAElE,IAAI,CAACoB,KAAK,EAAE;IACV,OAAOF,SAAS;EAClB;EAEA,MAAM,GAAGI,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,GAAG,EAAEC,QAAQ,GAAG,EAAE,CAAC,GAAGL,KAAK;EAC9D,MAAMM,WAAW,GAAGC,MAAM,CAACL,KAAK,CAAC;EACjC,MAAMM,aAAa,GAAGD,MAAM,CAACJ,OAAO,CAAC;EACrC,MAAMM,aAAa,GAAGF,MAAM,CAACH,OAAO,CAAC;EAErC,IAAIE,WAAW,GAAG,EAAE,IAAIE,aAAa,GAAG,EAAE,IAAIC,aAAa,GAAG,EAAE,EAAE;IAChE,OAAOX,SAAS;EAClB;EAEA,OACEQ,WAAW,GAAG,IAAI,GAClBE,aAAa,GAAG,EAAE,GAClBC,aAAa,IACZJ,QAAQ,GAAGE,MAAM,CAACF,QAAQ,CAAC,GAAG,CAAC,CAAC;AAErC,CAAC;AAED,MAAMK,oBAAoB,GAAGA,CAC3BlB,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMkB,MAAM,GAAGC,SAAS,CAACnB,QAAQ,CAAC;EAClC,MAAMoB,QAAQ,GAAGrB,SAAS,CAACsB,YAAY;EAEvC,MAAMC,OAAO,GACXJ,MAAM,KAAKb,SAAS,IACpBe,QAAQ,KAAKf,SAAS,IACtBa,MAAM,CAACK,IAAI,KAAKH,QAAQ,CAACG,IAAI,KAC5BL,MAAM,CAACM,MAAM,KAAKnB,SAAS,IAC1Be,QAAQ,CAACI,MAAM,KAAKnB,SAAS,IAC7Ba,MAAM,CAACM,MAAM,KAAKJ,QAAQ,CAACI,MAAM,CAAC;EAEtC,OAAOzB,SAAS,CAACO,QAAQ,KAAK,IAAI,GAAG,CAACgB,OAAO,GAAGA,OAAO;AACzD,CAAC;AAED,MAAMH,SAAS,GACbhC,KAAc,IACqC;EACnD,IAAI,CAACA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IACvC,OAAO,OAAOA,KAAK,KAAK,QAAQ,GAAG;MAAEoC,IAAI,EAAEpC;IAAM,CAAC,GAAGkB,SAAS;EAChE;EAEA,IAAI,aAAa,IAAIlB,KAAK,EAAE;IAC1B,OAAOA,KAAK,CAACsC,WAAW;EAC1B;EAEA,IAAI,MAAM,IAAItC,KAAK,EAAE;IACnB,OAAOA,KAAK;EACd;EAEA,OAAOkB,SAAS;AAClB,CAAC;AAED,MAAMqB,sBAAsB,GAAGA,CAC7B3B,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMkB,MAAM,GAAGS,WAAW,CAAC3B,QAAQ,CAAC;EACpC,MAAMoB,QAAQ,GAAGrB,SAAS,CAAC6B,cAAc;EAEzC,IACE,CAACV,MAAM,IACP,CAACE,QAAQ,IACTF,MAAM,CAAC/B,KAAK,KAAKkB,SAAS,IAC1Be,QAAQ,CAACjC,KAAK,KAAKkB,SAAS,IAC5Ba,MAAM,CAACK,IAAI,KAAKH,QAAQ,CAACG,IAAI,IAC7BL,MAAM,CAACM,MAAM,KAAKJ,QAAQ,CAACI,MAAM,IACjCN,MAAM,CAACW,IAAI,KAAKT,QAAQ,CAACS,IAAI,EAC7B;IACA,OAAO,KAAK;EACd;EAEA,QAAQ9B,SAAS,CAACO,QAAQ;IACxB,KAAK,GAAG;MACN,OAAOY,MAAM,CAAC/B,KAAK,KAAKiC,QAAQ,CAACjC,KAAK;IACxC,KAAK,IAAI;MACP,OAAO+B,MAAM,CAAC/B,KAAK,KAAKiC,QAAQ,CAACjC,KAAK;IACxC,KAAK,GAAG;MACN,OAAO+B,MAAM,CAAC/B,KAAK,GAAGiC,QAAQ,CAACjC,KAAK;IACtC,KAAK,IAAI;MACP,OAAO+B,MAAM,CAAC/B,KAAK,IAAIiC,QAAQ,CAACjC,KAAK;IACvC,KAAK,GAAG;MACN,OAAO+B,MAAM,CAAC/B,KAAK,GAAGiC,QAAQ,CAACjC,KAAK;IACtC,KAAK,IAAI;MACP,OAAO+B,MAAM,CAAC/B,KAAK,IAAIiC,QAAQ,CAACjC,KAAK;IACvC;MACE,OAAO,KAAK;EAChB;AACF,CAAC;AAED,MAAMwC,WAAW,GACfxC,KAAc,IACgD;EAC9D,IAAI,CAACA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,EAAE,OAAO,IAAIA,KAAK,CAAC,EAAE;IAC9D,OAAOkB,SAAS;EAClB;EAEA,OAAOlB,KAAK;AACd,CAAC;AAED,MAAM2C,uBAAuB,GAAGA,CAC9B/B,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMkB,MAAM,GAAGa,YAAY,CAAC/B,QAAQ,CAAC;EAErC,MAAMsB,OAAO,GACXJ,MAAM,KAAKb,SAAS,IAAIa,MAAM,KAAKnB,SAAS,CAACiC,eAAe,EAAEC,SAAS;EAEzE,OAAOlC,SAAS,CAACO,QAAQ,KAAK,IAAI,GAAG,CAACgB,OAAO,GAAGA,OAAO;AACzD,CAAC;AAED,MAAMS,YAAY,GAAI5C,KAAc,IAAyB;EAC3D,IAAI,CAACA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,EAAE,WAAW,IAAIA,KAAK,CAAC,EAAE;IAClE,OAAOkB,SAAS;EAClB;EAEA,OAAO,OAAOlB,KAAK,CAAC8C,SAAS,KAAK,QAAQ,GAAG9C,KAAK,CAAC8C,SAAS,GAAG5B,SAAS;AAC1E,CAAC;AAED,SACEY,oBAAoB,EACpBS,sBAAsB,EACtBI,uBAAuB,EACvBhC,kBAAkB,EAClBZ,qBAAqB","ignoreList":[]}
+{"version":3,"names":["parseFhirTimeSeconds","compareWithOperator","getComparableResponse","value","valueBoolean","valueString","valueDecimal","valueInteger","valueDate","valueDateTime","valueTime","valueUri","valueQuantity","valueReference","checkTimeCondition","condition","response","actualSeconds","expectedSeconds","answerTime","undefined","operator","checkCodingCondition","actual","getCoding","expected","answerCoding","matches","code","system","valueCoding","checkQuantityCondition","getQuantity","answerQuantity","unit","checkReferenceCondition","getReference","answerReference","reference"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/fhir-condition.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/conditions/string-condition.js

@@ -1,17 +1,12 @@
 "use strict";
 
+import { checkEquality } from "./compare.js";
 export const checkStringCondition = (condition, response) => {
   const answerString = condition.answerString;
   const operator = condition.operator;
   if (answerString === undefined) {
     return false;
   }
-  if (operator === "=") {
-    return response === answerString;
-  }
-  if (operator === "!=") {
-    return response !== answerString;
-  }
-  return false;
+  return checkEquality(operator, response, answerString);
 };
 //# sourceMappingURL=string-condition.js.map

package/lib/module/modules/questionnaire-response-form/utils/conditions/string-condition.js.map

@@ -1 +1 @@
-{"version":3,"names":["checkStringCondition","condition","response","answerString","operator","undefined"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/string-condition.ts"],"mappings":";;AAEA,OAAO,MAAMA,oBAAoB,GAAGA,CAClCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,YAAY,GAAGF,SAAS,CAACE,YAAY;EAC3C,MAAMC,QAAQ,GAAGH,SAAS,CAACG,QAAQ;EAEnC,IAAID,YAAY,KAAKE,SAAS,EAAE;IAC9B,OAAO,KAAK;EACd;EAEA,IAAID,QAAQ,KAAK,GAAG,EAAE;IACpB,OAAOF,QAAQ,KAAKC,YAAY;EAClC;EACA,IAAIC,QAAQ,KAAK,IAAI,EAAE;IACrB,OAAOF,QAAQ,KAAKC,YAAY;EAClC;EAEA,OAAO,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"names":["checkEquality","checkStringCondition","condition","response","answerString","operator","undefined"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/conditions/string-condition.ts"],"mappings":";;AAEA,SAASA,aAAa,QAAQ,cAAW;AAEzC,OAAO,MAAMC,oBAAoB,GAAGA,CAClCC,SAAsC,EACtCC,QAAiB,KACL;EACZ,MAAMC,YAAY,GAAGF,SAAS,CAACE,YAAY;EAC3C,MAAMC,QAAQ,GAAGH,SAAS,CAACG,QAAQ;EAEnC,IAAID,YAAY,KAAKE,SAAS,EAAE;IAC9B,OAAO,KAAK;EACd;EAEA,OAAON,aAAa,CAACK,QAAQ,EAAEF,QAAQ,EAAEC,YAAY,CAAC;AACxD,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/fhir-time.js

@@ -0,0 +1,21 @@
+"use strict";
+
+/** FHIR `time` (hh:mm[:ss[.fff]]) as seconds since midnight, or undefined when malformed or out of range. */
+export const parseFhirTimeSeconds = value => {
+  if (typeof value !== "string") {
+    return undefined;
+  }
+  const match = /^(\d{2}):(\d{2})(?::(\d{2})(\.\d+)?)?$/.exec(value);
+  if (!match) {
+    return undefined;
+  }
+  const [, hours, minutes, seconds = "0", fraction = ""] = match;
+  const parsedHours = Number(hours);
+  const parsedMinutes = Number(minutes);
+  const parsedSeconds = Number(seconds);
+  if (parsedHours > 23 || parsedMinutes > 59 || parsedSeconds > 59) {
+    return undefined;
+  }
+  return parsedHours * 3600 + parsedMinutes * 60 + parsedSeconds + (fraction ? Number(fraction) : 0);
+};
+//# sourceMappingURL=fhir-time.js.map

package/lib/module/modules/questionnaire-response-form/utils/fhir-time.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["parseFhirTimeSeconds","value","undefined","match","exec","hours","minutes","seconds","fraction","parsedHours","Number","parsedMinutes","parsedSeconds"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/fhir-time.ts"],"mappings":";;AAAA;AACA,OAAO,MAAMA,oBAAoB,GAAIC,KAAc,IAAyB;EAC1E,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC7B,OAAOC,SAAS;EAClB;EAEA,MAAMC,KAAK,GAAG,wCAAwC,CAACC,IAAI,CAACH,KAAK,CAAC;EAElE,IAAI,CAACE,KAAK,EAAE;IACV,OAAOD,SAAS;EAClB;EAEA,MAAM,GAAGG,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,GAAG,EAAEC,QAAQ,GAAG,EAAE,CAAC,GAAGL,KAAK;EAC9D,MAAMM,WAAW,GAAGC,MAAM,CAACL,KAAK,CAAC;EACjC,MAAMM,aAAa,GAAGD,MAAM,CAACJ,OAAO,CAAC;EACrC,MAAMM,aAAa,GAAGF,MAAM,CAACH,OAAO,CAAC;EAErC,IAAIE,WAAW,GAAG,EAAE,IAAIE,aAAa,GAAG,EAAE,IAAIC,aAAa,GAAG,EAAE,EAAE;IAChE,OAAOV,SAAS;EAClB;EAEA,OACEO,WAAW,GAAG,IAAI,GAClBE,aAAa,GAAG,EAAE,GAClBC,aAAa,IACZJ,QAAQ,GAAGE,MAAM,CAACF,QAAQ,CAAC,GAAG,CAAC,CAAC;AAErC,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/fields/get-keyboard-type.js

@@ -4,9 +4,7 @@ export const getKeyboardType = type => {
   const keyboardMap = {
     decimal: "decimal-pad",
     integer: "number-pad",
-    url: "url",
-    email: "email-address",
-    phone: "phone-pad"
+    url: "url"
   };
   return keyboardMap[type] || "default";
 };

package/lib/module/modules/questionnaire-response-form/utils/fields/get-keyboard-type.js.map

@@ -1 +1 @@
-{"version":3,"names":["getKeyboardType","type","keyboardMap","decimal","integer","url","email","phone"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/fields/get-keyboard-type.ts"],"mappings":";;AAEA,OAAO,MAAMA,eAAe,GAAIC,IAAa,IAA0B;EACrE,MAAMC,WAAW,GAAG;IAClBC,OAAO,EAAE,aAAa;IACtBC,OAAO,EAAE,YAAY;IACrBC,GAAG,EAAE,KAAK;IACVC,KAAK,EAAE,eAAe;IACtBC,KAAK,EAAE;EACT,CAAU;EAEV,OAAOL,WAAW,CAACD,IAAI,CAA6B,IAAI,SAAS;AACnE,CAAC","ignoreList":[]}
+{"version":3,"names":["getKeyboardType","type","keyboardMap","decimal","integer","url"],"sourceRoot":"../../../../../../src","sources":["modules/questionnaire-response-form/utils/fields/get-keyboard-type.ts"],"mappings":";;AAEA,OAAO,MAAMA,eAAe,GAAIC,IAAa,IAA0B;EACrE,MAAMC,WAAW,GAAG;IAClBC,OAAO,EAAE,aAAa;IACtBC,OAAO,EAAE,YAAY;IACrBC,GAAG,EAAE;EACP,CAAU;EAEV,OAAOH,WAAW,CAACD,IAAI,CAA6B,IAAI,SAAS;AACnE,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/form-utils.js

@@ -78,24 +78,23 @@ const createQuestionnaireResponseItems = (responses, pages) => {
     return responseItem ? [responseItem] : [];
   });
 };
+
+/** Starting value for an item: `null` for booleans, the `initialSelected` choice, else undefined. */
+const getInitialValue = item => {
+  if (item.type === "boolean") {
+    return null;
+  }
+  const initialSelected = item.type === "choice" ? item.answerOption?.find(option => option.initialSelected === true) : undefined;
+  return initialSelected?.valueCoding?.code || initialSelected?.valueString || undefined;
+};
 const initializeDefaultValues = pages => {
   const defaults = {};
   const allItems = getItems(pages.flatMap(page => page._isSyntheticPage ? page.item ?? [] : [page]));
   allItems.forEach(item => {
     const hasEnableWhenConditions = item.enableWhen && item.enableWhen.length > 0;
-    if (!hasEnableWhenConditions) {
-      if (item.type === "boolean") {
-        defaults[item.linkId || ""] = null;
-      } else if (item.type === "choice" && item.answerOption) {
-        const initialSelectedOption = item.answerOption.find(option => option.initialSelected === true);
-        if (initialSelectedOption) {
-          if (initialSelectedOption.valueCoding?.code) {
-            defaults[item.linkId || ""] = initialSelectedOption.valueCoding.code;
-          } else if (initialSelectedOption.valueString) {
-            defaults[item.linkId || ""] = initialSelectedOption.valueString;
-          }
-        }
-      }
+    const initialValue = getInitialValue(item);
+    if (!hasEnableWhenConditions && initialValue !== undefined) {
+      defaults[item.linkId || ""] = initialValue;
     }
   });
   return defaults;
@@ -107,6 +106,7 @@ export const FormUtils = {
   extractPagesFromQuestionnaire,
   createQuestionnaireResponseItems,
   initializeDefaultValues,
+  getInitialValue,
   getAllQuestionnaireItems,
   hasUnansweredRequiredItems
 };

package/lib/module/modules/questionnaire-response-form/utils/form-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConditionUtils","createAnswerFromValue","FormValidation","isAnswerableQuestionnaireItem","extractPagesFromQuestionnaire","questionnaire","item","length","pages","ungroupedItems","flushUngroupedItems","push","linkId","text","title","type","_isSyntheticPage","forEach","createResponseItem","responses","isItemEnabled","undefined","nestedItems","flatMap","nestedItem","responseItem","answer","createQuestionnaireResponseItems","page","initializeDefaultValues","defaults","allItems","getItems","hasEnableWhenConditions","enableWhen","answerOption","initialSelectedOption","find","option","initialSelected","valueCoding","code","valueString","items","getAllQuestionnaireItems","hasUnansweredRequiredItems","renderItem","resolver","unitOptionsResolver","some","getEnabledItemsForPage","required","validateRequiredFields","isValid","FormUtils"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/form-utils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ConditionUtils","createAnswerFromValue","FormValidation","isAnswerableQuestionnaireItem","extractPagesFromQuestionnaire","questionnaire","item","length","pages","ungroupedItems","flushUngroupedItems","push","linkId","text","title","type","_isSyntheticPage","forEach","createResponseItem","responses","isItemEnabled","undefined","nestedItems","flatMap","nestedItem","responseItem","answer","createQuestionnaireResponseItems","page","getInitialValue","initialSelected","answerOption","find","option","valueCoding","code","valueString","initializeDefaultValues","defaults","allItems","getItems","hasEnableWhenConditions","enableWhen","initialValue","items","getAllQuestionnaireItems","hasUnansweredRequiredItems","renderItem","resolver","unitOptionsResolver","some","getEnabledItemsForPage","required","validateRequiredFields","isValid","FormUtils"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/form-utils.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/form-validation.js

@@ -2,7 +2,7 @@
 
 import { ConditionUtils } from "./condition-utils.js";
 import { isQuestionnaireItemAnswered } from "./create-answer-from-value.js";
-import { isAnswerableQuestionnaireItem } from "./is-answerable-questionnaire-item.js";
+import { isRequiredEnforced } from "./is-answerable-questionnaire-item.js";
 import { validateQuestionnaireItemValue } from "./validate-questionnaire-item-value.js";
 
 /**
@@ -24,8 +24,7 @@ const validateRequiredFields = (pages, responses, renderItem, resolver, unitOpti
       }
       const value = responses[item.linkId || ""];
       const answered = isQuestionnaireItemAnswered(value, item);
-      const isRequired = item.required === true;
-      if (isRequired && (isAnswerableQuestionnaireItem(item) || renderItem) && !answered) {
+      if (isRequiredEnforced(item, renderItem) && !answered) {
         return true;
       }
       return validateQuestionnaireItemValue(value, item, responses, resolver, unitOptionsResolver) !== undefined;

package/lib/module/modules/questionnaire-response-form/utils/form-validation.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConditionUtils","isQuestionnaireItemAnswered","isAnswerableQuestionnaireItem","validateQuestionnaireItemValue","validateRequiredFields","pages","responses","renderItem","resolver","unitOptionsResolver","pageIndex","length","page","item","enabledItems","getEnabledItemsForPage","failureIndex","findIndex","type","value","linkId","answered","isRequired","required","undefined","isValid","firstUnansweredLocation","itemIndex","failureReason","FormValidation"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/form-validation.ts"],"mappings":";;AAIA,SAASA,cAAc,QAAQ,sBAAmB;AAClD,SAASC,2BAA2B,QAAQ,+BAA4B;AACxE,SAASC,6BAA6B,QAAQ,uCAAoC;AAKlF,SAASC,8BAA8B,QAAQ,wCAAqC;;AAEpF;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,sBAAsB,GAAGA,CAC7BC,KAAkC,EAClCC,SAAyB,EACzBC,UAAsC,EACtCC,QAA0C,EAC1CC,mBAAsD,KAKnD;EACH,KAAK,IAAIC,SAAS,GAAG,CAAC,EAAEA,SAAS,GAAGL,KAAK,CAACM,MAAM,EAAED,SAAS,EAAE,EAAE;IAC7D,MAAME,IAAI,GAAGP,KAAK,CAACK,SAAS,CAAC;IAE7B,IAAI,CAACE,IAAI,IAAI,CAACA,IAAI,CAACC,IAAI,EAAE;MACvB;IACF;IAEA,MAAMC,YAAY,GAAGd,cAAc,CAACe,sBAAsB,CAACH,IAAI,EAAEN,SAAS,CAAC;IAE3E,MAAMU,YAAY,GAAGF,YAAY,CAACG,SAAS,CAAEJ,IAAI,IAAK;MACpD,IAAIA,IAAI,CAACK,IAAI,KAAK,OAAO,IAAIL,IAAI,CAACK,IAAI,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK;MACd;MAEA,MAAMC,KAAK,GAAGb,SAAS,CAACO,IAAI,CAACO,MAAM,IAAI,EAAE,CAAC;MAC1C,MAAMC,QAAQ,GAAGpB,2BAA2B,CAACkB,KAAK,EAAEN,IAAI,CAAC;MACzD,MAAMS,UAAU,GAAGT,IAAI,CAACU,QAAQ,KAAK,IAAI;MAEzC,IACED,UAAU,KACTpB,6BAA6B,CAACW,IAAI,CAAC,IAAIN,UAAU,CAAC,IACnD,CAACc,QAAQ,EACT;QACA,OAAO,IAAI;MACb;MAEA,OACElB,8BAA8B,CAC5BgB,KAAK,EACLN,IAAI,EACJP,SAAS,EACTE,QAAQ,EACRC,mBACF,CAAC,KAAKe,SAAS;IAEnB,CAAC,CAAC;IAEF,IAAIR,YAAY,KAAK,CAAC,CAAC,EAAE;MACvB,MAAMH,IAAI,GAAGC,YAAY,CAACE,YAAY,CAAC;MACvC,MAAMG,KAAK,GAAGN,IAAI,GAAGP,SAAS,CAACO,IAAI,CAACO,MAAM,IAAI,EAAE,CAAC,GAAGI,SAAS;MAC7D,MAAMH,QAAQ,GAAGR,IAAI,GAAGZ,2BAA2B,CAACkB,KAAK,EAAEN,IAAI,CAAC,GAAG,KAAK;MAExE,OAAO;QACLY,OAAO,EAAE,KAAK;QACdC,uBAAuB,EAAE;UACvBhB,SAAS;UACTiB,SAAS,EAAEX;QACb,CAAC;QACDY,aAAa,EACXf,IAAI,EAAEU,QAAQ,IAAI,CAACF,QAAQ,GAAG,UAAU,GAAG;MAC/C,CAAC;IACH;EACF;EAEA,OAAO;IACLI,OAAO,EAAE,IAAI;IACbC,uBAAuB,EAAE;EAC3B,CAAC;AACH,CAAC;AAED,OAAO,MAAMG,cAAc,GAAG;EAC5BzB;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["ConditionUtils","isQuestionnaireItemAnswered","isRequiredEnforced","validateQuestionnaireItemValue","validateRequiredFields","pages","responses","renderItem","resolver","unitOptionsResolver","pageIndex","length","page","item","enabledItems","getEnabledItemsForPage","failureIndex","findIndex","type","value","linkId","answered","undefined","isValid","firstUnansweredLocation","itemIndex","failureReason","required","FormValidation"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/form-validation.ts"],"mappings":";;AAIA,SAASA,cAAc,QAAQ,sBAAmB;AAClD,SAASC,2BAA2B,QAAQ,+BAA4B;AACxE,SAASC,kBAAkB,QAAQ,uCAAoC;AAKvE,SAASC,8BAA8B,QAAQ,wCAAqC;;AAEpF;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,sBAAsB,GAAGA,CAC7BC,KAAkC,EAClCC,SAAyB,EACzBC,UAAsC,EACtCC,QAA0C,EAC1CC,mBAAsD,KAKnD;EACH,KAAK,IAAIC,SAAS,GAAG,CAAC,EAAEA,SAAS,GAAGL,KAAK,CAACM,MAAM,EAAED,SAAS,EAAE,EAAE;IAC7D,MAAME,IAAI,GAAGP,KAAK,CAACK,SAAS,CAAC;IAE7B,IAAI,CAACE,IAAI,IAAI,CAACA,IAAI,CAACC,IAAI,EAAE;MACvB;IACF;IAEA,MAAMC,YAAY,GAAGd,cAAc,CAACe,sBAAsB,CAACH,IAAI,EAAEN,SAAS,CAAC;IAE3E,MAAMU,YAAY,GAAGF,YAAY,CAACG,SAAS,CAAEJ,IAAI,IAAK;MACpD,IAAIA,IAAI,CAACK,IAAI,KAAK,OAAO,IAAIL,IAAI,CAACK,IAAI,KAAK,SAAS,EAAE;QACpD,OAAO,KAAK;MACd;MAEA,MAAMC,KAAK,GAAGb,SAAS,CAACO,IAAI,CAACO,MAAM,IAAI,EAAE,CAAC;MAC1C,MAAMC,QAAQ,GAAGpB,2BAA2B,CAACkB,KAAK,EAAEN,IAAI,CAAC;MAEzD,IAAIX,kBAAkB,CAACW,IAAI,EAAEN,UAAU,CAAC,IAAI,CAACc,QAAQ,EAAE;QACrD,OAAO,IAAI;MACb;MAEA,OACElB,8BAA8B,CAC5BgB,KAAK,EACLN,IAAI,EACJP,SAAS,EACTE,QAAQ,EACRC,mBACF,CAAC,KAAKa,SAAS;IAEnB,CAAC,CAAC;IAEF,IAAIN,YAAY,KAAK,CAAC,CAAC,EAAE;MACvB,MAAMH,IAAI,GAAGC,YAAY,CAACE,YAAY,CAAC;MACvC,MAAMG,KAAK,GAAGN,IAAI,GAAGP,SAAS,CAACO,IAAI,CAACO,MAAM,IAAI,EAAE,CAAC,GAAGE,SAAS;MAC7D,MAAMD,QAAQ,GAAGR,IAAI,GAAGZ,2BAA2B,CAACkB,KAAK,EAAEN,IAAI,CAAC,GAAG,KAAK;MAExE,OAAO;QACLU,OAAO,EAAE,KAAK;QACdC,uBAAuB,EAAE;UACvBd,SAAS;UACTe,SAAS,EAAET;QACb,CAAC;QACDU,aAAa,EACXb,IAAI,EAAEc,QAAQ,IAAI,CAACN,QAAQ,GAAG,UAAU,GAAG;MAC/C,CAAC;IACH;EACF;EAEA,OAAO;IACLE,OAAO,EAAE,IAAI;IACbC,uBAAuB,EAAE;EAC3B,CAAC;AACH,CAAC;AAED,OAAO,MAAMI,cAAc,GAAG;EAC5BxB;AACF,CAAC","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/is-answerable-questionnaire-item.js

@@ -1,5 +1,9 @@
 "use strict";
 
 const ANSWERABLE_ITEM_TYPES = new Set(["boolean", "choice", "date", "dateTime", "decimal", "integer", "string", "text", "time"]);
-export const isAnswerableQuestionnaireItem = item => ANSWERABLE_ITEM_TYPES.has(item.type);
+const isAnswerableQuestionnaireItem = item => ANSWERABLE_ITEM_TYPES.has(item.type);
+
+/** Required and checkable: a built-in answerable type, or any non-group/display item when the host renders items. */
+const isRequiredEnforced = (item, renderItem) => !!item.required && (isAnswerableQuestionnaireItem(item) || !!renderItem && item.type !== "group" && item.type !== "display");
+export { isAnswerableQuestionnaireItem, isRequiredEnforced };
 //# sourceMappingURL=is-answerable-questionnaire-item.js.map

package/lib/module/modules/questionnaire-response-form/utils/is-answerable-questionnaire-item.js.map

@@ -1 +1 @@
-{"version":3,"names":["ANSWERABLE_ITEM_TYPES","Set","isAnswerableQuestionnaireItem","item","has","type"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/is-answerable-questionnaire-item.ts"],"mappings":";;AAEA,MAAMA,qBAAqB,GAAG,IAAIC,GAAG,CAA4B,CAC/D,SAAS,EACT,QAAQ,EACR,MAAM,EACN,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC;AAEF,OAAO,MAAMC,6BAA6B,GACxCC,IAAuB,IACXH,qBAAqB,CAACI,GAAG,CAACD,IAAI,CAACE,IAAI,CAAC","ignoreList":[]}
+{"version":3,"names":["ANSWERABLE_ITEM_TYPES","Set","isAnswerableQuestionnaireItem","item","has","type","isRequiredEnforced","renderItem","required"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/is-answerable-questionnaire-item.ts"],"mappings":";;AAEA,MAAMA,qBAAqB,GAAG,IAAIC,GAAG,CAA4B,CAC/D,SAAS,EACT,QAAQ,EACR,MAAM,EACN,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,MAAM,CACP,CAAC;AAEF,MAAMC,6BAA6B,GACjCC,IAAuB,IACXH,qBAAqB,CAACI,GAAG,CAACD,IAAI,CAACE,IAAI,CAAC;;AAElD;AACA,MAAMC,kBAAkB,GAAGA,CACzBH,IAAuB,EACvBI,UAAoB,KAEpB,CAAC,CAACJ,IAAI,CAACK,QAAQ,KACdN,6BAA6B,CAACC,IAAI,CAAC,IACjC,CAAC,CAACI,UAAU,IAAIJ,IAAI,CAACE,IAAI,KAAK,OAAO,IAAIF,IAAI,CAACE,IAAI,KAAK,SAAU,CAAC;AAEvE,SAASH,6BAA6B,EAAEI,kBAAkB","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/questionnaire-date-utils.js

@@ -45,5 +45,35 @@ const isQuestionnaireDateOutsideBounds = (value, type, minimumDate, maximumDate)
   }
   return !!minimumDate && value < minimumDate || !!maximumDate && value > maximumDate;
 };
-export { isQuestionnaireDateOutsideBounds, parseQuestionnaireDate };
+const pad = part => String(part).padStart(2, "0");
+
+/** The FHIR answer string for a picked date: ISO instant, local YYYY-MM-DD, or local hh:mm:ss. */
+const toQuestionnaireAnswerString = (date, type) => {
+  switch (type) {
+    case "dateTime":
+      return date.toISOString();
+    case "date":
+      return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+    case "time":
+      return [date.getHours(), date.getMinutes(), date.getSeconds()].map(pad).join(":");
+  }
+};
+
+/** Locale display text for a stored answer value. */
+const formatQuestionnaireDate = (value, type) => {
+  const date = parseQuestionnaireDate(value, type, "minimum") ?? new Date(value);
+  const time = () => date.toLocaleTimeString([], {
+    hour: "2-digit",
+    minute: "2-digit"
+  });
+  switch (type) {
+    case "dateTime":
+      return `${date.toLocaleDateString()} ${time()}`;
+    case "date":
+      return date.toLocaleDateString();
+    case "time":
+      return time();
+  }
+};
+export { formatQuestionnaireDate, isQuestionnaireDateOutsideBounds, parseQuestionnaireDate, toQuestionnaireAnswerString };
 //# sourceMappingURL=questionnaire-date-utils.js.map

package/lib/module/modules/questionnaire-response-form/utils/questionnaire-date-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["parseQuestionnaireDate","value","type","boundary","undefined","match","exec","date","Date","setHours","Number","year","month","day","getDate","isNaN","getTime","isQuestionnaireDateOutsideBounds","minimumDate","maximumDate","selectedDay","getFullYear","getMonth","minimumDay","maximumDay","selectedTime","getHours","getMinutes","getSeconds","minimumTime","maximumTime"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/questionnaire-date-utils.ts"],"mappings":";;AAEA,MAAMA,sBAAsB,GAAGA,CAC7BC,KAAkC,EAClCC,IAAkB,EAClBC,QAA+B,KACV;EACrB,IAAIF,KAAK,KAAKG,SAAS,EAAE;IACvB,OAAOA,SAAS;EAClB;EAEA,IAAI,OAAOH,KAAK,KAAK,QAAQ,IAAIC,IAAI,KAAK,MAAM,EAAE;IAChD,MAAMG,KAAK,GAAG,4CAA4C,CAACC,IAAI,CAACL,KAAK,CAAC;IAEtE,IAAII,KAAK,EAAE;MACT,MAAME,IAAI,GAAG,IAAIC,IAAI,CAAC,CAAC;MAEvBD,IAAI,CAACE,QAAQ,CACXC,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAChBK,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAChBK,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EACrB,CACF,CAAC;MAED,OAAOE,IAAI;IACb;EACF;EAEA,IAAI,OAAON,KAAK,KAAK,QAAQ,KAAKC,IAAI,KAAK,MAAM,IAAIA,IAAI,KAAK,UAAU,CAAC,EAAE;IACzE,MAAMG,KAAK,GAAG,qCAAqC,CAACC,IAAI,CAACL,KAAK,CAAC;IAE/D,IAAII,KAAK,EAAE;MACT,MAAMM,IAAI,GAAGD,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC;MAC7B,MAAMO,KAAK,GAAGF,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,KAAKF,QAAQ,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;MAEnE,MAAMU,GAAG,GAAGH,MAAM,CAChBL,KAAK,CAAC,CAAC,CAAC,KACLF,QAAQ,KAAK,SAAS,GAAG,CAAC,GAAG,IAAIK,IAAI,CAACG,IAAI,EAAEC,KAAK,EAAE,CAAC,CAAC,CAACE,OAAO,CAAC,CAAC,CACpE,CAAC;MAED,OAAO,IAAIN,IAAI,CAACG,IAAI,EAAEC,KAAK,GAAG,CAAC,EAAEC,GAAG,CAAC;IACvC;EACF;EAEA,IAAI,OAAOZ,KAAK,KAAK,QAAQ,IAAIC,IAAI,KAAK,MAAM,EAAE;IAChD,MAAMG,KAAK,GAAG,2BAA2B,CAACC,IAAI,CAACL,KAAK,CAAC;IAErD,IAAII,KAAK,EAAE;MACT,OAAO,IAAIG,IAAI,CAACE,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,EAAEK,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAEK,MAAM,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E;EACF;EAEA,MAAME,IAAI,GAAG,IAAIC,IAAI,CAACP,KAAK,CAAC;EAE5B,OAAOS,MAAM,CAACK,KAAK,CAACR,IAAI,CAACS,OAAO,CAAC,CAAC,CAAC,GAAGZ,SAAS,GAAGG,IAAI;AACxD,CAAC;AAED,MAAMU,gCAAgC,GAAGA,CACvChB,KAAW,EACXC,IAAkB,EAClBgB,WAAkB,EAClBC,WAAkB,KACN;EACZ,IAAIjB,IAAI,KAAK,MAAM,EAAE;IACnB,MAAMkB,WAAW,GAAG,IAAIZ,IAAI,CAC1BP,KAAK,CAACoB,WAAW,CAAC,CAAC,EACnBpB,KAAK,CAACqB,QAAQ,CAAC,CAAC,EAChBrB,KAAK,CAACa,OAAO,CAAC,CAChB,CAAC;IAED,MAAMS,UAAU,GAAGL,WAAW,GAC1B,IAAIV,IAAI,CACNU,WAAW,CAACG,WAAW,CAAC,CAAC,EACzBH,WAAW,CAACI,QAAQ,CAAC,CAAC,EACtBJ,WAAW,CAACJ,OAAO,CAAC,CACtB,CAAC,GACDV,SAAS;IAEb,MAAMoB,UAAU,GAAGL,WAAW,GAC1B,IAAIX,IAAI,CACNW,WAAW,CAACE,WAAW,CAAC,CAAC,EACzBF,WAAW,CAACG,QAAQ,CAAC,CAAC,EACtBH,WAAW,CAACL,OAAO,CAAC,CACtB,CAAC,GACDV,SAAS;IAEb,OACG,CAAC,CAACmB,UAAU,IAAIH,WAAW,GAAGG,UAAU,IACxC,CAAC,CAACC,UAAU,IAAIJ,WAAW,GAAGI,UAAW;EAE9C;EAEA,IAAItB,IAAI,KAAK,MAAM,EAAE;IACnB,MAAMuB,YAAY,GAChBxB,KAAK,CAACyB,QAAQ,CAAC,CAAC,GAAG,IAAI,GAAGzB,KAAK,CAAC0B,UAAU,CAAC,CAAC,GAAG,EAAE,GAAG1B,KAAK,CAAC2B,UAAU,CAAC,CAAC;IAExE,MAAMC,WAAW,GAAGX,WAAW,GAC3BA,WAAW,CAACQ,QAAQ,CAAC,CAAC,GAAG,IAAI,GAC7BR,WAAW,CAACS,UAAU,CAAC,CAAC,GAAG,EAAE,GAC7BT,WAAW,CAACU,UAAU,CAAC,CAAC,GACxBxB,SAAS;IAEb,MAAM0B,WAAW,GAAGX,WAAW,GAC3BA,WAAW,CAACO,QAAQ,CAAC,CAAC,GAAG,IAAI,GAC7BP,WAAW,CAACQ,UAAU,CAAC,CAAC,GAAG,EAAE,GAC7BR,WAAW,CAACS,UAAU,CAAC,CAAC,GACxBxB,SAAS;IAEb,OACGyB,WAAW,KAAKzB,SAAS,IAAIqB,YAAY,GAAGI,WAAW,IACvDC,WAAW,KAAK1B,SAAS,IAAIqB,YAAY,GAAGK,WAAY;EAE7D;EAEA,OACG,CAAC,CAACZ,WAAW,IAAIjB,KAAK,GAAGiB,WAAW,IACpC,CAAC,CAACC,WAAW,IAAIlB,KAAK,GAAGkB,WAAY;AAE1C,CAAC;AAED,SAASF,gCAAgC,EAAEjB,sBAAsB","ignoreList":[]}
+{"version":3,"names":["parseQuestionnaireDate","value","type","boundary","undefined","match","exec","date","Date","setHours","Number","year","month","day","getDate","isNaN","getTime","isQuestionnaireDateOutsideBounds","minimumDate","maximumDate","selectedDay","getFullYear","getMonth","minimumDay","maximumDay","selectedTime","getHours","getMinutes","getSeconds","minimumTime","maximumTime","pad","part","String","padStart","toQuestionnaireAnswerString","toISOString","map","join","formatQuestionnaireDate","time","toLocaleTimeString","hour","minute","toLocaleDateString"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/questionnaire-date-utils.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/questionnaire-navigation-utils.js

@@ -2,7 +2,7 @@
 
 import { ConditionUtils } from "./condition-utils.js";
 import { isQuestionnaireItemAnswered } from "./create-answer-from-value.js";
-import { isAnswerableQuestionnaireItem } from "./is-answerable-questionnaire-item.js";
+import { isRequiredEnforced } from "./is-answerable-questionnaire-item.js";
 const findNextEnabledPageIndex = (pages, startIndex, responses) => {
   for (let pageIndex = startIndex; pageIndex < pages.length; pageIndex++) {
     const page = pages[pageIndex];
@@ -23,7 +23,7 @@ export class QuestionnaireNavigationUtils {
       if (enabledItems.length) {
         return {
           hasError: true,
-          errorMessage: "This question is required"
+          errorMessage: "questionnaire-form.error.required"
         };
       }
       const nextPageIndex = findNextEnabledPageIndex(pages, currentPageIndex + 1, responses);
@@ -31,10 +31,10 @@ export class QuestionnaireNavigationUtils {
         newPageIndex: nextPageIndex
       };
     }
-    if (currentItem.required && (isAnswerableQuestionnaireItem(currentItem) || !!renderItem && currentItem.type !== "group" && currentItem.type !== "display") && !isQuestionnaireItemAnswered(responses[currentItem.linkId || ""], currentItem)) {
+    if (isRequiredEnforced(currentItem, renderItem) && !isQuestionnaireItemAnswered(responses[currentItem.linkId || ""], currentItem)) {
       return {
         hasError: true,
-        errorMessage: "This question is required"
+        errorMessage: "questionnaire-form.error.required"
       };
     }
     if (currentItemIndex < enabledItems.length - 1) {

package/lib/module/modules/questionnaire-response-form/utils/questionnaire-navigation-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConditionUtils","isQuestionnaireItemAnswered","isAnswerableQuestionnaireItem","findNextEnabledPageIndex","pages","startIndex","responses","pageIndex","length","page","getEnabledItemsForPage","undefined","QuestionnaireNavigationUtils","handleNext","currentPage","enabledItems","currentItem","currentItemIndex","currentPageIndex","renderItem","hasError","errorMessage","nextPageIndex","newPageIndex","required","type","linkId","newItemIndex","handlePrevious","currentPageItems","Math","min","previousItems","lastItemIndex"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/questionnaire-navigation-utils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ConditionUtils","isQuestionnaireItemAnswered","isRequiredEnforced","findNextEnabledPageIndex","pages","startIndex","responses","pageIndex","length","page","getEnabledItemsForPage","undefined","QuestionnaireNavigationUtils","handleNext","currentPage","enabledItems","currentItem","currentItemIndex","currentPageIndex","renderItem","hasError","errorMessage","nextPageIndex","newPageIndex","linkId","newItemIndex","handlePrevious","currentPageItems","Math","min","previousItems","lastItemIndex"],"sourceRoot":"../../../../../src","sources":["modules/questionnaire-response-form/utils/questionnaire-navigation-utils.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/questionnaire-response-form/utils/questionnaire-string-constraint-validator.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import { parseFhirTimeSeconds } from "./fhir-time.js";
 const compare = (value, bound) => {
   if (typeof value === "number" && typeof bound === "number") {
     return value - bound;
@@ -42,20 +43,6 @@ const getDateInterval = value => {
     end
   };
 };
-const getTimeValue = value => {
-  const match = /^(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?$/.exec(value);
-  if (!match) {
-    return undefined;
-  }
-  const hours = Number(match[1]);
-  const minutes = Number(match[2]);
-  const seconds = Number(match[3] ?? 0);
-  if (hours > 23 || minutes > 59 || seconds > 59) {
-    return undefined;
-  }
-  const fractionalSeconds = match[4] ? Number(`0.${match[4]}`) : 0;
-  return hours * 3600 + minutes * 60 + seconds + fractionalSeconds;
-};
 const validateDateConstraints = (answer, constraints) => {
   const {
     minValue: min,
@@ -74,9 +61,9 @@ const validateTimeConstraints = (answer, constraints) => {
     minValue: min,
     maxValue: max
   } = constraints;
-  const answerTime = getTimeValue(answer);
-  const minTime = typeof min === "string" ? getTimeValue(min) : undefined;
-  const maxTime = typeof max === "string" ? getTimeValue(max) : undefined;
+  const answerTime = parseFhirTimeSeconds(answer);
+  const minTime = typeof min === "string" ? parseFhirTimeSeconds(min) : undefined;
+  const maxTime = typeof max === "string" ? parseFhirTimeSeconds(max) : undefined;
   if (answerTime === undefined || min !== undefined && minTime === undefined || max !== undefined && maxTime === undefined) {
     return "invalid-answer";
   }