@iapps/ng-dhis2-ui 1.1.8 → 1.1.10

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

@@ -5400,8 +5400,8 @@ class SelectionFiltersComponent extends ReactWrapperModule {
     constructor() {
         super(...arguments);
         this.actionOptions = [];
-        this.attributeFilters = [];
-        this.dataElementFilters = [];
+        this.programAttributesFilters = [];
+        this.programStageDataElementFilters = [];
         this.actionSelected = new EventEmitter();
         this.httpClient = inject(NgxDhis2HttpClientService);
         this.ngZone = inject(NgZone);
@@ -5446,11 +5446,12 @@ class SelectionFiltersComponent extends ReactWrapperModule {
         this.selectedOrgUnit$ = toObservable(this.selectedOrgUnit);
         this.SelectionFiltersUI = () => {
             const [filters, setFilters] = useState({
-                attributeFilters: this.attributeFilters || [],
-                dataElementFilters: this.dataElementFilters || [],
-                organizationUnitId: '',
+                programAttributesFilters: this.programAttributesFilters || [],
+                programStageDataElementFilters: this.programStageDataElementFilters || [],
                 startDate: this.startDate || '',
                 endDate: this.endDate || '',
+                program: this.program || '',
+                organisationUnit: this.organisationUnit || '',
             });
             const [displayValue, setDisplayValue] = useState(null);
             const [selected, setSelected] = useState();
@@ -5460,49 +5461,53 @@ class SelectionFiltersComponent extends ReactWrapperModule {
             const [value, setValue] = useState(null);
             useEffect(() => {
                 setFilters({
-                    attributeFilters: this.attributeFilters,
-                    dataElementFilters: this.dataElementFilters,
-                    organizationUnitId: '',
+                    programAttributesFilters: this.programAttributesFilters,
+                    programStageDataElementFilters: this.programStageDataElementFilters,
                     startDate: this.startDate || '',
                     endDate: this.endDate || '',
+                    program: this.program || '',
+                    organisationUnit: this.organisationUnit || filters.organisationUnit,
                 });
             }, [
-                this.attributeFilters,
-                this.dataElementFilters,
+                this.programAttributesFilters,
+                this.programStageDataElementFilters,
                 this.startDate,
                 this.endDate,
             ]);
             const handleAttributeChange = (index, selectedValue) => {
                 setFilters((prevFilters) => {
-                    const updatedFilters = [...prevFilters.attributeFilters];
+                    const updatedFilters = [...prevFilters.programAttributesFilters];
                     updatedFilters[index] = {
                         ...updatedFilters[index],
                         value: selectedValue,
                     };
-                    return { ...prevFilters, attributeFilters: updatedFilters };
+                    return { ...prevFilters, programAttributesFilters: updatedFilters };
                 });
             };
             const handleDataElementChange = (index, selectedValue) => {
                 setFilters((prevFilters) => {
-                    const updatedFilters = [...prevFilters.dataElementFilters];
+                    const updatedFilters = [...prevFilters.programStageDataElementFilters];
                     updatedFilters[index] = {
                         ...updatedFilters[index],
                         value: selectedValue,
                     };
-                    return { ...prevFilters, dataElementFilters: updatedFilters };
+                    return {
+                        ...prevFilters,
+                        programStageDataElementFilters: updatedFilters,
+                    };
                 });
             };
             const handleSearch = () => {
                 this.actionSelected.emit({
                     ...filters,
-                    organizationUnit: selectedOrganisationUnit,
-                    organizationUnitId: selectedOrganisationUnit,
+                    organisationUnit: selectedOrganisationUnit,
                     startDate: filters.startDate,
                     endDate: filters.endDate,
+                    program: this.program,
                 });
             };
             const getAttributeColumnSpan = (index) => {
-                const totalItems = filters.attributeFilters.length;
+                const totalItems = filters.programAttributesFilters.length;
                 if (totalItems <= 4) {
                     if (totalItems === 1) {
                         return 'span 4';
@@ -5532,7 +5537,7 @@ class SelectionFiltersComponent extends ReactWrapperModule {
                 return 'span 1';
             };
             const getDataElementColumnSpan = (index) => {
-                const totalItems = filters.dataElementFilters.length;
+                const totalItems = filters.programStageDataElementFilters.length;
                 if (totalItems <= 4) {
                     if (totalItems === 1) {
                         return 'span 4';
@@ -5605,18 +5610,18 @@ class SelectionFiltersComponent extends ReactWrapperModule {
                                     // });
                                 }
                             } }))),
-                    React__default.createElement(InputField$1, { className: "input-field", label: "Start Date", type: "date", value: filters.startDate, onChange: (event) => setFilters({ ...filters, startDate: event.value }) }),
-                    React__default.createElement(InputField$1, { className: "input-field", label: "End Date", type: "date", value: filters.endDate, onChange: (event) => setFilters({ ...filters, endDate: event.value }) })),
+                    React__default.createElement(InputField$1, { className: "input-field", label: "Start Date", type: "DATE", value: filters.startDate, onChange: (event) => setFilters({ ...filters, startDate: event.value }) }),
+                    React__default.createElement(InputField$1, { className: "input-field", label: "End Date", type: "DATE", value: filters.endDate, onChange: (event) => setFilters({ ...filters, endDate: event.value }) })),
                 React__default.createElement("div", { style: {
                         display: 'grid',
                         gridTemplateColumns: 'repeat(4, 1fr)',
                         gap: '16px',
-                    } }, filters.attributeFilters.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', 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.id }))))) : (React__default.createElement(InputField$1, { className: "input-field", label: filter.name || 'Program name', 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: 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.dataElementFilters.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', 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.id }))))) : (React__default.createElement(InputField$1, { className: "input-field", 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: 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"))));
         };
@@ -5672,21 +5677,25 @@ class SelectionFiltersComponent extends ReactWrapperModule {
         this.render();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: SelectionFiltersComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.8", type: SelectionFiltersComponent, isStandalone: false, selector: "app-selection-filters-ui", inputs: { actionOptions: "actionOptions", attributeFilters: "attributeFilters", dataElementFilters: "dataElementFilters", startDate: "startDate", endDate: "endDate" }, outputs: { actionSelected: "actionSelected" }, usesInheritance: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: [".react-filters-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:20px;margin-bottom:20px}.input-field,.single-select{width:100%}\n"] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.8", type: SelectionFiltersComponent, isStandalone: false, selector: "app-selection-filters-ui", inputs: { actionOptions: "actionOptions", programAttributesFilters: "programAttributesFilters", programStageDataElementFilters: "programStageDataElementFilters", startDate: "startDate", endDate: "endDate", program: "program", organisationUnit: "organisationUnit" }, outputs: { actionSelected: "actionSelected" }, usesInheritance: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: [".react-filters-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:20px;margin-bottom:20px}.input-field,.single-select{width:100%}\n"] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: SelectionFiltersComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-selection-filters-ui', template: '<ng-content></ng-content>', standalone: false, styles: [".react-filters-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:20px;margin-bottom:20px}.input-field,.single-select{width:100%}\n"] }]
         }], propDecorators: { actionOptions: [{
                 type: Input
-            }], attributeFilters: [{
+            }], programAttributesFilters: [{
                 type: Input
-            }], dataElementFilters: [{
+            }], programStageDataElementFilters: [{
                 type: Input
             }], startDate: [{
                 type: Input
             }], endDate: [{
                 type: Input
+            }], program: [{
+                type: Input
+            }], organisationUnit: [{
+                type: Input
             }], actionSelected: [{
                 type: Output
             }] } });