@ecrvs/opencrvs-toolkit 1.9.12-rc.62ef478 → 1.9.12-rc.d9cd497
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/events/index.js
CHANGED
|
@@ -4670,14 +4670,14 @@ ajv.addKeyword({
|
|
|
4670
4670
|
const dod = data?.[deathDateField];
|
|
4671
4671
|
const tod = data?.[deathTimeField];
|
|
4672
4672
|
const ageValue = data?.[ageField];
|
|
4673
|
-
if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)
|
|
4673
|
+
if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)) {
|
|
4674
4674
|
return true;
|
|
4675
4675
|
}
|
|
4676
4676
|
const dateOfBirth = /* @__PURE__ */ new Date(`${dob}T00:00:00+00:00`);
|
|
4677
4677
|
const dateOfDeath = tod ? /* @__PURE__ */ new Date(`${dod}T${tod}:00+00:00`) : /* @__PURE__ */ new Date(`${dod}T00:00:00+00:00`);
|
|
4678
4678
|
const deceasedAge = getAgeOfDeceased(dateOfBirth, dateOfDeath, format3);
|
|
4679
4679
|
const sameDay = dateOfBirth.toISOString().slice(0, 10) === dateOfDeath.toISOString().slice(0, 10);
|
|
4680
|
-
return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) && !(format3 === "minutes" && !sameDay) || format3 === "days" && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue) || format3 === "hours" && sameDay && !tod || format3 === "minutes" && !sameDay && deceasedAge < Number(ageValue) || format3 === "minutes" && sameDay && !tod;
|
|
4680
|
+
return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) && !(format3 === "minutes" && !sameDay) || format3 === "days" && !tod && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue) || format3 === "hours" && sameDay && !tod || format3 === "minutes" && !sameDay && deceasedAge < Number(ageValue) || format3 === "minutes" && sameDay && (!tod || Number(ageValue) <= deceasedAge);
|
|
4681
4681
|
}
|
|
4682
4682
|
});
|
|
4683
4683
|
ajv.addKeyword({
|
|
@@ -3860,14 +3860,14 @@ ajv.addKeyword({
|
|
|
3860
3860
|
const dod = data?.[deathDateField];
|
|
3861
3861
|
const tod = data?.[deathTimeField];
|
|
3862
3862
|
const ageValue = data?.[ageField];
|
|
3863
|
-
if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)
|
|
3863
|
+
if (!ageValue || !isValidDateFormat(dob) || !isValidDateFormat(dod)) {
|
|
3864
3864
|
return true;
|
|
3865
3865
|
}
|
|
3866
3866
|
const dateOfBirth = /* @__PURE__ */ new Date(`${dob}T00:00:00+00:00`);
|
|
3867
3867
|
const dateOfDeath = tod ? /* @__PURE__ */ new Date(`${dod}T${tod}:00+00:00`) : /* @__PURE__ */ new Date(`${dod}T00:00:00+00:00`);
|
|
3868
3868
|
const deceasedAge = getAgeOfDeceased(dateOfBirth, dateOfDeath, format3);
|
|
3869
3869
|
const sameDay = dateOfBirth.toISOString().slice(0, 10) === dateOfDeath.toISOString().slice(0, 10);
|
|
3870
|
-
return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) && !(format3 === "minutes" && !sameDay) || format3 === "days" && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue) || format3 === "hours" && sameDay && !tod || format3 === "minutes" && !sameDay && deceasedAge < Number(ageValue) || format3 === "minutes" && sameDay && !tod;
|
|
3870
|
+
return Number(ageValue) === deceasedAge && !(format3 === "hours" && !sameDay) && !(format3 === "minutes" && !sameDay) || format3 === "days" && !tod && deceasedAge - Number(ageValue) === 1 || format3 === "hours" && !sameDay && deceasedAge < Number(ageValue) || format3 === "hours" && sameDay && !tod || format3 === "minutes" && !sameDay && deceasedAge < Number(ageValue) || format3 === "minutes" && sameDay && (!tod || Number(ageValue) <= deceasedAge);
|
|
3871
3871
|
}
|
|
3872
3872
|
});
|
|
3873
3873
|
ajv.addKeyword({
|