@iapps/d2-web-sdk 1.0.8 → 1.0.10
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/package.json +1 -1
- package/src/lib/d2-web-sdk.d.ts +4 -1
- package/src/lib/d2-web-sdk.js +20 -0
- package/src/lib/d2-web-sdk.js.map +1 -1
- package/src/lib/modules/data-element/models/data-element.model.d.ts +1 -0
- package/src/lib/modules/data-element/models/data-element.model.js.map +1 -1
- package/src/lib/modules/index.d.ts +1 -0
- package/src/lib/modules/index.js +1 -0
- package/src/lib/modules/index.js.map +1 -1
- package/src/lib/modules/program/models/program-stage.model.js.map +1 -1
- package/src/lib/modules/program/models/program.model.js +1 -1
- package/src/lib/modules/program/models/program.model.js.map +1 -1
- package/src/lib/modules/system/index.d.ts +2 -0
- package/src/lib/modules/system/index.js +9 -0
- package/src/lib/modules/system/index.js.map +1 -0
- package/src/lib/modules/system/models/index.d.ts +1 -0
- package/src/lib/modules/system/models/index.js +8 -0
- package/src/lib/modules/system/models/index.js.map +1 -0
- package/src/lib/modules/system/models/system-info.model.d.ts +54 -0
- package/src/lib/modules/system/models/system-info.model.js +30 -0
- package/src/lib/modules/system/models/system-info.model.js.map +1 -0
- package/src/lib/modules/system/system.module.d.ts +7 -0
- package/src/lib/modules/system/system.module.js +23 -0
- package/src/lib/modules/system/system.module.js.map +1 -0
- package/src/lib/modules/tracker/models/enrollment.model.js +2 -2
- package/src/lib/modules/tracker/models/enrollment.model.js.map +1 -1
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.d.ts +3 -1
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.js +26 -12
- package/src/lib/modules/tracker/models/tracked-entity-instance.model.js.map +1 -1
- package/src/lib/modules/tracker/queries/base-tracker.query.d.ts +1 -1
- package/src/lib/modules/tracker/queries/base-tracker.query.js +5 -4
- package/src/lib/modules/tracker/queries/base-tracker.query.js.map +1 -1
- package/src/lib/modules/user/user.module.js +2 -2
- package/src/lib/modules/user/user.module.js.map +1 -1
package/package.json
CHANGED
package/src/lib/d2-web-sdk.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AxiosDefaults } from 'axios';
|
|
2
|
-
import { CurrentUser, D2EngineModule, DataElementModule, Manifest, OptionSetModule, ProgramModule, TrackerModule, UserModule } from './modules';
|
|
2
|
+
import { CurrentUser, D2EngineModule, DataElementModule, Manifest, OptionSetModule, ProgramModule, TrackerModule, UserModule, SystemInfo, SystemModule } from './modules';
|
|
3
3
|
import { D2HttpClient, D2WebConfig } from './shared';
|
|
4
4
|
export interface D2Window extends Window {
|
|
5
5
|
d2Web: D2Web;
|
|
@@ -10,16 +10,19 @@ export declare class D2Web {
|
|
|
10
10
|
httpInstance: D2HttpClient;
|
|
11
11
|
appManifest: Manifest | null;
|
|
12
12
|
currentUser: CurrentUser | null;
|
|
13
|
+
systemInfo: SystemInfo | null;
|
|
13
14
|
private constructor();
|
|
14
15
|
static initialize(config: D2WebConfig): Promise<D2Web>;
|
|
15
16
|
static getInstance(config: D2WebConfig): Promise<D2Web>;
|
|
16
17
|
setConfig(config: D2WebConfig): void;
|
|
17
18
|
setAppManifest(): Promise<void>;
|
|
18
19
|
setCurrentUser(): Promise<void>;
|
|
20
|
+
setSystemInfo(): Promise<void>;
|
|
19
21
|
setHttpInstance(httpConfig: AxiosDefaults): void;
|
|
20
22
|
get rootUrl(): string;
|
|
21
23
|
get config(): D2WebConfig;
|
|
22
24
|
get userModule(): UserModule;
|
|
25
|
+
get systemModule(): SystemModule;
|
|
23
26
|
get programModule(): ProgramModule;
|
|
24
27
|
get dataElementModule(): DataElementModule;
|
|
25
28
|
get optionSetModule(): OptionSetModule;
|
package/src/lib/d2-web-sdk.js
CHANGED
|
@@ -39,6 +39,10 @@ class D2Web {
|
|
|
39
39
|
* Fetch and set current user
|
|
40
40
|
*/
|
|
41
41
|
yield instance.setCurrentUser();
|
|
42
|
+
/**
|
|
43
|
+
* Set system information
|
|
44
|
+
*/
|
|
45
|
+
yield instance.setSystemInfo();
|
|
42
46
|
D2Web.instance = instance;
|
|
43
47
|
window.d2Web = instance;
|
|
44
48
|
}
|
|
@@ -81,6 +85,19 @@ class D2Web {
|
|
|
81
85
|
}
|
|
82
86
|
});
|
|
83
87
|
}
|
|
88
|
+
setSystemInfo() {
|
|
89
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
try {
|
|
91
|
+
const systemInfo = yield this.systemModule.getSystemInfo();
|
|
92
|
+
if (systemInfo) {
|
|
93
|
+
this.systemInfo = systemInfo;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
throw new Error('System information could not be retrieved');
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
}
|
|
84
101
|
setHttpInstance(httpConfig) {
|
|
85
102
|
this.httpInstance = new shared_1.D2HttpClient(httpConfig);
|
|
86
103
|
}
|
|
@@ -101,6 +118,9 @@ class D2Web {
|
|
|
101
118
|
get userModule() {
|
|
102
119
|
return new modules_1.UserModule(this.httpInstance);
|
|
103
120
|
}
|
|
121
|
+
get systemModule() {
|
|
122
|
+
return new modules_1.SystemModule(this.httpInstance);
|
|
123
|
+
}
|
|
104
124
|
get programModule() {
|
|
105
125
|
return new modules_1.ProgramModule(this.httpInstance);
|
|
106
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d2-web-sdk.js","sourceRoot":"","sources":["../../../../../packages/dhis2-web-sdk/src/lib/d2-web-sdk.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAGjD,
|
|
1
|
+
{"version":3,"file":"d2-web-sdk.js","sourceRoot":"","sources":["../../../../../packages/dhis2-web-sdk/src/lib/d2-web-sdk.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAGjD,uCAYmB;AACnB,qCAAqD;AAMrD,MAAa,KAAK;IAOhB;QALA,gCAAsB;IAKC,CAAC;IAEjB,MAAM,CAAO,UAAU,CAAC,MAAmB;;YAChD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAE,CAAC;gBAE7B;;mBAEG;gBACH,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAE3B;;mBAEG;gBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAiC,CAAC,CAAC;gBAEnE;;mBAEG;gBACH,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAEhC;;mBAEG;gBACH,MAAM,YAAY,GAAG,IAAI,oBAAW,CAAC;oBACnC,OAAO,EAAE,QAAQ,CAAC,OAAO;iBAC1B,CAAC,CAAC;gBACH,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAiC,CAAC,CAAC;gBAEzE;;mBAEG;gBACH,MAAM,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAEhC;;mBAEG;gBACH,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAE/B,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAEzB,MAA8B,CAAC,KAAK,GAAG,QAAQ,CAAC;YACnD,CAAC;YAED,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;KAAA;IAEM,MAAM,CAAO,WAAW,CAAC,MAAmB;;YACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YACD,OAAO,KAAK,CAAC,QAAQ,CAAC;QACxB,CAAC;KAAA;IAED,SAAS,CAAC,MAAmB;QAC3B,+BAAA,IAAI,iBAAW,MAAM,MAAA,CAAC;IACxB,CAAC;IAEK,cAAc;;YAClB,MAAM,iBAAiB,GAAG,IAAI,2BAAiB,EAAE,CAAC;YAElD,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;YAC9B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1B,CAAC;QACH,CAAC;KAAA;IAEK,cAAc;;YAClB,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;gBAExD,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;gBACjC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;IAEK,aAAa;;YACjB,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;gBAE3D,IAAI,UAAU,EAAE,CAAC;oBACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC/B,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;KAAA;IAED,eAAe,CAAC,UAAyB;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAY,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,OAAO;QACT,MAAM,cAAc,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU;YAChC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI;YAChC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI;YACrC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI;YACvC,CAAC,CAAC,cAAc,CAAC;IACrB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,+BAAA,IAAI,qBAAQ,CAAC;IACtB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,oBAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,sBAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,2BAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,yBAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,wBAAc,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,uBAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;CACF;AAtJD,sBAsJC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;
|
|
1
|
+
{"version":3,"file":"data-element.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/data-element/models/data-element.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,iDAA6C;AAC7C,4CAIyB;AAgBzB,MAAa,WAAY,SAAQ,2BAA+B;IAgC9D,YAAY,WAAiC;QAC3C,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;;AArCH,kCAsCC;AArCQ,wBAAY,GAAG,cAAc,CAAC;AAC9B,gCAAoB,GAAG,aAAa,CAAC;AACrC,kBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,iBAAiB;IACjB,YAAY;IACZ,oBAAoB;IACpB,iBAAiB;IACjB,qBAAqB;IACrB,mBAAmB;IACnB,cAAc;IACd,gBAAgB;IAChB,WAAW;CACZ,CAAC"}
|
package/src/lib/modules/index.js
CHANGED
|
@@ -11,4 +11,5 @@ tslib_1.__exportStar(require("./option-set"), exports);
|
|
|
11
11
|
tslib_1.__exportStar(require("./program"), exports);
|
|
12
12
|
tslib_1.__exportStar(require("./engine"), exports);
|
|
13
13
|
tslib_1.__exportStar(require("./tracker"), exports);
|
|
14
|
+
tslib_1.__exportStar(require("./system"), exports);
|
|
14
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/modules/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,yDAA+B;AAC/B,iDAAuB;AACvB,yDAA+B;AAC/B,uDAA6B;AAC7B,oDAA0B;AAC1B,mDAAyB;AACzB,oDAA0B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/dhis2-web-sdk/src/lib/modules/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,yDAA+B;AAC/B,iDAAuB;AACvB,yDAA+B;AAC/B,uDAA6B;AAC7B,oDAA0B;AAC1B,mDAAyB;AACzB,oDAA0B;AAC1B,mDAAyB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program-stage.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,+EAAoE;AACpE,yFAA6E;AAC7E,4CAIyB;AAkBzB,MAAa,YAAa,SAAQ,2BAAgC;IAsChE,YAAY,YAAmC;QAC7C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,oBAAoB,GAAG,CAAC,YAAY,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,GAAG,CACvE,CAAC,mBAAmB,EAAE,EAAE,CAAC,IAAI,iDAAmB,CAAC,mBAAmB,CAAC,CACtE,CAAC;
|
|
1
|
+
{"version":3,"file":"program-stage.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,+EAAoE;AACpE,yFAA6E;AAC7E,4CAIyB;AAkBzB,MAAa,YAAa,SAAQ,2BAAgC;IAsChE,YAAY,YAAmC;QAC7C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,oBAAoB,GAAG,CAAC,YAAY,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,GAAG,CACvE,CAAC,mBAAmB,EAAE,EAAE,CAAC,IAAI,iDAAmB,CAAC,mBAAmB,CAAC,CACtE,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG,CAC9B,YAAY,CAAC,wBAAwB,IAAI,EAAE,CAC5C,CAAC,GAAG,CACH,CAAC,uBAAuB,EAAE,EAAE,CAC1B,IAAI,0DAAuB,CAAC,uBAAuB,CAAC,CACvD,CAAC;IACJ,CAAC;;AAlDH,oCAmDC;AAlDQ,yBAAY,GAAG,eAAe,CAAC;AAC/B,iCAAoB,GAAG,cAAc,CAAC;AACtC,mBAAM,GAAwB;IACnC,GAAG,4BAAmB;IACtB,WAAW;IACX,oBAAoB;IACpB,aAAa;IACb,UAAU;IACV,gBAAgB;IAChB,aAAa;IACb,YAAY;IACZ,wBAAwB;IACxB,kBAAkB;IAClB,2BAA2B;IAC3B,mBAAmB;IACnB,oBAAoB;IACpB,aAAa;IACb,cAAc;CACf,CAAC"}
|
|
@@ -51,7 +51,7 @@ class Program extends shared_1.IdentifiableObject {
|
|
|
51
51
|
return (0, lodash_1.flatten)((this.programStages || []).map((programStage) => {
|
|
52
52
|
return (programStage.programStageDataElements || [])
|
|
53
53
|
.map((programStageDataElement) => {
|
|
54
|
-
return Object.assign(Object.assign({}, programStageDataElement.dataElement), { programStageId: programStage.id });
|
|
54
|
+
return Object.assign(Object.assign({}, programStageDataElement.dataElement), { programStageId: programStage.id, isProgramStageRepeatable: programStage.repeatable });
|
|
55
55
|
})
|
|
56
56
|
.filter((dataElement) => dataElement);
|
|
57
57
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"program.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;AAEjD,qGAAyF;AACzF,+EAAoE;AACpE,+DAAqD;AACrD,mEAAyD;AACzD,4CAIyB;AAGzB,mCAAiC;AA6BjC,MAAa,OAAQ,SAAQ,2BAA2B;IAmDtD,YAAY,OAAyB;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;;QACf,IAAI,CAAC,aAAa,GAAG,+BAAA,IAAI,qDAAkB,MAAtB,IAAI,EAAmB,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QACzE,IAAI,CAAC,eAAe,GAAG,+BAAA,IAAI,uDAAoB,MAAxB,IAAI,EACzB,OAAO,CAAC,eAAe,IAAI,EAAE,CAC9B,CAAC;QACF,IAAI,CAAC,8BAA8B;YACjC,+BAAA,IAAI,sEAAmC,MAAvC,IAAI,EACF,OAAO,CAAC,8BAA8B,IAAI,EAAE,CAC7C,CAAC;QACJ,IAAI,CAAC,oBAAoB,GAAG,+BAAA,IAAI,4DAAyB,MAA7B,IAAI,EAC9B,OAAO,CAAC,oBAAoB,IAAI,EAAE,CACnC,CAAC;IACJ,CAAC;IAED,IAAI,uBAAuB;QACzB,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC,GAAG,CACpD,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD,CAAC;IACJ,CAAC;IAED,IAAI,iCAAiC;QACnC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE;;YAChC,OAAA,6BAA6B,CAAC,UAAU;iBACxC,MAAA,6BAA6B,aAA7B,6BAA6B,uBAA7B,6BAA6B,CAAE,sBAAsB,0CAAE,MAAM,CAAA,CAAA;SAAA,CAChE;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,+BAA+B;QACjC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE,WAChC,OAAA,MAAA,6BAA6B,CAAC,sBAAsB,0CAAE,SAAS,CAAA,EAAA,CAClE;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,oCAAoC;QACtC,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,EAAE,CAAC;aAC/C,MAAM,CACL,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,aAAa,CAC9C;aACA,GAAG,CACF,CAAC,6BAA6B,EAAE,EAAE,CAChC,6BAA6B,CAAC,sBAAsB,CACvD;aACA,MAAM,CAAC,CAAC,sBAAsB,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAA,gBAAO,EACZ,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9C,OAAO,CAAC,YAAY,CAAC,wBAAwB,IAAI,EAAE,CAAC;iBACjD,GAAG,CAAC,CAAC,uBAAuB,EAAE,EAAE;gBAC/B,uCACK,uBAAuB,CAAC,WAAW,KACtC,cAAc,EAAE,YAAY,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"program.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
|
|
5
|
+
// Use of this source code is governed by a BSD-style
|
|
6
|
+
// license that can be found in the LICENSE file.
|
|
7
|
+
tslib_1.__exportStar(require("./models"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./system.module"), exports);
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/system/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,mDAAyB;AACzB,0DAAgC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './system-info.model';
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
|
|
5
|
+
// Use of this source code is governed by a BSD-style
|
|
6
|
+
// license that can be found in the LICENSE file.
|
|
7
|
+
tslib_1.__exportStar(require("./system-info.model"), exports);
|
|
8
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/system/models/index.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,8DAAoC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
interface D2DatabaseInfo {
|
|
2
|
+
name: string;
|
|
3
|
+
user: string;
|
|
4
|
+
url: string;
|
|
5
|
+
databaseVersion: string;
|
|
6
|
+
spatialSupport: boolean;
|
|
7
|
+
time: string;
|
|
8
|
+
}
|
|
9
|
+
export interface SystemInitInfo {
|
|
10
|
+
baseUrl: string;
|
|
11
|
+
apiVersion: number;
|
|
12
|
+
}
|
|
13
|
+
export declare class SystemInfo {
|
|
14
|
+
contextPath: string;
|
|
15
|
+
userAgent: string;
|
|
16
|
+
calendar: string;
|
|
17
|
+
dateFormat: string;
|
|
18
|
+
serverDate: string;
|
|
19
|
+
serverTimeZoneId: string;
|
|
20
|
+
serverTimeZoneDisplayName: string;
|
|
21
|
+
lastAnalyticsTableSuccess: string;
|
|
22
|
+
intervalSinceLastAnalyticsTableSuccess: string;
|
|
23
|
+
lastAnalyticsTableRuntime: string;
|
|
24
|
+
databaseInfo: D2DatabaseInfo;
|
|
25
|
+
version: string;
|
|
26
|
+
revision: string;
|
|
27
|
+
buildTime: string;
|
|
28
|
+
jasperReportsVersion: string;
|
|
29
|
+
environmentVariable: string;
|
|
30
|
+
fileStoreProvider: string;
|
|
31
|
+
readOnlyMode: string;
|
|
32
|
+
nodeId: string;
|
|
33
|
+
javaVersion: string;
|
|
34
|
+
javaVendor: string;
|
|
35
|
+
osName: string;
|
|
36
|
+
osArchitecture: string;
|
|
37
|
+
osVersion: string;
|
|
38
|
+
externalDirectory: string;
|
|
39
|
+
readReplicaCount: number;
|
|
40
|
+
memoryInfo: string;
|
|
41
|
+
cpuCores: number;
|
|
42
|
+
encryption: boolean;
|
|
43
|
+
emailConfigured: boolean;
|
|
44
|
+
redisEnabled: boolean;
|
|
45
|
+
systemId: string;
|
|
46
|
+
systemName: string;
|
|
47
|
+
clusterHostname: string;
|
|
48
|
+
isMetadataVersionEnabled: boolean;
|
|
49
|
+
get baseUrl(): string;
|
|
50
|
+
get apiVersion(): number;
|
|
51
|
+
constructor(params?: Partial<SystemInfo>);
|
|
52
|
+
toInitObject(): SystemInitInfo;
|
|
53
|
+
}
|
|
54
|
+
export {};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SystemInfo = void 0;
|
|
4
|
+
class SystemInfo {
|
|
5
|
+
get baseUrl() {
|
|
6
|
+
var _a, _b;
|
|
7
|
+
return ((_b = (_a = document === null || document === void 0 ? void 0 : document.location) === null || _a === void 0 ? void 0 : _a.host) === null || _b === void 0 ? void 0 : _b.includes('localhost'))
|
|
8
|
+
? `${document.location.protocol}//${document.location.host}`
|
|
9
|
+
: this.contextPath;
|
|
10
|
+
}
|
|
11
|
+
get apiVersion() {
|
|
12
|
+
var _a;
|
|
13
|
+
return Number((((_a = (this.version || '')) === null || _a === void 0 ? void 0 : _a.split('.')) || [])[1]);
|
|
14
|
+
}
|
|
15
|
+
constructor(params) {
|
|
16
|
+
if (params) {
|
|
17
|
+
Object.keys(params).forEach((key) => {
|
|
18
|
+
this[key] = params[key];
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
toInitObject() {
|
|
23
|
+
return {
|
|
24
|
+
baseUrl: this.baseUrl,
|
|
25
|
+
apiVersion: this.apiVersion,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
exports.SystemInfo = SystemInfo;
|
|
30
|
+
//# sourceMappingURL=system-info.model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-info.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/system/models/system-info.model.ts"],"names":[],"mappings":";;;AAiBA,MAAa,UAAU;IAqCrB,IAAI,OAAO;;QACT,OAAO,CAAA,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,0CAAE,IAAI,0CAAE,QAAQ,CAAC,WAAW,CAAC;YACpD,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC5D,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;IACvB,CAAC;IAED,IAAI,UAAU;;QACZ,OAAO,MAAM,CAAC,CAAC,CAAA,MAAA,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,0CAAE,KAAK,CAAC,GAAG,CAAC,KAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY,MAA4B;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjC,IAAY,CAAC,GAAG,CAAC,GAAI,MAAkC,CAAC,GAAG,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,YAAY;QACV,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF;AA7DD,gCA6DC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
|
|
3
|
+
// Use of this source code is governed by a BSD-style
|
|
4
|
+
// license that can be found in the LICENSE file.
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SystemModule = void 0;
|
|
7
|
+
const tslib_1 = require("tslib");
|
|
8
|
+
const models_1 = require("./models");
|
|
9
|
+
class SystemModule {
|
|
10
|
+
constructor(httpClient) {
|
|
11
|
+
this.httpClient = httpClient;
|
|
12
|
+
}
|
|
13
|
+
getSystemInfo() {
|
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
const systemInfoResponse = yield this.httpClient.get('system/info');
|
|
16
|
+
return systemInfoResponse.data
|
|
17
|
+
? new models_1.SystemInfo(systemInfoResponse.data)
|
|
18
|
+
: null;
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.SystemModule = SystemModule;
|
|
23
|
+
//# sourceMappingURL=system.module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/system/system.module.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAGjD,qCAAsC;AAEtC,MAAa,YAAY;IACvB,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAE1C,aAAa;;YACjB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAEpE,OAAO,kBAAkB,CAAC,IAAI;gBAC5B,CAAC,CAAC,IAAI,mBAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBACzC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC;KAAA;CACF;AAVD,oCAUC"}
|
|
@@ -8,8 +8,8 @@ const utils_1 = require("../utils");
|
|
|
8
8
|
class Enrollment extends base_model_1.BaseTrackerSDKModel {
|
|
9
9
|
constructor(enrollmentDetails) {
|
|
10
10
|
super(enrollmentDetails);
|
|
11
|
-
this.enrollmentDate = this.enrolledAt;
|
|
12
|
-
this.incidentDate = this.occurredAt;
|
|
11
|
+
this.enrollmentDate = (this.enrolledAt || '').split('T')[0];
|
|
12
|
+
this.incidentDate = (this.occurredAt || '').split('T')[0];
|
|
13
13
|
this.events = event_util_1.EventUtil.getEvents(enrollmentDetails.events || []);
|
|
14
14
|
const eventsByProgramStage = (0, lodash_1.groupBy)(this.events, 'programStage');
|
|
15
15
|
this.programStageEvents = Object.keys(eventsByProgramStage).reduce((eventObject, programStage) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enrollment.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/enrollment.model.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAC5C,oDAAgD;AAChD,6CAAmD;AAGnD,oCAAyC;AA4CzC,MAAa,UACX,SAAQ,gCAA+B;IAkCvC,YAAY,iBAAsC;QAChD,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"enrollment.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/enrollment.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Attribute, AttributeEntity } from './attribute.model';
|
|
2
|
+
import { BaseTrackerSDKModel } from './base.model';
|
|
2
3
|
import { Enrollment, IEnrollment } from './enrollment.model';
|
|
3
4
|
import { DHIS2Event, IDHIS2Event } from './event.model';
|
|
4
5
|
import { TrackerRelationship } from './tracker-relationship.model';
|
|
5
|
-
import { BaseTrackerSDKModel } from './base.model';
|
|
6
6
|
export interface ProgramOwner {
|
|
7
7
|
ownerOrgUnit: string;
|
|
8
8
|
program: string;
|
|
@@ -38,6 +38,7 @@ interface TrackerFieldProperty {
|
|
|
38
38
|
type: 'ATTRIBUTE' | 'DATA_ELEMENT' | 'ENROLLMENT_DATE' | 'INCIDENT_DATE' | 'ORG_UNIT';
|
|
39
39
|
generated?: boolean;
|
|
40
40
|
stageId?: string;
|
|
41
|
+
repeatable?: boolean;
|
|
41
42
|
}
|
|
42
43
|
export interface ITrackedEntityInstance {
|
|
43
44
|
program: string;
|
|
@@ -75,6 +76,7 @@ export interface ITrackedEntityInstance {
|
|
|
75
76
|
toObject?: () => TrackedEntityInstanceObject;
|
|
76
77
|
}
|
|
77
78
|
export declare class TrackedEntityInstance extends BaseTrackerSDKModel<ITrackedEntityInstance> implements ITrackedEntityInstance {
|
|
79
|
+
#private;
|
|
78
80
|
program: string;
|
|
79
81
|
attributes: Attribute[];
|
|
80
82
|
enrollments: IEnrollment[];
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _TrackedEntityInstance_instances, _TrackedEntityInstance_spreadEvents;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.TrackedEntityInstance = void 0;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
6
|
+
const date_fns_1 = require("date-fns");
|
|
4
7
|
const lodash_1 = require("lodash");
|
|
5
8
|
const utils_1 = require("../utils");
|
|
6
|
-
const date_fns_1 = require("date-fns");
|
|
7
9
|
const base_model_1 = require("./base.model");
|
|
8
10
|
const DEFAULT_FIELD_PROPERTIES = {
|
|
9
11
|
enrollmentDate: {
|
|
@@ -21,8 +23,9 @@ const DEFAULT_FIELD_PROPERTIES = {
|
|
|
21
23
|
};
|
|
22
24
|
class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
|
|
23
25
|
constructor(trackedEntityInstanceObject) {
|
|
24
|
-
var _a
|
|
26
|
+
var _a;
|
|
25
27
|
super(trackedEntityInstanceObject);
|
|
28
|
+
_TrackedEntityInstance_instances.add(this);
|
|
26
29
|
this.fields = DEFAULT_FIELD_PROPERTIES;
|
|
27
30
|
if (!(0, lodash_1.isEmpty)(this)) {
|
|
28
31
|
this.ownerOrgUnit = this.orgUnit;
|
|
@@ -36,21 +39,22 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
|
|
|
36
39
|
orgUnit: this.orgUnit,
|
|
37
40
|
}),
|
|
38
41
|
], { program: this.program, trackedEntityType: this.trackedEntityType });
|
|
39
|
-
this.latestEnrollment = utils_1.EnrollmentUtil.getLatestEnrollment(this.enrollments.filter((enrollment) =>
|
|
42
|
+
this.latestEnrollment = utils_1.EnrollmentUtil.getLatestEnrollment(this.enrollments.filter((enrollment) => {
|
|
43
|
+
if (!this.program) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
return enrollment.program === this.program;
|
|
47
|
+
}) || []);
|
|
48
|
+
if (!this.program && this.latestEnrollment) {
|
|
49
|
+
this.program = this.latestEnrollment.program;
|
|
50
|
+
}
|
|
40
51
|
// Spread event data values as standalone attributes of the class
|
|
41
|
-
|
|
42
|
-
var _a, _b;
|
|
43
|
-
const stageEvent = (((_b = (((_a = this.latestEnrollment) === null || _a === void 0 ? void 0 : _a.programStageEvents) || {})[stageKey]) === null || _b === void 0 ? void 0 : _b.events) || [])[0];
|
|
44
|
-
Object.keys((stageEvent === null || stageEvent === void 0 ? void 0 : stageEvent.dataValueEntities) || {}).forEach((dataValueKey) => {
|
|
45
|
-
this[dataValueKey] = stageEvent[dataValueKey];
|
|
46
|
-
});
|
|
47
|
-
});
|
|
52
|
+
tslib_1.__classPrivateFieldGet(this, _TrackedEntityInstance_instances, "m", _TrackedEntityInstance_spreadEvents).call(this);
|
|
48
53
|
// Spread enrollment data values as standalone attributes of the class
|
|
49
54
|
Object.keys(this.latestEnrollment || {}).forEach((key) => {
|
|
50
55
|
this[key] = this.latestEnrollment[key];
|
|
51
56
|
});
|
|
52
|
-
this.orgUnitName = (
|
|
53
|
-
// this.attributes = trackedEntityInstanceObject?.['attributes'] || [];
|
|
57
|
+
this.orgUnitName = (_a = this.latestEnrollment) === null || _a === void 0 ? void 0 : _a.orgUnitName;
|
|
54
58
|
this.relatedEntities = utils_1.TrackerRelationshipUtil.getRelationships(this['relationships'] || [], this.trackedEntity);
|
|
55
59
|
this.spreadAttributes(this.attributes || []);
|
|
56
60
|
}
|
|
@@ -251,4 +255,14 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
|
|
|
251
255
|
}
|
|
252
256
|
}
|
|
253
257
|
exports.TrackedEntityInstance = TrackedEntityInstance;
|
|
258
|
+
_TrackedEntityInstance_instances = new WeakSet(), _TrackedEntityInstance_spreadEvents = function _TrackedEntityInstance_spreadEvents() {
|
|
259
|
+
var _a;
|
|
260
|
+
(Object.keys(((_a = this.latestEnrollment) === null || _a === void 0 ? void 0 : _a.programStageEvents) || {}) || []).forEach((stageKey) => {
|
|
261
|
+
var _a, _b;
|
|
262
|
+
const stageEvent = (((_b = (((_a = this.latestEnrollment) === null || _a === void 0 ? void 0 : _a.programStageEvents) || {})[stageKey]) === null || _b === void 0 ? void 0 : _b.events) || [])[0];
|
|
263
|
+
Object.keys((stageEvent === null || stageEvent === void 0 ? void 0 : stageEvent.dataValueEntities) || {}).forEach((dataValueKey) => {
|
|
264
|
+
this[dataValueKey] = stageEvent[dataValueKey];
|
|
265
|
+
});
|
|
266
|
+
});
|
|
267
|
+
};
|
|
254
268
|
//# sourceMappingURL=tracked-entity-instance.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tracked-entity-instance.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracked-entity-instance.model.ts"],"names":[],"mappings":";;;;;AAAA,uCAAkC;AAClC,mCAAoE;AACpE,oCAIkB;AAElB,6CAAmD;AAmDnD,MAAM,wBAAwB,GAAyC;IACrE,cAAc,EAAE;QACd,EAAE,EAAE,gBAAgB;QACpB,IAAI,EAAE,iBAAiB;KACxB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,eAAe;KACtB;IACD,OAAO,EAAE;QACP,EAAE,EAAE,SAAS;QACb,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AAyCF,MAAa,qBACX,SAAQ,gCAA2C;IAyBnD,YACE,2BAAkE;;QAElE,KAAK,CAAC,2BAA2B,CAAC,CAAC;;QAVrC,WAAM,GAAyC,wBAAwB,CAAC;QAWtE,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,aAAa,CAAC;YAEtE,IAAI,CAAC,WAAW,GAAG,sBAAc,CAAC,cAAc,CAC9C,IAAI,CAAC,WAAW,IAAI;gBAClB,sBAAc,CAAC,QAAQ,CAAC;oBACtB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,aAAa,EAAE,IAAI,CAAC,aAAa;oBACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;oBACzC,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC;aACH,EACD,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CACrE,CAAC;YAEF,IAAI,CAAC,gBAAgB,GAAG,sBAAc,CAAC,mBAAmB,CACxD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;gBACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,UAAU,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;YAC7C,CAAC,CAAC,IAAI,EAAE,CACK,CAAC;YAEhB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YAC/C,CAAC;YAED,iEAAiE;YACjE,+BAAA,IAAI,6EAAc,MAAlB,IAAI,CAAgB,CAAC;YAErB,sEAAsE;YACtE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACvD,IAAI,CAAC,GAAG,CAAC,GAAI,IAAI,CAAC,gBAAwB,CAAC,GAAG,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,GAAG,MAAA,IAAI,CAAC,gBAAgB,0CAAE,WAAqB,CAAC;YAChE,IAAI,CAAC,eAAe,GAAG,+BAAuB,CAAC,gBAAgB,CAC7D,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,EAC3B,IAAI,CAAC,aAAuB,CAC7B,CAAC;YAEF,IAAI,CAAC,gBAAiB,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAkBD,IAAI,iBAAiB;QACnB,OAAO,qBAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,YAAY;QACd,yBAAY,IAAI,CAAC,iBAAiB,EAAG;IACvC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC;SACnC,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAE,UAAiB;QACjC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC/B,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnB,IAAI,CAAC,IAAA,kBAAS,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,SAAiB,EAAE,KAAa,EAAE,IAAa;QAC/D,IAAI,CAAC,UAAU,GAAG,qBAAa,CAAC,iBAAiB,CAC/C,IAAI,CAAC,UAAU,EACf,SAAS,EACT,KAAK,EACL,IAAI,CACL,CAAC;QACF,IAAI,IAAI,CAAC,gBAAgB;YACvB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,aAAa,CAAC,UAAuB;QACnC,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACxC,MAAM,mBAAmB,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CACvD,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,UAAU,CACxE,CAAC;QAEF,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CACtD,mBAAkC,CACnC,CAAC;QAEF,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,WAAW,GAAG,sBAAc,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpE,IAAI,CAAC,gBAAgB,GAAG,sBAAc,CAAC,mBAAmB,CACxD,IAAI,CAAC,WAAW,CACH,CAAC;IAClB,CAAC;IAED,eAAe,CAAE,YAAiC;QAChD,MAAM,sBAAsB,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,CAC9D,CAAC,aAAa,EAAE,EAAE,CAChB,aAAa,CAAC,YAAY,KAAK,YAAY,CAAC,YAAY,CAC3D,CAAC;QACF,MAAM,kBAAkB,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,OAAO,CAC7D,sBAA6C,CAC9C,CAAC;QAEF,IAAI,CAAC,eAAe;YAClB,kBAAkB,KAAK,CAAC,CAAC;gBACvB,CAAC,CAAC;oBACE,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC;oBAC5D,YAAY;oBACZ,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC;iBAC9D;gBACH,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CAAC,cAAsB;QACtC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,UAAU,GAAG,cAAc,CAAC;YAClD,IAAI,CAAC,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;QACxD,CAAC;IACH,CAAC;IAED,eAAe,CAAC,YAAoB;QAClC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,UAAU,GAAG,YAAY,CAAC;YAChD,IAAI,CAAC,gBAAgB,CAAC,YAAY,GAAG,YAAY,CAAC;QACpD,CAAC;IACH,CAAC;IAED,QAAQ;QACN,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,WAAW,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,eAAe,CAAE,YAAoB;QACnC,OAAO,CACL,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAAC,IAAI;YACnE,UAAU,EAAE,EAAE;YACd,YAAY;SACb,CACF,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,KAAkB;QACzB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,YAAoB,EAAE,IAAyB;QACjE,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAW,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,uBAAuB,CAAC,YAAoB;QAC1C,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wBAAwB,CAAE,gBAAwB;QAChD,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;aAChC,MAAM,CACL,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,gBAAgB,KAAK,gBAAgB,CACvE;aACA,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,iBAA0C;QACzD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAErD,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAW,CAAC;YACnD,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBACvC,QAAQ,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAC;oBACpB,KAAK,WAAW;wBACd,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;wBAC5C,MAAM;oBACR,KAAK,cAAc;wBACjB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,OAAQ,CAAC,CAAC;wBACvD,MAAM;oBACR,KAAK,iBAAiB;wBACpB,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;wBAClC,MAAM;oBACR,KAAK,eAAe;wBAClB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;wBAChC,MAAM;oBACR,KAAK,UAAU;wBACb,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;wBAC3B,MAAM;oBAER,OAAO,CAAC,CAAC,CAAC;wBACR,IAAI,IAAA,gBAAO,EAAC,SAAS,CAAC,EAAE,CAAC;4BACtB,SAAuC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gCACxD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;4BAC9B,CAAC,CAAC,CAAC;wBACL,CAAC;6BAAM,IAAI,IAAA,sBAAa,EAAC,SAAS,CAAC,EAAE,CAAC;4BACpC,IAAI,CAAC,gBAAgB,CACnB,SAA+C,CAChD,CAAC;wBACJ,CAAC;wBACD,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CACV,WAAmB,EACnB,KAAa,EACb,YAAoB,EACpB,OAAgB;QAEhB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAChC,WAAW,EACX,KAAK,EACL,YAAY,EACZ,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uFAAuF;IACvF,UAAU,CAAC,aAAqB,EAAE,aAAiC;QACjE,QAAQ,aAAa,EAAE,CAAC;YACtB,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,IAAI,CAAC;oBACH,OAAO,IAAA,iBAAM,EAAC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;gBAChE,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC;oBACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBACvD,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;YACD;gBACE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,OAER;QACC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;YACtB,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC1B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAClB,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CACnD;iBACA,MAAM,CACL,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,MAAK,IAAI,CAAC,OAAO,CACpC;YACpB,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;gBACjC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,qBAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC;YACrD,aAAa,EAAE,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAChE,aAAa,CAAC,QAAQ,EAAE,CACzB;SACF,CAAC;IACJ,CAAC;IAED,eAAe;QACb,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF;AAhWD,sDAgWC;;;IAhRG,CACE,MAAM,CAAC,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,kBAAkB,KAAI,EAAE,CAAC,IAAI,EAAE,CACnE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;QACrB,MAAM,UAAU,GAAG,CAAC,CAAA,MAAA,CAAC,CAAA,MAAA,IAAI,CAAC,gBAAgB,0CAAE,kBAAkB,KAAI,EAAE,CAAC,CACnE,QAAQ,CACT,0CAAE,MAAM,KAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpB,MAAM,CAAC,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,iBAAiB,KAAI,EAAE,CAAC,CAAC,OAAO,CACtD,CAAC,YAAY,EAAE,EAAE;YACf,IAAI,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Program } from '../../program';
|
|
2
1
|
import { D2HttpClient, D2HttpResponse, Pager } from '../../../shared';
|
|
2
|
+
import { Program } from '../../program';
|
|
3
3
|
import { D2TrackerResponse, ITrackedEntityInstance, ProgramDateType, TrackedEntityInstance, TrackerQueryFilter } from '../models';
|
|
4
4
|
export declare class BaseTrackerQuery<T extends TrackedEntityInstance> {
|
|
5
5
|
#private;
|
|
@@ -6,9 +6,9 @@ var _BaseTrackerQuery_instances, _BaseTrackerQuery_saveSelectedEvent, _BaseTrack
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.BaseTrackerQuery = void 0;
|
|
8
8
|
const tslib_1 = require("tslib");
|
|
9
|
+
const lodash_1 = require("lodash");
|
|
9
10
|
const shared_1 = require("../../../shared");
|
|
10
11
|
const models_1 = require("../models");
|
|
11
|
-
const lodash_1 = require("lodash");
|
|
12
12
|
class BaseTrackerQuery {
|
|
13
13
|
constructor(httpClient) {
|
|
14
14
|
_BaseTrackerQuery_instances.add(this);
|
|
@@ -91,15 +91,16 @@ class BaseTrackerQuery {
|
|
|
91
91
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
92
92
|
const fieldEntities = this.instance.fields || {};
|
|
93
93
|
const reservedAttributePromises = Object.keys(fieldEntities)
|
|
94
|
+
.filter((key) => {
|
|
95
|
+
const field = fieldEntities[key];
|
|
96
|
+
return field === null || field === void 0 ? void 0 : field.generated;
|
|
97
|
+
})
|
|
94
98
|
.map((key) => {
|
|
95
99
|
const availableValue = this.instance[key];
|
|
96
100
|
if (availableValue && availableValue.length > 0) {
|
|
97
101
|
return null;
|
|
98
102
|
}
|
|
99
103
|
const field = fieldEntities[key];
|
|
100
|
-
if (!field || !field.generated) {
|
|
101
|
-
return null;
|
|
102
|
-
}
|
|
103
104
|
return this.httpClient.get(`trackedEntityAttributes/${field.id}/generate.json`);
|
|
104
105
|
})
|
|
105
106
|
.filter((fieldPromise) => fieldPromise !== null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/base-tracker.query.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;;
|
|
1
|
+
{"version":3,"file":"base-tracker.query.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/queries/base-tracker.query.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ class UserModule {
|
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
const [userResponse, authorityResponse] = yield Promise.all([
|
|
17
17
|
this.httpClient.get('me?fields=id,name,displayName,created,' +
|
|
18
|
-
'lastUpdated,email,dataViewOrganisationUnits[id,name,level],' +
|
|
19
|
-
'organisationUnits[id,name,level],userCredentials[username],userGroups[id,name]'),
|
|
18
|
+
'lastUpdated,email,dataViewOrganisationUnits[id,code,path,name,level],' +
|
|
19
|
+
'organisationUnits[id,code,path,name,level],userCredentials[username],userGroups[id,name]'),
|
|
20
20
|
this.httpClient.get(`me/authorization`),
|
|
21
21
|
]);
|
|
22
22
|
return new models_1.CurrentUser(Object.assign(Object.assign({}, (userResponse.data || {})), { authorities: authorityResponse.data || [] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/user/user.module.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAEjD,uCAAsC;AAEtC,qCAAuC;AAEvC,MAAa,UAAU;IACrB,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAE1C,WAAW;;YACf,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1D,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,wCAAwC;oBACtC,
|
|
1
|
+
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../../../../packages/dhis2-web-sdk/src/lib/modules/user/user.module.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;;AAEjD,uCAAsC;AAEtC,qCAAuC;AAEvC,MAAa,UAAU;IACrB,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAE1C,WAAW;;YACf,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1D,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,wCAAwC;oBACtC,uEAAuE;oBACvE,0FAA0F,CAC7F;gBACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC;aACxC,CAAC,CAAC;YAEH,OAAO,IAAI,oBAAW,iCACjB,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC,KAC5B,WAAW,EAAE,iBAAiB,CAAC,IAAI,IAAI,EAAE,IACzC,CAAC;YAEH,SAAS;YACT,yCAAyC;YACzC,eAAe;YACf,kCAAkC;YAClC,4CAA4C;YAC5C,SAAS;YACT,OAAO;YACP,KAAK;QACP,CAAC;KAAA;IAED,IAAI,IAAI;QACN,OAAO,IAAI,mBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;CACF;AA/BD,gCA+BC"}
|