@iapps/ng-dhis2-ui 1.1.14 → 1.1.16

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -2043,7 +2043,7 @@ const FixedPeriodFilter = ({ allowedPeriodTypes, excludedPeriodTypes, currentPer
         React__default.createElement("div", { className: "leftSection" },
             React__default.createElement(SingleSelectField, { label: i18n.t('Period type'), onChange: ({ selected }) => onSelectPeriodType(selected), dense: true, selected: currentPeriodType, disabled: onlyAllowedTypeIsSelected, className: "filterElement", dataTest: `${dataTest}-period-type` }, (allowedPeriodTypes
                 ? getFixedPeriodsOptions().filter((option) => allowedPeriodTypes.some((type) => type === option.id))
-                : filterPeriodTypesById(getFixedPeriodsOptions(), excludedPeriodTypes)).map((option) => (React__default.createElement(SingleSelectOption, { key: option.id, value: option.id, label: option.name, dataTest: `${dataTest}-period-type-option-${option.id}` }))))),
+                : filterPeriodTypesById(getFixedPeriodsOptions(), excludedPeriodTypes)).map((option) => (React__default.createElement(SingleSelectOption, { key: crypto.randomUUID() || option.id, value: option.id, label: option.name, dataTest: `${dataTest}-period-type-option-${option.id}` }))))),
         React__default.createElement("div", { className: "rightSection" },
             React__default.createElement(InputField$1, { label: i18n.t('Year'), className: "filterElement", type: "number", placeholder: i18n.t('Select year'), value: currentYear, onChange: ({ value }) => onSelectYear(value), dense: true, dataTest: `${dataTest}-year` })),
         React__default.createElement("style", { jsx: true }, `
@@ -2074,7 +2074,7 @@ FixedPeriodFilter.propTypes = {
 };
 
 const RelativePeriodFilter = ({ currentFilter, onSelectFilter, dataTest, excludedPeriodTypes, }) => (React__default.createElement("div", { className: "leftSection" },
-    React__default.createElement(SingleSelectField, { label: i18n.t('Period type'), onChange: ({ selected }) => onSelectFilter(selected), dense: true, selected: currentFilter, className: "filterElement", dataTest: dataTest }, filterPeriodTypesById(getRelativePeriodsOptions(), excludedPeriodTypes).map((option) => (React__default.createElement(SingleSelectOption, { key: option.id, value: option.id, label: option.name, dataTest: `${dataTest}-option-${option.id}` })))),
+    React__default.createElement(SingleSelectField, { label: i18n.t('Period type'), onChange: ({ selected }) => onSelectFilter(selected), dense: true, selected: currentFilter, className: "filterElement", dataTest: dataTest }, filterPeriodTypesById(getRelativePeriodsOptions(), excludedPeriodTypes).map((option) => (React__default.createElement(SingleSelectOption, { key: crypto.randomUUID() || option.id, value: option.id, label: option.name, dataTest: `${dataTest}-option-${option.id}` })))),
     React__default.createElement("style", { jsx: true }, `
       .leftSection {
         flex-grow: 1;
@@ -3097,9 +3097,36 @@ const matchesCondition = (eventValue, operator, filterValue) => {
             return false;
     }
 };
-const getFilteredTrackedEntityInstances = (trackedEntityInstance, filters) => {
-    return trackedEntityInstance.filter((trackedEntityInstance) => trackedEntityInstance.enrollments.some((enrollment) => enrollment.events.some((event) => filters.every((filter) => event.programStage === filter.programStage &&
-        event.dataValues.some((dataValue) => dataValue.dataElement === filter.dataElement &&
+// export const getFilteredTrackedEntityInstances = (
+//   trackedEntityInstance: TrackedEntityInstance[],
+//   filters: FilterConfig[]
+// ): TrackedEntityInstance[] => {
+//   return trackedEntityInstance.filter(
+//       (trackedEntityInstance: TrackedEntityInstance) =>
+//           trackedEntityInstance.enrollments.some((enrollment) =>
+//               enrollment.events.some((event) =>
+//                   filters.every(
+//                       (filter) =>
+//                           event.programStage === filter.programStage &&
+//                           event.dataValues.some(
+//                               (dataValue) =>
+//                                   dataValue.dataElement === filter.dataElement &&
+//                                   matchesCondition(
+//                                       dataValue.value,
+//                                       filter.operator,
+//                                       filter.value
+//                                   )
+//                           )
+//                   )
+//               )
+//           )
+//   );
+// };
+const getFilteredTrackedEntityInstances = (trackedEntityInstances, filters) => {
+    if (!filters.length)
+        return trackedEntityInstances;
+    return trackedEntityInstances.filter((tei) => filters.every((filter) => tei.enrollments?.some((enrollment) => enrollment.events?.some((event) => event.programStage === filter.programStage &&
+        event.dataValues?.some((dataValue) => dataValue.dataElement === filter.dataElement &&
             matchesCondition(dataValue.value, filter.operator, filter.value))))));
 };
 
@@ -4781,7 +4808,7 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                             });
                             setValue(event.selected);
                             setTouched(true);
-                        } }, (this.field().options || []).map((option) => (React__default.createElement(SingleSelectOption, { key: option.key, label: option.label, value: option.value })))));
+                        } }, (this.field().options || []).map((option) => (React__default.createElement(SingleSelectOption, { key: crypto.randomUUID() || option.key, label: option.label, value: option.value })))));
                 case 'multi-dropdown':
                     return (React__default.createElement(MultiSelectField, { clearText: "Clear", clearable: true, empty: "No data found", filterable: (this.field().options || []).length > 5, filterPlaceholder: "Type to filter options", error: hasError, validationText: validationError, inputWidth: this.fieldConfig()?.inputWidth, label: this.label(), name: this.field().id, required: this.field().required, loadingText: "Loading options", noMatchText: "No options found", onChange: (event) => {
                             const selectedValue = (event.selected || []).join(',');
@@ -5662,12 +5689,12 @@ class SelectionFiltersComponent extends ReactWrapperModule {
                         display: 'grid',
                         gridTemplateColumns: 'repeat(4, 1fr)',
                         gap: '16px',
-                    } }, filters.programAttributesFilters.map((filter, index) => (React__default.createElement("div", { key: index, style: { gridColumn: getAttributeColumnSpan(index) } }, filter.hasOptions && filter.options.length > 0 ? (React__default.createElement(SingleSelectField, { className: "single-select", label: filter.name || 'Select Option', type: filter.valueType, selected: filter.value, onChange: (event) => handleAttributeChange(index, event.selected) }, filter.options.map((option, i) => (React__default.createElement(SingleSelectOption, { key: i, label: option.name, value: option.code }))))) : (React__default.createElement(InputField$1, { className: "input-field", label: filter.name || 'Program name', type: filter.valueType, value: filter.value, onChange: (event) => handleAttributeChange(index, event.value) })))))),
+                    } }, filters.programAttributesFilters.map((filter, index) => (React__default.createElement("div", { key: index, style: { gridColumn: getAttributeColumnSpan(index) } }, filter.hasOptions && filter.options.length > 0 ? (React__default.createElement(SingleSelectField, { className: "single-select", label: filter.name || 'Select Option', type: filter.valueType, selected: filter.value, onChange: (event) => handleAttributeChange(index, event.selected) }, filter.options.map((option, i) => (React__default.createElement(SingleSelectOption, { key: crypto.randomUUID() || i, label: option.name, value: option.code }))))) : (React__default.createElement(InputField$1, { className: "input-field", label: filter.name || 'Program name', type: filter.valueType, value: filter.value, onChange: (event) => handleAttributeChange(index, event.value) })))))),
                 React__default.createElement("div", { style: {
                         display: 'grid',
                         gridTemplateColumns: 'repeat(4, 1fr)',
                         gap: '16px',
-                    } }, filters.programStageDataElementFilters.map((filter, index) => (React__default.createElement("div", { key: index, style: { gridColumn: getDataElementColumnSpan(index) } }, filter.hasOptions && filter.options.length > 0 ? (React__default.createElement(SingleSelectField, { className: "single-select", label: filter.name || 'Aggregation type', type: filter.valueType, selected: filter.value, onChange: (event) => handleDataElementChange(index, event.selected) }, filter.options.map((option, i) => (React__default.createElement(SingleSelectOption, { key: i, label: option.name, value: option.code }))))) : (React__default.createElement(InputField$1, { className: "input-field", type: filter.valueType, label: filter.name || 'Program name', value: filter.value, onChange: (event) => handleDataElementChange(index, event.value) })))))),
+                    } }, filters.programStageDataElementFilters.map((filter, index) => (React__default.createElement("div", { key: index, style: { gridColumn: getDataElementColumnSpan(index) } }, filter.hasOptions && filter.options.length > 0 ? (React__default.createElement(SingleSelectField, { className: "single-select", label: filter.name || 'Aggregation type', type: filter.valueType, selected: filter.value, onChange: (event) => handleDataElementChange(index, event.selected) }, filter.options.map((option, i) => (React__default.createElement(SingleSelectOption, { key: crypto.randomUUID() || i, label: option.name, value: option.code }))))) : (React__default.createElement(InputField$1, { className: "input-field", type: filter.valueType, label: filter.name || 'Program name', value: filter.value, onChange: (event) => handleDataElementChange(index, event.value) })))))),
                 React__default.createElement("div", { style: { textAlign: 'right', marginTop: '16px' } },
                     React__default.createElement(Button$1, { onClick: handleSearch }, "Search"))));
         };
