@iapps/ng-dhis2-ui 1.1.70 → 1.1.72

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): "text" | "email" | "number" | "tel" | "date" | "org-unit" | "file";
+    static getFieldType(valueType: string): "text" | "tel" | "email" | "date" | "number" | "org-unit" | "file";
     static getFieldControlType(valueType: string, hasOptions: boolean): FieldControlType;
     static getOptionEntities?(options: any[]): any;
 }

package/lib/modules/line-list/models/line-list.models.d.ts

@@ -86,11 +86,7 @@ export interface Enrollment {
 }
 export interface TrackedEntityInstance {
     trackedEntityInstance: string;
-    attributes: {
-        attribute: string;
-        value: string;
-        displayName?: string;
-    }[];
+    attributes: Attribute[];
     enrollments: Enrollment[];
     trackedEntity: string;
     trackedEntityType: string;
@@ -183,6 +179,7 @@ export interface ProgramMetadata {
         name: string;
     }[];
     programTrackedEntityAttributes: ProgramTrackedEntityAttribute[];
+    orgUnitLabel: string;
 }
 export interface LineListResponse {
     metadata: ProgramMetadata;
@@ -239,7 +236,7 @@ export interface ProgramTrackedEntityAttribute {
         external: boolean;
         users: any;
     };
-    sortOrder: number;
+    sortOrder: string;
     trackedEntityAttribute: TrackedEntityAttribute;
     translations: any[];
     userAccesses: any[];

package/lib/modules/line-list/services/line-list.service.d.ts

@@ -2,6 +2,7 @@ import { NgxDhis2HttpClientService } from '@iapps/ngx-dhis2-http-client';
 import { Observable } from 'rxjs';
 import { LineListResponse } from '../models/line-list.models';
 import { AttributeFilter } from '../models/attribute-filter.model';
+import { FilterConfig } from '../models/filter-config.model';
 import * as i0 from "@angular/core";
 export declare class LineListService {
     private httpClient;
@@ -14,7 +15,7 @@ export declare class LineListService {
     private fetchOrgUnits;
     private getEvents;
     private getEventsByProgramStage;
-    getLineListData(programId: string, orgUnit?: string, programStageId?: string, page?: number, pageSize?: number, filters?: AttributeFilter[], startDate?: string, endDate?: string, ouMode?: string, filterRootOrgUnit?: boolean, useOuModeWithOlderDHIS2Instance?: boolean): Observable<LineListResponse>;
+    getLineListData(programId: string, orgUnit?: string, programStageId?: string, page?: number, pageSize?: number, filters?: AttributeFilter[], startDate?: string, endDate?: string, ouMode?: string, filterRootOrgUnit?: boolean, useOuModeWithOlderDHIS2Instance?: boolean, filtersFromEvents?: FilterConfig[]): Observable<LineListResponse>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LineListService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LineListService>;
 }

package/lib/modules/line-list/utils/filter-builder.d.ts

@@ -2,5 +2,6 @@ import { AttributeFilter } from '../models/attribute-filter.model';
 import { FilterConfig } from '../models/filter-config.model';
 import { TrackedEntity, TrackedEntityInstance } from '../models/line-list.models';
 export declare function buildFilters(filters: AttributeFilter[]): string;
+export declare function buildFiltersFromEvents(filters: FilterConfig[]): string;
 export declare const getFilteredTrackedEntityInstances: (trackedEntityInstances: TrackedEntityInstance[], filters: FilterConfig[]) => TrackedEntityInstance[];
 export declare const getFilteredTrackedEntites: (trackedEntities: TrackedEntity[], filters: FilterConfig[]) => TrackedEntity[];

package/lib/modules/line-list/utils/line-list-utils.d.ts

@@ -8,6 +8,7 @@ export declare const getTrackedEntityData: (response: LineListResponse, programI
     columns: ColumnDefinition[];
     data: TableRow[];
     filteredEntityColumns: ColumnDefinition[];
+    orgUnitLabel: string;
 };
 export declare const getEventData: (response: LineListResponse, pager: any, isOptionSetNameVisible: boolean) => {
     columns: ColumnDefinition[];

package/package.json

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