npm - @iapps/d2-web-sdk - Versions diffs - 1.1.6 → 1.1.8 - Mend

@iapps/d2-web-sdk 1.1.6 → 1.1.8

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.

Files changed (24) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@iapps/d2-web-sdk",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "dependencies": {
     "axios": "^1.8.1",
     "date-fns": "^4.1.0",

package/src/lib/modules/event/models/data-value.model.d.ts CHANGED Viewed

@@ -32,6 +32,7 @@ export declare class DataValueUtil {
         orgUnitName?: string;
         lastUpdatedAtClient?: string;
         eventDate: string;
+        geometry: any;
         occurredAt: string;
         attributeCategoryOptions?: string;
         lastUpdated?: string;

package/src/lib/modules/event/models/event.model.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export interface IDHIS2Event {
     createdAtClient?: string;
     program: string;
     event: string;
+    geometry?: any;
     programStage: string;
     orgUnit: string;
     trackedEntity?: string;
@@ -60,6 +61,7 @@ export declare class DHIS2Event extends BaseTrackerSDKModel<DHIS2Event> implemen
     orgUnitName?: string;
     lastUpdatedAtClient?: string;
     eventDate: string;
+    geometry: any;
     occurredAt: string;
     attributeCategoryOptions?: string;
     lastUpdated?: string;
@@ -89,6 +91,15 @@ export declare class DHIS2Event extends BaseTrackerSDKModel<DHIS2Event> implemen
     }): void;
     setFields(program: Program): void;
     getDataValue(dataElement: string): DataValue;
+    /**
+     * Sets event geometry from a coordinate string input.
+     * Accepts formats like:
+     *  - "[39.319364,-6.069623]"
+     *  - "39.319364,-6.069623"
+     *  - "39.319364 -6.069623"
+     * and stores as GeoJSON Point in this.geometry.
+     */
+    setEventGeometry(coordinateValue: string): void;
     updateDataValues(dataValueEntities: Record<string, unknown>): void;
     setStatus(status?: string): void;
     toObject(): Partial<DHIS2Event>;

package/src/lib/modules/event/models/event.model.js CHANGED Viewed

@@ -5,6 +5,7 @@ const lodash_1 = require("lodash");
 const event_util_1 = require("../utils/event.util");
 const base_model_1 = require("../../tracker/models/base.model");
 const shared_1 = require("../../../shared");