@@ -5763,26 +5790,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
 class TrackerFormComponent {
     constructor() {
         this.program = input.required();
+        this.trackedEntity = input();
         this.d2 = window.d2Web;
     }
     async ngOnInit() {
         this.trackerQuery = this.d2.trackerModule.trackedEntity.setProgram(this.program());
         const program = await this.trackerQuery.getMetaData();
-        const instance = await this.trackerQuery.create();
+        this.instance = this.trackedEntity()
+            ? (await this.trackerQuery
+                .setTrackedEntity(this.trackedEntity())
+                .get()).data || (await this.trackerQuery.create())
+            : await this.trackerQuery.create();
         if (program) {
             this.formMetaData = new FormMetaData({
                 programs: [program],
             }).toJson();
+            console.log(this.formMetaData, this.instance.enrollmentDate);
         }
     }
     onSave(event) { }
     onCancel() { }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: TrackerFormComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.8", type: TrackerFormComponent, isStandalone: false, selector: "ng-dhis2-ui-tracker-form", inputs: { program: { classPropertyName: "program", publicName: "program", isSignal: true, isRequired: true, transformFunction: null } }, ngImport: i0, template: "@if(formMetaData) {\n<ng-dhis2-ui-section-form\n  [formMetaData]=\"formMetaData\"\n  [dataValueEntities]=\"{}\"\n  (save)=\"onSave($event)\"\n  (cancel)=\"onCancel()\"\n/>\n}\n", dependencies: [{ kind: "component", type: SectionFormComponent, selector: "ng-dhis2-ui-section-form", inputs: ["loading", "formMetaData", "dataValueEntities"], outputs: ["save", "formUpdate", "cancel"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.8", type: TrackerFormComponent, isStandalone: false, selector: "ng-dhis2-ui-tracker-form", inputs: { program: { classPropertyName: "program", publicName: "program", isSignal: true, isRequired: true, transformFunction: null }, trackedEntity: { classPropertyName: "trackedEntity", publicName: "trackedEntity", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "@if(formMetaData) {\n<ng-dhis2-ui-section-form\n  [formMetaData]=\"formMetaData\"\n  [dataValueEntities]=\"instance\"\n  (save)=\"onSave($event)\"\n  (cancel)=\"onCancel()\"\n/>\n}\n", dependencies: [{ kind: "component", type: SectionFormComponent, selector: "ng-dhis2-ui-section-form", inputs: ["loading", "formMetaData", "dataValueEntities"], outputs: ["save", "formUpdate", "cancel"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: TrackerFormComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'ng-dhis2-ui-tracker-form', standalone: false, template: "@if(formMetaData) {\n<ng-dhis2-ui-section-form\n  [formMetaData]=\"formMetaData\"\n  [dataValueEntities]=\"{}\"\n  (save)=\"onSave($event)\"\n  (cancel)=\"onCancel()\"\n/>\n}\n" }]
+            args: [{ selector: 'ng-dhis2-ui-tracker-form', standalone: false, template: "@if(formMetaData) {\n<ng-dhis2-ui-section-form\n  [formMetaData]=\"formMetaData\"\n  [dataValueEntities]=\"instance\"\n  (save)=\"onSave($event)\"\n  (cancel)=\"onCancel()\"\n/>\n}\n" }]
         }] });
 
 class TrackerFormModule {