@openmrs/ngx-formentry 3.0.1-pre.83 → 3.0.1-pre.86
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/bundles/openmrs-ngx-formentry.umd.js +10 -8
- package/bundles/openmrs-ngx-formentry.umd.js.map +1 -1
- package/esm2015/form-entry/helpers/historical-expression-helper-service.js +11 -9
- package/fesm2015/openmrs-ngx-formentry.js +10 -8
- package/fesm2015/openmrs-ngx-formentry.js.map +1 -1
- package/form-entry/helpers/historical-expression-helper-service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -6,16 +6,18 @@ import { AfeFormControl } from '../../abstract-controls-extension/afe-form-contr
|
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
7
7
|
export class HistoricalHelperService {
|
|
8
8
|
constructor() { }
|
|
9
|
-
evaluate(expr, dataSources,
|
|
9
|
+
evaluate(expr, dataSources, additionalScopeValues) {
|
|
10
10
|
const HD = new HistoricalEncounterDataService();
|
|
11
11
|
HD.registerEncounters('prevEnc', dataSources['rawPrevEnc']);
|
|
12
|
-
|
|
13
|
-
HD
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
12
|
+
if (dataSources.hasOwnProperty('rawPrevObs')) {
|
|
13
|
+
HD.registerEncounters('prevObs', dataSources['rawPrevObs']);
|
|
14
|
+
}
|
|
15
|
+
const deps = { HD };
|
|
16
|
+
if (additionalScopeValues) {
|
|
17
|
+
for (const o in additionalScopeValues) {
|
|
18
|
+
const value = additionalScopeValues[o];
|
|
19
|
+
if (typeof value !== 'undefined' && value !== null) {
|
|
20
|
+
deps[o] = value;
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
23
|
}
|
|
@@ -37,4 +39,4 @@ HistoricalHelperService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.
|
|
|
37
39
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0, type: HistoricalHelperService, decorators: [{
|
|
38
40
|
type: Injectable
|
|
39
41
|
}], ctorParameters: function () { return []; } });
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlzdG9yaWNhbC1leHByZXNzaW9uLWhlbHBlci1zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbmd4LWZvcm1lbnRyeS9zcmMvZm9ybS1lbnRyeS9oZWxwZXJzL2hpc3RvcmljYWwtZXhwcmVzc2lvbi1oZWxwZXItc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQy9GLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVELE9BQU8sRUFFTCxnQkFBZ0IsRUFDakIsTUFBTSx3Q0FBd0MsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0RBQW9ELENBQUM7O0FBR3BGLE1BQU0sT0FBTyx1QkFBdUI7SUFDbEMsZ0JBQWUsQ0FBQztJQUVULFFBQVEsQ0FDYixJQUFZLEVBQ1osV0FBb0MsRUFDcEMscUJBQXFEO1FBRXJELE1BQU0sRUFBRSxHQUFHLElBQUksOEJBQThCLEVBQUUsQ0FBQztRQUNoRCxFQUFFLENBQUMsa0JBQWtCLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQzVELElBQUksV0FBVyxDQUFDLGNBQWMsQ0FBQyxZQUFZLENBQUMsRUFBRTtZQUM1QyxFQUFFLENBQUMsa0JBQWtCLENBQUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1NBQzdEO1FBRUQsTUFBTSxJQUFJLEdBQUcsRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUVwQixJQUFJLHFCQUFxQixFQUFFO1lBQ3pCLEtBQUssTUFBTSxDQUFDLElBQUkscUJBQXFCLEVBQUU7Z0JBQ3JDLE1BQU0sS0FBSyxHQUFHLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLE9BQU8sS0FBSyxLQUFLLFdBQVcsSUFBSSxLQUFLLEtBQUssSUFBSSxFQUFFO29CQUNsRCxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDO2lCQUNqQjthQUNGO1NBQ0Y7UUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFrQixFQUFFLENBQUM7UUFDeEMsTUFBTSxPQUFPLEdBQW1CLElBQUksY0FBYyxFQUFFLENBQUM7UUFDckQsTUFBTSxNQUFNLEdBQXFCLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUN4RCxNQUFNLFFBQVEsR0FBYSxNQUFNLENBQUMsV0FBVyxDQUMzQyxJQUFJLEVBQ0osT0FBTyxFQUNQLE1BQU0sQ0FBQyxlQUFlLEVBQ3RCLElBQUksQ0FDTCxDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDeEIsQ0FBQztJQUVNLG9CQUFvQixDQUN6QixJQUFZLEVBQ1osV0FBZ0IsRUFDaEIsZUFBb0I7UUFFcEIsTUFBTSxlQUFlLEdBQUc7WUFDdEIsU0FBUyxFQUFFLGVBQWU7U0FDM0IsQ0FBQztRQUVGLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsV0FBVyxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQzNELENBQUM7O3FIQWhEVSx1QkFBdUI7eUhBQXZCLHVCQUF1Qjs0RkFBdkIsdUJBQXVCO2tCQURuQyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQgeyBIaXN0b3JpY2FsRW5jb3VudGVyRGF0YVNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9oaXN0b3JpY2FsLWVuY291bnRlci1kYXRhLnNlcnZpY2UnO1xuaW1wb3J0IHsgSnNFeHByZXNzaW9uSGVscGVyIH0gZnJvbSAnLi9qcy1leHByZXNzaW9uLWhlbHBlcic7XG5pbXBvcnQge1xuICBSdW5uYWJsZSxcbiAgRXhwcmVzc2lvblJ1bm5lclxufSBmcm9tICcuLi9leHByZXNzaW9uLXJ1bm5lci9leHByZXNzaW9uLXJ1bm5lcic7XG5pbXBvcnQgeyBBZmVGb3JtQ29udHJvbCB9IGZyb20gJy4uLy4uL2Fic3RyYWN0LWNvbnRyb2xzLWV4dGVuc2lvbi9hZmUtZm9ybS1jb250cm9sJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEhpc3RvcmljYWxIZWxwZXJTZXJ2aWNlIHtcbiAgY29uc3RydWN0b3IoKSB7fVxuXG4gIHB1YmxpYyBldmFsdWF0ZShcbiAgICBleHByOiBzdHJpbmcsXG4gICAgZGF0YVNvdXJjZXM6IFJlY29yZDxzdHJpbmcsIHVua25vd24+LFxuICAgIGFkZGl0aW9uYWxTY29wZVZhbHVlczogUmVjb3JkPHN0cmluZywgdW5rbm93bj4gfCBudWxsLFxuICApIHtcbiAgICBjb25zdCBIRCA9IG5ldyBIaXN0b3JpY2FsRW5jb3VudGVyRGF0YVNlcnZpY2UoKTtcbiAgICBIRC5yZWdpc3RlckVuY291bnRlcnMoJ3ByZXZFbmMnLCBkYXRhU291cmNlc1sncmF3UHJldkVuYyddKTtcbiAgICBpZiAoZGF0YVNvdXJjZXMuaGFzT3duUHJvcGVydHkoJ3Jhd1ByZXZPYnMnKSkge1xuICAgICAgSEQucmVnaXN0ZXJFbmNvdW50ZXJzKCdwcmV2T2JzJywgZGF0YVNvdXJjZXNbJ3Jhd1ByZXZPYnMnXSk7XG4gICAgfVxuXG4gICAgY29uc3QgZGVwcyA9IHsgSEQgfTtcblxuICAgIGlmIChhZGRpdGlvbmFsU2NvcGVWYWx1ZXMpIHtcbiAgICAgIGZvciAoY29uc3QgbyBpbiBhZGRpdGlvbmFsU2NvcGVWYWx1ZXMpIHtcbiAgICAgICAgY29uc3QgdmFsdWUgPSBhZGRpdGlvbmFsU2NvcGVWYWx1ZXNbb107XG4gICAgICAgIGlmICh0eXBlb2YgdmFsdWUgIT09ICd1bmRlZmluZWQnICYmIHZhbHVlICE9PSBudWxsKSB7XG4gICAgICAgICAgZGVwc1tvXSA9IHZhbHVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuXG4gICAgY29uc3QgaGVscGVyID0gbmV3IEpzRXhwcmVzc2lvbkhlbHBlcigpO1xuICAgIGNvbnN0IGNvbnRyb2w6IEFmZUZvcm1Db250cm9sID0gbmV3IEFmZUZvcm1Db250cm9sKCk7XG4gICAgY29uc3QgcnVubmVyOiBFeHByZXNzaW9uUnVubmVyID0gbmV3IEV4cHJlc3Npb25SdW5uZXIoKTtcbiAgICBjb25zdCBydW5uYWJsZTogUnVubmFibGUgPSBydW5uZXIuZ2V0UnVubmFibGUoXG4gICAgICBleHByLFxuICAgICAgY29udHJvbCxcbiAgICAgIGhlbHBlci5oZWxwZXJGdW5jdGlvbnMsXG4gICAgICBkZXBzXG4gICAgKTtcblxuICAgIHJldHVybiBydW5uYWJsZS5ydW4oKTtcbiAgfVxuXG4gIHB1YmxpYyBldmFsdWF0ZVByZWNvbmRpdGlvbihcbiAgICBleHByOiBzdHJpbmcsXG4gICAgZGF0YVNvdXJjZXM6IGFueSxcbiAgICBoaXN0b3JpY2FsVmFsdWU6IGFueVxuICApOiBhbnkge1xuICAgIGNvbnN0IGFkZGl0aW9uYWxTY29wZSA9IHtcbiAgICAgIGhpc3RWYWx1ZTogaGlzdG9yaWNhbFZhbHVlXG4gICAgfTtcblxuICAgIHJldHVybiB0aGlzLmV2YWx1YXRlKGV4cHIsIGRhdGFTb3VyY2VzLCBhZGRpdGlvbmFsU2NvcGUpO1xuICB9XG59XG4iXX0=
|
|
@@ -11158,16 +11158,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImpo
|
|
|
11158
11158
|
|
|
11159
11159
|
class HistoricalHelperService {
|
|
11160
11160
|
constructor() { }
|
|
11161
|
-
evaluate(expr, dataSources,
|
|
11161
|
+
evaluate(expr, dataSources, additionalScopeValues) {
|
|
11162
11162
|
const HD = new HistoricalEncounterDataService();
|
|
11163
11163
|
HD.registerEncounters('prevEnc', dataSources['rawPrevEnc']);
|
|
11164
|
-
|
|
11165
|
-
HD
|
|
11166
|
-
}
|
|
11167
|
-
|
|
11168
|
-
|
|
11169
|
-
|
|
11170
|
-
|
|
11164
|
+
if (dataSources.hasOwnProperty('rawPrevObs')) {
|
|
11165
|
+
HD.registerEncounters('prevObs', dataSources['rawPrevObs']);
|
|
11166
|
+
}
|
|
11167
|
+
const deps = { HD };
|
|
11168
|
+
if (additionalScopeValues) {
|
|
11169
|
+
for (const o in additionalScopeValues) {
|
|
11170
|
+
const value = additionalScopeValues[o];
|
|
11171
|
+
if (typeof value !== 'undefined' && value !== null) {
|
|
11172
|
+
deps[o] = value;
|
|
11171
11173
|
}
|
|
11172
11174
|
}
|
|
11173
11175
|
}
|