+const form_helper_1 = require("../../tracker/helpers/form.helper");
 const DEFAULT_FIELD_PROPERTIES = {
     occurredAt: {
         id: 'occurredAt',
@@ -18,6 +19,10 @@ const DEFAULT_FIELD_PROPERTIES = {
         id: 'orgUnit',
         type: 'ORG_UNIT',
     },
+    geometry: {
+        id: 'geometry',
+        type: 'GEOMETRY',
+    },
 };
 class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
     constructor(eventDetails, config) {
@@ -97,6 +102,27 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
     getDataValue(dataElement) {
         return (this.dataValues || []).find((dataValue) => dataValue.dataElement === dataElement);
     }
+    /**
+     * Sets event geometry from a coordinate string input.
+     * Accepts formats like:
+     *  - "[39.319364,-6.069623]"
+     *  - "39.319364,-6.069623"
+     *  - "39.319364 -6.069623"
+     * and stores as GeoJSON Point in this.geometry.
+     */
+    setEventGeometry(coordinateValue) {
+        const parsed = (0, form_helper_1.parseCoordinates)(coordinateValue);
+        if (!parsed) {
+            return;
+        }
+        const [lonText, latText] = parsed;
+        const longitude = Number(lonText);
+        const latitude = Number(latText);
+        this.geometry = {
+            type: 'Point',
+            coordinates: [longitude, latitude],
+        };
+    }
     updateDataValues(dataValueEntities) {
         const dataValueKeys = Object.keys(dataValueEntities);
         dataValueKeys.forEach((key) => {
@@ -115,6 +141,11 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
                 case 'ORG_UNIT':
                     this.orgUnit = dataValue;
                     break;
+                case 'GEOMETRY':
+                    this.setEventGeometry(dataValue);
+                    break;
+                default:
+                    break;
             }
         });
     }
@@ -129,6 +160,7 @@ class DHIS2Event extends base_model_1.BaseTrackerSDKModel {
             event: this.event,
             status: this.status,
             program: this.program,
+            geometry: this.geometry,
             programStage: this.programStage,
             enrollment: this.enrollment,
             trackedEntity: this.trackedEntity,

package/src/lib/modules/event/models/event.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":";;;AAAA,mCAAmE;AACnE,oDAAgD;AAChD,gEAAsE;AAEtE,4CAA8C;~~AAQ9C~~,MAAM,wBAAwB,GAAuC;IACnE,UAAU,EAAE;QACV,EAAE,EAAE,YAAY;QAChB,IAAI,EAAE,eAAe;KACtB;IACD,WAAW,EAAE;QACX,EAAE,EAAE,aAAa;QACjB,IAAI,EAAE,gBAAgB;KACvB;IACD,OAAO,EAAE;QACP,EAAE,EAAE,SAAS;QACb,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;~~AA8CF~~,MAAa,UACX,SAAQ,gCAA+B;~~IAkCvC~~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~~AAxMD~~,~~gCAwMC~~"}
1	+ {"version":3,"file":"event.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/event/models/event.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/program/models/program-section.model.d.ts CHANGED Viewed

@@ -1,12 +1,13 @@
 import { IdentifiableField, IdentifiableObject } from '../../../shared';
 import { TrackedEntityAttribute } from './tracked-entity-attribute.model';
-export type ProgramSectionField = IdentifiableField | 'formName' | 'sortOrder' | 'renderType';
+export type ProgramSectionField = IdentifiableField | 'formName' | 'sortOrder' | 'description' | 'renderType';
 export declare class ProgramSection extends IdentifiableObject<ProgramSection> {
     static resourceName: string;
     static singularResourceName: string;
     static fields: ProgramSectionField[];
     formName?: string;
     sortOrder: number;
+    description: string;
     renderType?: string;
     trackedEntityAttributes?: TrackedEntityAttribute[];
     constructor(programSection: Partial<ProgramSection>);

package/src/lib/modules/program/models/program-section.model.js CHANGED Viewed

@@ -18,6 +18,7 @@ ProgramSection.singularResourceName = 'programSection';
 ProgramSection.fields = [
     ...shared_1.IDENTIFIABLE_FIELDS,
     'formName',
+    'description',
     'sortOrder',
     'renderType',
 ];

package/src/lib/modules/program/models/program-section.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program-section.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-section.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,4CAIyB;AACzB,qFAA0E;~~AAQ1E~~,MAAa,cAAe,SAAQ,2BAAkC;~~IAcpE~~,YAAY,cAAuC;QACjD,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,IAAI,CAAC,uBAAuB,GAAG,CAC7B,cAAc,CAAC,uBAAuB,IAAI,EAAE,CAC7C,CAAC,GAAG,CACH,CAAC,sBAAsB,EAAE,EAAE,CACzB,IAAI,uDAAsB,CAAC,sBAAsB,CAAC,CACrD,CAAC;IACJ,CAAC;;~~AAtBH~~,~~wCAuBC~~;~~AAtBQ~~,2BAAY,GAAG,iBAAiB,CAAC;AACjC,mCAAoB,GAAG,gBAAgB,CAAC;AACxC,qBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,WAAW;IACX,YAAY;CACb,CAAC"}
1	+ {"version":3,"file":"program-section.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-section.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,4CAIyB;AACzB,qFAA0E;AAS1E,MAAa,cAAe,SAAQ,2BAAkC;IAgBpE,YAAY,cAAuC;QACjD,KAAK,CAAC,cAAc,CAAC,CAAC;QACtB,IAAI,CAAC,uBAAuB,GAAG,CAC7B,cAAc,CAAC,uBAAuB,IAAI,EAAE,CAC7C,CAAC,GAAG,CACH,CAAC,sBAAsB,EAAE,EAAE,CACzB,IAAI,uDAAsB,CAAC,sBAAsB,CAAC,CACrD,CAAC;IACJ,CAAC;;AAxBH,wCAyBC;AAxBQ,2BAAY,GAAG,iBAAiB,CAAC;AACjC,mCAAoB,GAAG,gBAAgB,CAAC;AACxC,qBAAM,GAA0B;IACrC,GAAG,4BAAmB;IACtB,UAAU;IACV,aAAa;IACb,WAAW;IACX,YAAY;CACb,CAAC"}

package/src/lib/modules/program/models/program-stage-section.model.d.ts CHANGED Viewed

@@ -1,12 +1,13 @@
 import { DataElement } from '../../data-element';
 import { IdentifiableField, IdentifiableObject } from '../../../shared';
-export type ProgramStageSectionField = IdentifiableField | 'sortOrder' | 'renderType' | 'dataElements';
+export type ProgramStageSectionField = IdentifiableField | 'sortOrder' | 'description' | 'renderType' | 'dataElements';
 export declare class ProgramStageSection extends IdentifiableObject<ProgramStageSection> {
     static resourceName: string;
     static singularResourceName: string;
     static fields: ProgramStageSectionField[];
     sortOrder: number;
     renderType: any;
+    description: string;
     dataElements: DataElement[];
     constructor(programStageSection: Partial<ProgramStageSection>);
 }

package/src/lib/modules/program/models/program-stage-section.model.js CHANGED Viewed

@@ -19,6 +19,7 @@ ProgramStageSection.singularResourceName = 'programStageSection';
 ProgramStageSection.fields = [
     ...shared_1.IDENTIFIABLE_FIELDS,
     'sortOrder',
+    'description',
     'renderType',
     'dataElements',
 ];

package/src/lib/modules/program/models/program-stage-section.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"program-stage-section.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage-section.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qDAAiD;AACjD,4CAIyB;~~AAOzB~~,MAAa,mBAAoB,SAAQ,2BAAuC;~~IAc9E~~,YAAY,mBAAiD;QAC3D,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,mBAAmB,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAC9D,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,WAAW,CAAC,CAC9C,CAAC;IACJ,CAAC;;~~AAnBH~~,~~kDAoBC~~;~~AAnBQ~~,gCAAY,GAAG,sBAAsB,CAAC;AACtC,wCAAoB,GAAG,qBAAqB,CAAC;AACpD,6BAA6B;AACtB,0BAAM,GAA+B;IAC1C,GAAG,4BAAmB;IACtB,WAAW;IACX,YAAY;IACZ,cAAc;CACf,CAAC"}
1	+ {"version":3,"file":"program-stage-section.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/program/models/program-stage-section.model.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;AACjD,qDAAiD;AACjD,4CAIyB;AAQzB,MAAa,mBAAoB,SAAQ,2BAAuC;IAgB9E,YAAY,mBAAiD;QAC3D,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,CAAC,mBAAmB,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAC9D,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,WAAW,CAAC,CAC9C,CAAC;IACJ,CAAC;;AArBH,kDAsBC;AArBQ,gCAAY,GAAG,sBAAsB,CAAC;AACtC,wCAAoB,GAAG,qBAAqB,CAAC;AACpD,6BAA6B;AACtB,0BAAM,GAA+B;IAC1C,GAAG,4BAAmB;IACtB,WAAW;IACX,aAAa;IACb,YAAY;IACZ,cAAc;CACf,CAAC"}

package/src/lib/modules/tracker/helpers/form.helper.d.ts ADDED Viewed

@@ -0,0 +1,17 @@
+/**
+ * Parses a coordinate value into a [longitude, latitude] pair of strings.
+ *
+ * Supported string inputs:
+ *  - "[39.319364,-6.069623]"   // JSON-style
+ *  - "39.319364,-6.069623"     // comma-separated
+ *  - "39.319364 -6.069623"     // space-separated
+ *
+ * Returns:
+ *  - ["39.319364", "-6.069623"] when valid (lon, lat as strings)
+ *  - null when input is invalid or not recognized
+ *
+ * Notes:
+ *  - Follows GeoJSON convention: [longitude, latitude]
+ *  - Valid ranges: lon ∈ [-180, 180], lat ∈ [-90, 90]
+ */
+export declare function parseCoordinates(value?: string | null): string[] | null;

package/src/lib/modules/tracker/helpers/form.helper.js ADDED Viewed

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCoordinates = parseCoordinates;
+/**
+ * Parses a coordinate value into a [longitude, latitude] pair of strings.
+ *
+ * Supported string inputs:
+ *  - "[39.319364,-6.069623]"   // JSON-style
+ *  - "39.319364,-6.069623"     // comma-separated
+ *  - "39.319364 -6.069623"     // space-separated
+ *
+ * Returns:
+ *  - ["39.319364", "-6.069623"] when valid (lon, lat as strings)
+ *  - null when input is invalid or not recognized
+ *
+ * Notes:
+ *  - Follows GeoJSON convention: [longitude, latitude]
+ *  - Valid ranges: lon ∈ [-180, 180], lat ∈ [-90, 90]
+ */
+function parseCoordinates(value) {
+    if (!value)
+        return null;
+    const trimmed = value.trim();
+    if (!trimmed)
+        return null;
+    const validateAndNormalizePair = (parts) => {
+        if (parts.length !== 2)
+            return null;
+        const lonText = parts[0].trim();
+        const latText = parts[1].trim();
+        if (!lonText || !latText)
+            return null;
+        const lonNum = Number(lonText);
+        const latNum = Number(latText);
+        if (!Number.isFinite(lonNum) || !Number.isFinite(latNum)) {
+            return null;
+        }
+        const isLonValid = lonNum >= -180 && lonNum <= 180;
+        const isLatValid = latNum >= -90 && latNum <= 90;
+        if (!isLonValid || !isLatValid) {
+            return null;
+        }
+        return [lonText, latText];
+    };
+    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+        const inner = trimmed.slice(1, -1);
+        const parts = inner.split(',');
+        const result = validateAndNormalizePair(parts);
+        if (result)
+            return result;
+    }
+    if (trimmed.includes(',')) {
+        const parts = trimmed.split(',');
+        const result = validateAndNormalizePair(parts);
+        if (result)
+            return result;
+    }
+    const spaceParts = trimmed.split(/\s+/);
+    const result = validateAndNormalizePair(spaceParts);
+    if (result)
+        return result;
+    return null;
+}
+//# sourceMappingURL=form.helper.js.map

package/src/lib/modules/tracker/helpers/form.helper.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"form.helper.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/helpers/form.helper.ts"],"names":[],"mappings":";;AAgBA,4CAiDC;AAjED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,gBAAgB,CAAC,KAAqB;IAClD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAExB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,MAAM,wBAAwB,GAAG,CAAC,KAAe,EAAmB,EAAE;QAClE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAEtC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAE/B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,IAAI,MAAM,IAAI,EAAE,CAAC;QAEjD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;IAC9B,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACpD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/src/lib/modules/tracker/models/enrollment.model.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ export interface IEnrollment {
     storedBy?: string;
     created?: string;
     orgUnit: string;
+    geometry?: any;
     createdAtClient?: string;
     program: string;
     trackedEntity: string;

package/src/lib/modules/tracker/models/enrollment.model.js CHANGED Viewed

@@ -109,6 +109,7 @@ class Enrollment extends base_model_1.BaseTrackerSDKModel {
             enrollment: this.enrollment,
             enrolledAt: this.enrolledAt,
             occurredAt: this.occurredAt,
+            geometry: this.geometry,
             status: this.status || 'ACTIVE',
             program: this.program,
             orgUnit: this === null || this === void 0 ? void 0 : this.orgUnit,

package/src/lib/modules/tracker/models/enrollment.model.js.map CHANGED Viewed

	@@ -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,6DAAyD;AACzD,6CAAmD;AAGnD,oCAAyC;~~AA4CzC~~,MAAa,UACX,SAAQ,gCAA+B;~~IAkCvC~~,YAAY,iBAAsC;QAChD,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,sBAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAClE,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAChE,CAAC,WAAW,EAAE,YAAY,EAAE,EAAE;YAC5B,uCACK,WAAW,KACd,CAAC,YAAY,CAAC,EAAE;oBACd,MAAM,EAAE,oBAAoB,CAAC,YAAY,CAAC;oBAC1C,QAAQ,EAAE,IAAI;iBACf,IACD;QACJ,CAAC,EACD,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;YAC7D,uCAAY,WAAW,KAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,iBAAiB,IAAG;QACpE,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC;IACrC,CAAC;IAED,mBAAmB,CACjB,YAAoB,EACpB,YAAmC;QAEnC,IAAI,KAAK,GAA4B,IAAI,CAAC,MAAM,CAAC,IAAI,CACnD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,YAAY,CAC/C,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAoB,CAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,sBAAS,CAAC,aAAa,CAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,YAAY;gBACZ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC,CAAC,CAAC;QACL,CAAC;QAED,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YAC1C,sCAAsC;YACtC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;YAE/C,KAAoB,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,eAAe,CAAC,OAAe,EAAE,OAAe;QAC9C,MAAM,KAAK,GAAG,sBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,MAAsB,EAAE,OAAO,CAAC,CAAC;QAE3E,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YAExB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC;gBACnC,KAAK;gBACL,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;aACrB,CAAC;QACpB,CAAC;IACH,CAAC;IAED,YAAY,CACV,WAAmB,EACnB,KAAa,EACb,YAAoB,EACpB,OAAgB;QAEhB,IAAI,KAAK,GAAG,OAAO;YACjB,CAAC,CAAC,sBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,MAAsB,EAAE,OAAO,CAAC;YAC9D,CAAC,CAAC,sBAAS,CAAC,eAAe,CAAC,IAAI,CAAC,MAAsB,EAAE,YAAY,CAAC,CAAC;QAEzE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,sBAAS,CAAC,aAAa,CAAC;gBAC9B,YAAY;gBACZ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO;gBACP,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAE3C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE9C,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC;YACnC,KAAK;YACL,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;SACrB,CAAC;IACpB,CAAC;IAED,QAAQ,CAAC,KAAkB;QACzB,MAAM,cAAc,GAA4B,IAAI,CAAC,MAAM,CAAC,IAAI,CAC9D,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAC/C,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAA6B,CAAC,CAAC;QAEtE,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,WAAW,CAAC,QAAa;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,uBAAuB,CAAC,YAAoB;;QAC1C,OAAO,IAAA,kBAAS,EACd,CAAA,MAAA,CAAC,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,0CAAE,MAAM,KAAI,EAAE,CAC5D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACd,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,KAAK,GAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACzC,OAAO,KAAK,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;YACtB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAiB,CAAC;YACnE,UAAU,EAAE,qBAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;SACpE,CAAC;IACJ,CAAC;CACF;AA3LD,gCA2LC"}
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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"}

package/src/lib/modules/tracker/models/tracked-entity-instance.model.d.ts CHANGED Viewed

@@ -37,7 +37,7 @@ export interface TrackedEntityInstanceObject {
 }
 interface TrackerFieldProperty {
     id: string;
-    type: 'ATTRIBUTE' | 'DATA_ELEMENT' | 'ENROLLMENT_DATE' | 'INCIDENT_DATE' | 'ORG_UNIT';
+    type: 'ATTRIBUTE' | 'DATA_ELEMENT' | 'ENROLLMENT_DATE' | 'INCIDENT_DATE' | 'ORG_UNIT' | 'GEOMETRY';
     generated?: boolean;
     pattern?: string;
     stageId?: string;
@@ -69,6 +69,7 @@ export interface ITrackedEntityInstance {
     setEnrollment?: (enrollment: IEnrollment) => void;
     setEnrollmentDate?: (enrollmentDate: string) => void;
     setIncidentDate?: (incidentDate: string) => void;
+    setEnrollmentGeometry?: (coordinateValue: string) => void;
     getEventByStage?: (programStage: string) => void;
     setEvent?: (event: IDHIS2Event) => void;
     setOrgUnit?: (orgUnit: string) => void;
@@ -105,6 +106,7 @@ export declare class TrackedEntityInstance extends BaseTrackerSDKModel<ITrackedE
     get dataEntities(): Record<string, any>;
     get reportEntities(): Record<string, string>;
     spreadAttributes?(attributes: any[]): void;
+    setEnrollmentGeometry(coordinateValue: string): void;
     setOrgUnit(orgUnit: string, updateTeiOrgUnit?: boolean): void;
     setAttributeValue(attribute: string, value: string, code?: string): void;
     getAttributeValue(attribute: string): string | undefined;

package/src/lib/modules/tracker/models/tracked-entity-instance.model.js CHANGED Viewed

@@ -8,6 +8,7 @@ const lodash_1 = require("lodash");
 const utils_1 = require("../utils");
 const base_model_1 = require("./base.model");
 const enrollment_model_1 = require("./enrollment.model");
+const form_helper_1 = require("../helpers/form.helper");
 const DEFAULT_FIELD_PROPERTIES = {
     enrollmentDate: {
         id: 'enrollmentDate',
@@ -21,6 +22,10 @@ const DEFAULT_FIELD_PROPERTIES = {
         id: 'orgUnit',
         type: 'ORG_UNIT',
     },
+    geometry: {
+        id: 'geometry',
+        type: 'GEOMETRY',
+    },
 };
 class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
     constructor(trackedEntityInstanceObject, config) {
@@ -68,6 +73,22 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
             }
         });
     }
+    setEnrollmentGeometry(coordinateValue) {
+        if (!this.latestEnrollment) {
+            return;
+        }
+        const parsed = (0, form_helper_1.parseCoordinates)(coordinateValue);
+        if (!parsed) {
+            return;
+        }
+        const [lonText, latText] = parsed;
+        const longitude = Number(lonText);
+        const latitude = Number(latText);
+        this.latestEnrollment.geometry = {
+            type: 'Point',
+            coordinates: [longitude, latitude],
+        };
+    }
     setOrgUnit(orgUnit, updateTeiOrgUnit) {
         if (!this.orgUnit || updateTeiOrgUnit) {
             this.orgUnit = orgUnit;
@@ -193,42 +214,156 @@ class TrackedEntityInstance extends base_model_1.BaseTrackerSDKModel {
             .filter((relatedEntity) => relatedEntity.relationshipType === relationshipType)
             .map((relatedEntity) => relatedEntity.trackedEntityInstance);
     }
+    // updateDataValues(
+    //   dataValueEntities: Record<string, unknown>,
+    //   updateTeiOrgUnit?: boolean
+    // ) {
+    //   const dataValueKeys = Object.keys(dataValueEntities);
+    //   dataValueKeys.forEach((key) => {
+    //     const dataValue = dataValueEntities[key] as string;
+    //     const field = (this.fields || {})[key];
+    //     switch (field?.type) {
+    //       case 'ATTRIBUTE': {
+    //         this.setAttributeValue(field.id, dataValue);
+    //         break;
+    //       }
+    //       case 'DATA_ELEMENT': {
+    //         this.setDataValue(field.id, dataValue, field.stageId!);
+    //         break;
+    //       }
+    //       case 'ENROLLMENT_DATE':
+    //         this.setEnrollmentDate(dataValue);
+    //         break;
+    //       case 'INCIDENT_DATE':
+    //         this.setIncidentDate(dataValue);
+    //         break;
+    //       case 'ORG_UNIT':
+    //         this.setOrgUnit(dataValue, updateTeiOrgUnit);
+    //         break;
+    //       default: {
+    //         if (isArray(dataValue)) {
+    //           (dataValue as Record<string, unknown>[]).forEach((data) => {
+    //             this.updateDataValues(data);
+    //           });
+    //         } else if (isPlainObject(dataValue)) {
+    //           this.updateDataValues(
+    //             dataValue as unknown as Record<string, unknown>
+    //           );
+    //         }
+    //         break;
+    //       }
+    //     }
+    //   });
+    // }
+    // updateDataValues(
+    //   dataValueEntities: Record<string, unknown>,
+    //   updateTeiOrgUnit?: boolean
+    // ) {
+    //   const dataValueKeys = Object.keys(dataValueEntities);
+    //   dataValueKeys.forEach((key) => {
+    //     const dataValue = dataValueEntities[key] as string;
+    //     const field = (this.fields || {})[key];
+    //     switch (field?.type) {
+    //       case 'ATTRIBUTE': {
+    //         this.setAttributeValue(field.id, dataValue);
+    //         break;
+    //       }
+    //       case 'DATA_ELEMENT': {
+    //         this.setDataValue(
+    //           field.id,
+    //           dataValue,
+    //           field.stageId ? field.stageId : ''
+    //         );
+    //         break;
+    //       }
+    //       case 'ENROLLMENT_DATE':
+    //         this.setEnrollmentDate(dataValue);
+    //         break;
+    //       case 'INCIDENT_DATE':
+    //         this.setIncidentDate(dataValue);
+    //         break;
+    //       case 'ORG_UNIT':
+    //         this.setOrgUnit(dataValue, updateTeiOrgUnit);
+    //         break;
+    //       case 'GEOMETRY':
+    //         this.setEnrollmentGeometry(dataValue);
+    //         break;
+    //       default: {
+    //         if (isArray(dataValue)) {
+    //           (dataValue as Record<string, unknown>[]).forEach((nested) => {
+    //             this.updateDataValues(nested);
+    //           });
+    //         } else if (isPlainObject(dataValue)) {
+    //           this.updateDataValues(
+    //             dataValue as unknown as Record<string, unknown>
+    //           );
+    //         }
+    //         break;
+    //       }
+    //     }
+    //   });
+    // }
     updateDataValues(dataValueEntities, updateTeiOrgUnit) {
-        const dataValueKeys = Object.keys(dataValueEntities);
-        dataValueKeys.forEach((key) => {
-            const dataValue = dataValueEntities[key];
-            const field = (this.fields || {})[key];
-            switch (field === null || field === void 0 ? void 0 : field.type) {
-                case 'ATTRIBUTE': {
-                    this.setAttributeValue(field.id, dataValue);
-                    break;
-                }
-                case 'DATA_ELEMENT': {
-                    this.setDataValue(field.id, dataValue, field.stageId);
-                    break;
-                }
-                case 'ENROLLMENT_DATE':
-                    this.setEnrollmentDate(dataValue);
-                    break;
-                case 'INCIDENT_DATE':
-                    this.setIncidentDate(dataValue);
-                    break;
-                case 'ORG_UNIT':
-                    this.setOrgUnit(dataValue, updateTeiOrgUnit);
-                    break;
-                default: {
-                    if ((0, lodash_1.isArray)(dataValue)) {
-                        dataValue.forEach((data) => {
-                            this.updateDataValues(data);
-                        });
+        if (!dataValueEntities) {
+            return;
+        }
+        const fields = this.fields || {};
+        for (const key in dataValueEntities) {
+            if (!Object.prototype.hasOwnProperty.call(dataValueEntities, key)) {
+                continue;
+            }
+            const value = dataValueEntities[key];
+            const field = fields[key];
+            if (field && field.type) {
+                switch (field.type) {
+                    case 'ATTRIBUTE': {
+                        this.setAttributeValue(field.id, value);
+                        break;
+                    }
+                    case 'DATA_ELEMENT': {
+                        this.setDataValue(field.id, value, field.stageId || '');
+                        break;
                     }
-                    else if ((0, lodash_1.isPlainObject)(dataValue)) {
-                        this.updateDataValues(dataValue);
+                    case 'ENROLLMENT_DATE': {
+                        this.setEnrollmentDate(value);
+                        break;
                     }
-                    break;
+                    case 'INCIDENT_DATE': {
+                        this.setIncidentDate(value);
+                        break;
+                    }
+                    case 'ORG_UNIT': {
+                        this.setOrgUnit(value, updateTeiOrgUnit);
+                        break;
+                    }
+                    case 'GEOMETRY': {
+                        this.setEnrollmentGeometry(value);
+                        break;
+                    }
+                    default: {
+                        break;
+                    }
+                }
+                if (field.type === 'ATTRIBUTE' ||
+                    field.type === 'DATA_ELEMENT' ||
+                    field.type === 'ENROLLMENT_DATE' ||
+                    field.type === 'INCIDENT_DATE' ||
+                    field.type === 'ORG_UNIT' ||
+                    field.type === 'GEOMETRY') {
+                    continue;
                 }
             }
-        });
+            if (value && typeof value === 'object') {
+                if ((0, lodash_1.isArray)(value)) {
+                    value.forEach((nested) => {
+                        this.updateDataValues(nested, updateTeiOrgUnit);
+                    });
+                }
+                else if ((0, lodash_1.isPlainObject)(value)) {
+                    this.updateDataValues(value, updateTeiOrgUnit);
+                }
+            }
+        }
     }
     setDataValue(dataElement, value, programStage, eventId) {
         if (this.latestEnrollment) {

package/src/lib/modules/tracker/models/tracked-entity-instance.model.js.map CHANGED Viewed

	@@ -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":"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"}
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":"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"}

package/src/lib/modules/tracker/models/tracker-url-generator.model.js CHANGED Viewed

@@ -8,7 +8,7 @@ const shared_1 = require("../../../shared");
 const DEFAULT_FIELDS = 'createdAt,updatedAt,trackedEntity,trackedEntityType,orgUnit,orgUnitName,attributes[attribute,code,valueType,value],enrollments[enrollment,enrolledAt,occurredAt,program,status,orgUnit,storedBy,attributes[attribute,code,valueType,value],events[event,occurredAt,dueDate,scheduledAt,status,programStage,program,trackedEntity,enrollment,orgUnit,orgUnitName,assignedUser,storedBy,dataValues[dataElement,value]]],relationships[relationship,relationshipType,from[trackedEntity[trackedEntity]],to[trackedEntity[trackedEntity]]';
 class TrackerUrlGenerator extends shared_1.DataUrlGenerator {
     constructor(params) {
-        var _a;
+        var _a, _b;
         super(params);
         this.baseEndpoint = 'tracker/trackedEntities';
         this.trackedEntityType = params.trackedEntityType;
@@ -17,6 +17,7 @@ class TrackerUrlGenerator extends shared_1.DataUrlGenerator {
         this.preferList = params.preferList;
         this.enrollmentStatus = params.enrollmentStatus;
         this.config = params.config;
+        this.baseEndpoint = (_b = params.baseEndpoint) !== null && _b !== void 0 ? _b : this.baseEndpoint;
     }
     generate() {
         return this.addPager(this.addOrder(this.addEnrollmentStatus(this.addEnrollmentDates(this.addFields(this.addOrgUnit(this.addFilters(this.addTrackedEntityType(this.addProgram(this.addTrackedEntity(`${this.baseEndpoint}`))))))))));

package/src/lib/modules/tracker/models/tracker-url-generator.model.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tracker-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracker-url-generator.model.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,qDAAqD;AACrD,iDAAiD;;;AAEjD,4CAAqE;AAGrE,MAAM,cAAc,GAClB,ugBAAugB,CAAC;AAE1gB,MAAa,mBAAoB,SAAQ,yBAAqC;IAQ5E,YAAY,MAAoC;;QAC9C,KAAK,CAAC,MAAM,CAAC,CAAC;QARhB,iBAAY,GAAG,yBAAyB,CAAC;QASvC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,cAAc,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;~~IAC9B~~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~~AApHD~~,~~kDAoHC~~"}
1	+ {"version":3,"file":"tracker-url-generator.model.js","sourceRoot":"","sources":["../../../../../../../../packages/dhis2-web-sdk/src/lib/modules/tracker/models/tracker-url-generator.model.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/user/user.module.js CHANGED Viewed

@@ -14,7 +14,7 @@ class UserModule {
     currentUser() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const [userResponse, authorityResponse] = yield Promise.all([
-                this.httpClient.get('me?fields=id,name,displayName,created,' +
+                this.httpClient.get('me?fields=id,name,firstName,surname,username,gender,phoneNumber,email,displayName,created,' +
                     'lastUpdated,email,dataViewOrganisationUnits[id,code,path,name,level],' +
                     'organisationUnits[id,code,path,name,level],userCredentials[username],userGroups[id,name]'),
                 this.httpClient.get(`me/authorization`),

package/src/lib/modules/user/user.module.js.map CHANGED Viewed

	@@ -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~~,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"}
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,4FAA4F;oBAC1F,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"}