@iapps/ng-dhis2-ui 1.1.80 → 1.2.1

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

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

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

package/lib/modules/line-list/components/orgUnitSelector.d.ts

@@ -0,0 +1,2 @@
+import React from "react";
+export declare const OrgUnitSelector: ({ hide, setHide, selectedOrgUnit, setSelectedOrgUnit, setOrgUnitState, }: any) => React.JSX.Element;

package/lib/modules/line-list/components/table/TableBody.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const TableBody: ({ data, columns, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, }: any) => React.JSX.Element;

package/lib/modules/line-list/components/table/filterToolbar.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const FilterToolbar: ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setOrgUnitState, defaultOrgUnit, setHide, startDateState, setStartDateState, endDateState, setEndDateState, visibleFilters, dateStates, inputValues, setInputValues, handleInputChange, handleInputChangeForSelectField, handleDateSelect, prevValue, setPrevValue, showAllFilters, setShowAllFilters, }: any) => React.JSX.Element;

package/lib/modules/line-list/components/table/lineListTable.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const LineListTable: ({ columns, data, pager, setPager, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, }: any) => React.JSX.Element;

package/lib/modules/line-list/components/table/pagination.d.ts

@@ -0,0 +1,8 @@
+import { Pager } from '@iapps/d2-web-sdk';
+import React from 'react';
+type PaginationProps = {
+    pager: Pager;
+    setPager: React.Dispatch<React.SetStateAction<Pager>>;
+};
+export declare const Pagination: ({ pager, setPager }: PaginationProps) => React.JSX.Element;
+export {};

package/lib/modules/line-list/components/table/tableCell.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const TableCell: ({ cell, getTextColorFromBackGround, }: {
+    cell: any;
+    getTextColorFromBackGround: (color: string) => string;
+}) => React.JSX.Element;

package/lib/modules/line-list/components/table/tableFooter.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const TableFooter: ({ pager, setPager, columns }: any) => React.JSX.Element;

package/lib/modules/line-list/components/table/tableHeader.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const TableHeader: ({ columns }: {
+    columns: any[];
+}) => React.JSX.Element;

package/lib/modules/line-list/components/table/tableRow.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const TableRow: ({ row, columns, getTextColorFromBackGround, actionOptions, actionOptionOrientation, actionSelected, }: any) => React.JSX.Element;

package/lib/modules/line-list/containers/line-list.component.d.ts

@@ -2,10 +2,9 @@ import { EventEmitter, SimpleChanges } from '@angular/core';
 import React from 'react';
 import { ReactWrapperModule } from '../../react-wrapper/react-wrapper.component';
 import { AttributeFilter } from '../models/attribute-filter.model';
-import { FilterConfig } from '../models/filter-config.model';
-import { TableRow } from '../models/line-list.models';
 import { LineListService } from '../services/line-list.service';
 import { ActionOptionOrientation, LineListActionOption } from '../models';
