@openmrs/esm-form-engine-lib 4.0.1-pre.2265 → 4.0.1-pre.2272
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.
|
@@ -10,6 +10,7 @@ export declare class CommonExpressionHelpers {
|
|
|
10
10
|
allFieldValues: Record<string, any>;
|
|
11
11
|
api: typeof apiFunctions;
|
|
12
12
|
isEmpty: typeof isValueEmpty;
|
|
13
|
+
dayjs: typeof dayjs;
|
|
13
14
|
constructor(node: FormNode, patient: any, allFields: FormField[], allFieldValues: Record<string, any>);
|
|
14
15
|
/**
|
|
15
16
|
* Shared helper for Z-score calculations. Finds the standard deviation (SD) value
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-expression-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/common-expression-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,qBAAa,uBAAuB;IAClC,IAAI,EAAE,QAAQ,CAAQ;IACtB,OAAO,EAAE,GAAG,CAAQ;IACpB,SAAS,EAAE,SAAS,EAAE,CAAM;IAC5B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IACzC,GAAG,sBAAgB;IACnB,OAAO,sBAAgB;
|
|
1
|
+
{"version":3,"file":"common-expression-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/common-expression-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ export class CommonExpressionHelpers {
|
|
|
31
31
|
_define_property(this, "allFieldValues", {});
|
|
32
32
|
_define_property(this, "api", apiFunctions);
|
|
33
33
|
_define_property(this, "isEmpty", isValueEmpty);
|
|
34
|
+
_define_property(this, "dayjs", dayjs);
|
|
34
35
|
/**
|
|
35
36
|
* Shared helper for Z-score calculations. Finds the standard deviation (SD) value
|
|
36
37
|
* by comparing a measurement against WHO growth reference data.
|
package/package.json
CHANGED
|
@@ -20,6 +20,7 @@ export class CommonExpressionHelpers {
|
|
|
20
20
|
allFieldValues: Record<string, any> = {};
|
|
21
21
|
api = apiFunctions;
|
|
22
22
|
isEmpty = isValueEmpty;
|
|
23
|
+
dayjs = dayjs;
|
|
23
24
|
|
|
24
25
|
constructor(node: FormNode, patient: any, allFields: FormField[], allFieldValues: Record<string, any>) {
|
|
25
26
|
this.allFields = allFields;
|
|
@@ -101,7 +102,12 @@ export class CommonExpressionHelpers {
|
|
|
101
102
|
* @returns true if left is before right
|
|
102
103
|
*/
|
|
103
104
|
isDateBefore = (left: Date, right: string | Date, format?: string): boolean => {
|
|
104
|
-
const otherDate: Date =
|
|
105
|
+
const otherDate: Date =
|
|
106
|
+
right instanceof Date
|
|
107
|
+
? right
|
|
108
|
+
: format
|
|
109
|
+
? dayjs(right, format, true).toDate()
|
|
110
|
+
: dayjs(right, 'YYYY-MM-DD', true).toDate();
|
|
105
111
|
return left?.getTime() < otherDate.getTime();
|
|
106
112
|
};
|
|
107
113
|
|
|
@@ -113,7 +119,12 @@ export class CommonExpressionHelpers {
|
|
|
113
119
|
* @param timePeriod - The time unit: 'days', 'weeks', 'months', or 'years'
|
|
114
120
|
* @returns true if selectedDate >= (baseDate + duration)
|
|
115
121
|
*/
|
|
116
|
-
isDateAfter = (
|
|
122
|
+
isDateAfter = (
|
|
123
|
+
selectedDate: Date,
|
|
124
|
+
baseDate: Date,
|
|
125
|
+
duration: number,
|
|
126
|
+
timePeriod: 'days' | 'weeks' | 'months' | 'years',
|
|
127
|
+
): boolean => {
|
|
117
128
|
const parsedBaseDate = dayjs(baseDate);
|
|
118
129
|
|
|
119
130
|
let calculatedDate: Date;
|
|
@@ -165,7 +176,12 @@ export class CommonExpressionHelpers {
|
|
|
165
176
|
* @returns true if left is after right
|
|
166
177
|
*/
|
|
167
178
|
isDateAfterSimple = (left: Date, right: string | Date, format?: string): boolean => {
|
|
168
|
-
const otherDate: Date =
|
|
179
|
+
const otherDate: Date =
|
|
180
|
+
right instanceof Date
|
|
181
|
+
? right
|
|
182
|
+
: format
|
|
183
|
+
? dayjs(right, format, true).toDate()
|
|
184
|
+
: dayjs(right, 'YYYY-MM-DD', true).toDate();
|
|
169
185
|
return left?.getTime() > otherDate.getTime();
|
|
170
186
|
};
|
|
171
187
|
|