@iapps/ng-dhis2-ui 1.1.8 → 1.1.10

package/lib/modules/form/utils/field-type.util.d.ts

@@ -1,3 +1,3 @@
 export declare class FormFieldTypeUtil {
-    static getFieldType(valueType: string): "image" | "org-unit" | "file" | "number" | "text";
+    static getFieldType(valueType: string): "number" | "image" | "org-unit" | "file" | "text";
 }

package/lib/modules/form/utils/field.util.d.ts

@@ -3,7 +3,7 @@ import { DropdownOption } from '../models';
 export declare class FieldUtil {
     static getFieldDropdownOptions(field: any): DropdownOption[];
     static sanitizeOptions(options: any[]): any;
-    static getFieldType(valueType: string): "date" | "org-unit" | "file" | "number" | "tel" | "text";
+    static getFieldType(valueType: string): "number" | "date" | "org-unit" | "file" | "tel" | "text";
     static getFieldControlType(valueType: string, hasOptions: boolean): FieldControlType;
     static getOptionEntities?(options: any[]): any;
 }

package/lib/modules/selection-filters-ui/containers/selection-filters-ui/selection-filters-ui.component.d.ts

@@ -1,8 +1,7 @@
 import { AfterViewInit, EventEmitter, NgZone } from '@angular/core';
 import React from 'react';
 import { ReactWrapperModule } from '../../../react-wrapper/react-wrapper.component';
-import { AttributeFilter, DataElementFilter, SelectionFiltersProps } from '../../models/selection-filters-ui.model';
-import { TableRow } from '../../models/selection-filters-ui.models';
+import { ProgramAttributesFilter, ProgramStageDataElementFilter, SelectionFiltersProps, TableRow } from '../../models/selection-filters-ui.model';
 import { Observable } from 'rxjs';
 import { NgxDhis2HttpClientService } from '@iapps/ngx-dhis2-http-client';
 import { OrganisationUnitSelectionConfig } from '../../../organisation-unit-selector';
@@ -12,10 +11,12 @@ export declare class SelectionFiltersComponent extends ReactWrapperModule implem
         label: string;
         onClick: (row: TableRow) => void;
     }[];
-    attributeFilters: AttributeFilter[];
-    dataElementFilters: DataElementFilter[];
+    programAttributesFilters: ProgramAttributesFilter[];
+    programStageDataElementFilters: ProgramStageDataElementFilter[];
     startDate?: string;
     endDate?: string;
+    program?: string;
+    organisationUnit?: string;
     actionSelected: EventEmitter<SelectionFiltersProps>;
     httpClient: NgxDhis2HttpClientService;
     ngZone: NgZone;
@@ -36,5 +37,5 @@ export declare class SelectionFiltersComponent extends ReactWrapperModule implem
     SelectionFiltersUI: () => React.JSX.Element;
     ngAfterViewInit(): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<SelectionFiltersComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SelectionFiltersComponent, "app-selection-filters-ui", never, { "actionOptions": { "alias": "actionOptions"; "required": false; }; "attributeFilters": { "alias": "attributeFilters"; "required": false; }; "dataElementFilters": { "alias": "dataElementFilters"; "required": false; }; "startDate": { "alias": "startDate"; "required": false; }; "endDate": { "alias": "endDate"; "required": false; }; }, { "actionSelected": "actionSelected"; }, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SelectionFiltersComponent, "app-selection-filters-ui", never, { "actionOptions": { "alias": "actionOptions"; "required": false; }; "programAttributesFilters": { "alias": "programAttributesFilters"; "required": false; }; "programStageDataElementFilters": { "alias": "programStageDataElementFilters"; "required": false; }; "startDate": { "alias": "startDate"; "required": false; }; "endDate": { "alias": "endDate"; "required": false; }; "program": { "alias": "program"; "required": false; }; "organisationUnit": { "alias": "organisationUnit"; "required": false; }; }, { "actionSelected": "actionSelected"; }, never, ["*"], false, never>;
 }

package/lib/modules/selection-filters-ui/models/selection-filters-ui.model.d.ts

@@ -1,7 +1,7 @@
 export interface SelectionFiltersProps {
     actionOptions: ActionOption[];
-    attributeFilters: AttributeFilter[];
-    dataElementFilters: DataElementFilter[];
+    programAttributesFilters: ProgramAttributesFilter[];
+    programStageDataElementFilters: ProgramStageDataElementFilter[];
     startDate: string;
     endDate: string;
 }
@@ -9,28 +9,44 @@ export interface ActionOption {
     label: string;
     onClick: () => void;
 }
-export interface DataElementFilter {
-    programStage: string;
-    dataElement: string;
-    name: string;
-    valueType: string;
-    hasOptions: boolean;
-    operator: string;
-    value: string;
-    options: Option[];
-}
 export interface Option {
     id: string;
     code: string;
     name: string;
 }
-export interface AttributeFilter {
+export interface ProgramAttributesFilter {
     attribute: string;
+    program: string;
     operator: string;
+    valueType?: string;
     name: string;
-    valueType: string;
     hasOptions: boolean;
+    shortName: string;
+    formName: string;
     code: string;
     value: string;
     options: Option[];
 }
+export interface ProgramStageDataElementFilter {
+    programStage: string;
+    program: string;
+    dataElement: string;
+    hasOptions: boolean;
+    valueType?: string;
+    name: string;
+    operator: string;
+    shortName: string;
+    formName: string;
+    value: string;
+    options: Option[];
+}
+export interface TableRow {
+    [key: string]: string | number;
+    index: number;
+}
+export interface ColumnDefinition {
+    column: string;
+    display: string;
+    index?: string;
+    visible?: boolean;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iapps/ng-dhis2-ui",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "peerDependencies": {
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",

package/lib/modules/selection-filters-ui/models/selection-filters-ui.models.d.ts

@@ -1,10 +0,0 @@
-export interface TableRow {
-    [key: string]: string | number;
-    index: number;
-}
-export interface ColumnDefinition {
-    column: string;
-    display: string;
-    index?: string;
-    visible?: boolean;
-}