+import { DataQueryFilter, DHIS2Event, TrackedEntityInstance } from '@iapps/d2-web-sdk';
 import * as i0 from "@angular/core";
 export declare class LineListTableComponent extends ReactWrapperModule {
     programId: string;
@@ -17,30 +16,27 @@ export declare class LineListTableComponent extends ReactWrapperModule {
     useOuModeWithOlderDHIS2Instance?: boolean;
     startDate?: string;
     endDate?: string;
-    filters?: FilterConfig[];
+    dataQueryFilters?: DataQueryFilter[];
     ouMode?: string;
-    dispatchTeis: boolean;
+    isButtonLoading: boolean;
+    buttonFilter: string;
+    filterRootOrgUnit: boolean;
+    showFilters: boolean;
+    isOptionSetNameVisible: boolean;
     actionSelected: EventEmitter<{
         action: string;
-        row: TableRow;
+        data: TrackedEntityInstance | DHIS2Event;
     }>;
-    private reactStateUpdaters;
     approvalSelected: EventEmitter<{
         teiId: string;
         enrollmentId: string;
     }[]>;
-    isButtonLoading: boolean;
-    buttonLabel: string;
-    firstValue: EventEmitter<string>;
-    buttonFilter: string;
-    filterRootOrgUnit: boolean;
-    showFilters: boolean;
-    isOptionSetNameVisible: boolean;
+    private reactStateUpdaters;
     setReactStateUpdaters: (updaters: any) => void;
     ngOnChanges(changes: SimpleChanges): void;
     lineListService: LineListService;
     LineList: () => React.JSX.Element;
     ngAfterViewInit(): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LineListTableComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LineListTableComponent, "ng-dhis2-ui-line-list", never, { "programId": { "alias": "programId"; "required": false; }; "orgUnit": { "alias": "orgUnit"; "required": false; }; "programStageId": { "alias": "programStageId"; "required": false; }; "actionOptions": { "alias": "actionOptions"; "required": false; }; "actionOptionOrientation": { "alias": "actionOptionOrientation"; "required": false; }; "attributeFilters": { "alias": "attributeFilters"; "required": false; }; "useOuModeWithOlderDHIS2Instance": { "alias": "useOuModeWithOlderDHIS2Instance"; "required": false; }; "startDate": { "alias": "startDate"; "required": false; }; "endDate": { "alias": "endDate"; "required": false; }; "filters": { "alias": "filters"; "required": false; }; "ouMode": { "alias": "ouMode"; "required": false; }; "dispatchTeis": { "alias": "dispatchTeis"; "required": false; }; "isButtonLoading": { "alias": "isButtonLoading"; "required": false; }; "buttonLabel": { "alias": "buttonLabel"; "required": false; }; "buttonFilter": { "alias": "buttonFilter"; "required": false; }; "filterRootOrgUnit": { "alias": "filterRootOrgUnit"; "required": false; }; "showFilters": { "alias": "showFilters"; "required": false; }; "isOptionSetNameVisible": { "alias": "isOptionSetNameVisible"; "required": false; }; }, { "actionSelected": "actionSelected"; "approvalSelected": "approvalSelected"; "firstValue": "firstValue"; }, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LineListTableComponent, "ng-dhis2-ui-line-list", never, { "programId": { "alias": "programId"; "required": false; }; "orgUnit": { "alias": "orgUnit"; "required": false; }; "programStageId": { "alias": "programStageId"; "required": false; }; "actionOptions": { "alias": "actionOptions"; "required": false; }; "actionOptionOrientation": { "alias": "actionOptionOrientation"; "required": false; }; "attributeFilters": { "alias": "attributeFilters"; "required": false; }; "useOuModeWithOlderDHIS2Instance": { "alias": "useOuModeWithOlderDHIS2Instance"; "required": false; }; "startDate": { "alias": "startDate"; "required": false; }; "endDate": { "alias": "endDate"; "required": false; }; "dataQueryFilters": { "alias": "dataQueryFilters"; "required": false; }; "ouMode": { "alias": "ouMode"; "required": false; }; "isButtonLoading": { "alias": "isButtonLoading"; "required": false; }; "buttonFilter": { "alias": "buttonFilter"; "required": false; }; "filterRootOrgUnit": { "alias": "filterRootOrgUnit"; "required": false; }; "showFilters": { "alias": "showFilters"; "required": false; }; "isOptionSetNameVisible": { "alias": "isOptionSetNameVisible"; "required": false; }; }, { "actionSelected": "actionSelected"; "approvalSelected": "approvalSelected"; }, never, ["*"], false, never>;
 }

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

@@ -1,4 +1,5 @@
-export interface Pager {
+import { DHIS2Event, Pager, TrackedEntityInstance } from '@iapps/d2-web-sdk';
+export interface PagerObject {
     page: number;
     pageSize: number;
     total: number;
@@ -84,21 +85,6 @@ export interface Enrollment {
     events: Event[];
     attributes: Attribute[];
 }
-export interface TrackedEntityInstance {
-    trackedEntityInstance: string;
-    attributes: Attribute[];
-    enrollments: Enrollment[];
-    trackedEntity: string;
-    trackedEntityType: string;
-    createdAt: string;
-    createdAtClient: string;
-    updatedAt: string;
-    orgUnit: string;
-    inactive: boolean;
-    deleted: boolean;
-    potentialDuplicate: boolean;
-    programOwners: ProgramOwner[];
-}
 export interface TrackedEntity {
     attributes: Attribute[];
     enrollments: Enrollment[];
@@ -119,9 +105,10 @@ export interface ProgramOwner {
     program: string;
 }
 export interface TrackedEntityInstancesResponse {
-    trackedEntityInstances: TrackedEntityInstance[];
-    trackedEntity: TrackedEntity[];
+    trackedEntityInstances: TrackedEntityInstance | TrackedEntityInstance[];
+    trackedEntity?: TrackedEntity[];
     pager: Pager;
+    orgUnitsMap?: Map<string, string>;
 }
 export interface TrackedEntityResponse {
     trackedEntities: TrackedEntity[];
@@ -182,12 +169,17 @@ export interface ProgramMetadata {
     orgUnitLabel: string;
 }
 export interface LineListResponse {
-    metadata: ProgramMetadata;
-    data: EventsResponse | TrackedEntityInstancesResponse | EnrollmentsResponse | TrackedEntityResponse;
+    data: EventsResponse | TrackedEntityInstancesResponse | EnrollmentsResponse | TrackedEntityResponse | TrackedEntityInstance | TrackedEntityInstance[];
 }
 export interface TableRow {
-    [key: string]: string | number;
-    index: number;
+    [key: string]: {
+        value: TrackedEntityInstance | DHIS2Event | string | number;
+        style?: string;
+    };
+    index: {
+        value: number;
+        style?: string;
+    };
 }
 export interface ColumnDefinition {
     label: string;
@@ -263,7 +255,7 @@ export interface OptionSet {
     id: string;
 }
 export interface Option {
-    code: string;
+    code?: string;
     name: string;
     id: string;
     value?: string;

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

@@ -1,21 +1,13 @@
 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;
     constructor(httpClient: NgxDhis2HttpClientService);
-    private getProgramMetadata;
-    private getTrackedEntityInstances;
     /**
-     * Fetch orgUnit names for given orgUnit IDs
-     */
-    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, filtersFromEvents?: FilterConfig[]): Observable<LineListResponse>;
+      * Fetch orgUnit names for given orgUnit IDs
+      */
+    fetchOrgUnits(orgUnitIds: string[]): Observable<Map<string, string>>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LineListService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LineListService>;
 }

package/lib/modules/line-list/utils/event-table-table-util.d.ts

@@ -0,0 +1,10 @@
+import { Program } from '@iapps/d2-web-sdk';
+import { LineListResponse, ColumnDefinition, TableRow } from '../models/line-list.models';
+export declare const getEventData: (response: LineListResponse, pager: any, metaData: Program, isOptionSetNameVisible: boolean) => {
+    columns: ColumnDefinition[];
+    data: TableRow[];
+};
+export declare const getProgramStageData: (response: LineListResponse, programStageId: string, pager: any, metaData: Program, isOptionSetNameVisible: boolean) => {
+    columns: ColumnDefinition[];
+    data: TableRow[];
+};

package/lib/modules/line-list/utils/tei-table-data-utils.d.ts

@@ -0,0 +1,9 @@
+import { Program } from '@iapps/d2-web-sdk';
+import { LineListResponse, ColumnDefinition, TableRow } from '../models/line-list.models';
+export declare const getTrackedEntityTableData: (response: LineListResponse, programId: string, pager: any, metaData: Program) => {
+    columns: ColumnDefinition[];
+    data: TableRow[];
+    filteredEntityColumns: ColumnDefinition[];
+    orgUnitLabel: string;
+};
+export declare const addActionsColumn: (columns: ColumnDefinition[], actionOptions?: any[]) => ColumnDefinition[];

package/lib/modules/program-entry-form/models/program-entry-form-metadata.d.ts

@@ -6,6 +6,7 @@ export interface IProgramEntryFormMetaData {
     id: string;
     name: string;
     description?: string;
+    program: Program;
     formFields: IFormField<string>[];
     sections: IProgramEntryFormSection[];
     rules: IMetadataRule[];
@@ -17,7 +18,7 @@ export declare class ProgramEntryFormMetaData implements IProgramEntryFormMetaDa
     description?: string;
     d2: import("@iapps/d2-web-sdk").D2Web;
     config: ProgramEntryFormConfig;
-    metaData: Program;
+    program: Program;
     setConfig(config: ProgramEntryFormConfig): ProgramEntryFormMetaData;
     getProgramPromise(): Promise<import("@iapps/d2-web-sdk").D2Response<Program>>;
     get formFields(): IFormField<string>[];

package/package.json

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

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

@@ -1,7 +0,0 @@
-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

@@ -1,17 +0,0 @@
-import { FilterConfig } from '../models/filter-config.model';
-import { LineListResponse, ColumnDefinition, TableRow } from '../models/line-list.models';
-export declare const getProgramStageData: (response: LineListResponse, programStageId: string, pager: any, isOptionSetNameVisible: boolean) => {
-    columns: ColumnDefinition[];
-    data: TableRow[];
-};
-export declare const getTrackedEntityData: (response: LineListResponse, programId: string, pager: any, isOptionSetNameVisible: boolean, filters?: FilterConfig[]) => {
-    columns: ColumnDefinition[];
-    data: TableRow[];
-    filteredEntityColumns: ColumnDefinition[];
-    orgUnitLabel: string;
-};
-export declare const getEventData: (response: LineListResponse, pager: any, isOptionSetNameVisible: boolean) => {
-    columns: ColumnDefinition[];
-    data: TableRow[];
-};
-export declare const addActionsColumn: (columns: ColumnDefinition[], actionOptions?: any[]) => ColumnDefinition[];