@iapps/ng-dhis2-ui 1.1.58 → 1.1.59

package/lib/modules/form/models/form-metadata-section.model.d.ts

@@ -17,7 +17,7 @@ export declare class FormMetadataSection implements IFormMetadataSection {
         sortOrder: unknown;
         mandatory: unknown;
         allowFutureDate: unknown;
-        trackedEntityType: any;
+        trackedEntityType: unknown;
         metaType: string;
     }[];
     get dataElements(): {

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): "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" | "org-unit" | "file" | "email" | "number" | "text" | "tel";
+    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/components/org-unit-form-field.component.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+type Props = {
+    key: string;
+    label?: string;
+    required?: boolean;
+    onSelectOrgUnit: (selectedOrgUnits: any) => void;
+    onBlur?: (selectedOrgUnit: Record<string, unknown>) => void;
+    selected?: string;
+    maxTreeHeight?: number;
+    disabled?: boolean;
+    previousOrgUnitId?: string;
+};
+export declare const OrgUnitFormField: (props: Props) => React.JSX.Element;
+export {};

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

@@ -18,7 +18,6 @@ export declare class LineListTableComponent extends ReactWrapperModule {
     filters?: FilterConfig[];
     ouMode?: string;
     dispatchTeis: boolean;
-    showFilterButton: boolean;
     actionSelected: EventEmitter<{
         action: string;
         row: TableRow;
@@ -33,11 +32,12 @@ export declare class LineListTableComponent extends ReactWrapperModule {
     firstValue: EventEmitter<string>;
     buttonFilter: string;
     filterRootOrgUnit: boolean;
+    showFilters: boolean;
     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, "app-line-list", never, { "programId": { "alias": "programId"; "required": false; }; "orgUnit": { "alias": "orgUnit"; "required": false; }; "programStageId": { "alias": "programStageId"; "required": false; }; "actionOptions": { "alias": "actionOptions"; "required": false; }; "attributeFilters": { "alias": "attributeFilters"; "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; }; "showFilterButton": { "alias": "showFilterButton"; "required": false; }; "isButtonLoading": { "alias": "isButtonLoading"; "required": false; }; "buttonLabel": { "alias": "buttonLabel"; "required": false; }; "buttonFilter": { "alias": "buttonFilter"; "required": false; }; "filterRootOrgUnit": { "alias": "filterRootOrgUnit"; "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; }; "attributeFilters": { "alias": "attributeFilters"; "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; }; }, { "actionSelected": "actionSelected"; "approvalSelected": "approvalSelected"; "firstValue": "firstValue"; }, never, ["*"], false, never>;
 }

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

@@ -2,8 +2,9 @@ import * as i0 from "@angular/core";
 import * as i1 from "./containers/line-list.component.tsx";
 import * as i2 from "@angular/common";
 import * as i3 from "../../shared/shared.module";
+import * as i4 from "../react-wrapper/react-wrapper.component.tsx";
 export declare class LineListModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<LineListModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<LineListModule, [typeof i1.LineListTableComponent], [typeof i2.CommonModule, typeof i3.SharedDhis2UiModule], [typeof i1.LineListTableComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<LineListModule, [typeof i1.LineListTableComponent], [typeof i2.CommonModule, typeof i3.SharedDhis2UiModule, typeof i4.ReactWrapperModule], [typeof i1.LineListTableComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<LineListModule>;
 }

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

@@ -5,10 +5,10 @@ export interface Pager {
     pageCount: number;
 }
 export interface Attribute {
-    lastUpdated: string;
+    updatedAt: string;
     code: string;
     displayName: string;
-    created: string;
+    createdAt: string;
     valueType: string;
     attribute: string;
     value: string;
@@ -24,7 +24,7 @@ export interface Event {
     programStage?: string;
     orgUnit: string;
     enrollment: string;
-    trackedEntityInstance: string;
+    trackedEntity: string;
     enrollmentStatus: string;
     orgUnitName: string;
     status: string;
@@ -36,12 +36,18 @@ export interface Event {
     followup: boolean;
     deleted: boolean;
     attributeOptionCombo: string;
+    createdAt: string;
+    updatedAt: string;
     completedBy: string;
+    createdBy: CreatedByUserInfo;
+    updatedBy: LastUpdatedByUserInfo;
     lastUpdatedByUserInfo: LastUpdatedByUserInfo;
     createdByUserInfo: CreatedByUserInfo;
     dataValues: DataValue[];
     notes: any[];
     relationships: any[];
+    followUp: boolean;
+    scheduledAt: string;
 }
 export interface DataValue {
     lastUpdated: string;
@@ -49,23 +55,30 @@ export interface DataValue {
     dataElement: string;
     value: string;
     providedElsewhere: boolean;
+    createdAt: string;
+    updatedAt: string;
 }
 export interface Enrollment {
     program: string;
     lastUpdated: string;
-    created: string;
+    createdAt: string;
+    updatedAt: string;
     orgUnit: string;
     enrollment: string;
-    trackedEntityInstance: string;
+    trackedEntity: string;
     trackedEntityType: string;
     orgUnitName: string;
     enrollmentDate: string;
-    followup: boolean;
+    enrolledAt: string;
+    occurredAt: string;
+    followUp: boolean;
     deleted: boolean;
+    completedBy?: string;
+    completedAt?: string;
     incidentDate: string;
     status: string;
-    lastUpdatedByUserInfo: LastUpdatedByUserInfo;
-    createdByUserInfo: CreatedByUserInfo;
+    updatedBy: LastUpdatedByUserInfo;
+    createdBy: CreatedByUserInfo;
     notes: any[];
     relationships: any[];
     events: Event[];
@@ -79,9 +92,49 @@ export interface TrackedEntityInstance {
         displayName?: string;
     }[];
     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 {
+    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 ProgramOwner {
+    orgUnit: string;
+    trackedEntity: string;
+    program: string;
 }
 export interface TrackedEntityInstancesResponse {
     trackedEntityInstances: TrackedEntityInstance[];
+    trackedEntity: TrackedEntity[];
+    pager: Pager;
+}
+export interface TrackedEntityResponse {
+    trackedEntities: TrackedEntity[];
+    pager: Pager;
+    orgUnitsMap?: Map<string, string>;
+}
+export interface EnrollmentsResponse {
+    enrollments: Enrollment[];
     pager: Pager;
 }
 export interface ProgramStageDataElement {
@@ -106,7 +159,7 @@ export interface ProgramMetadata {
 }
 export interface LineListResponse {
     metadata: ProgramMetadata;
-    data: EventsResponse | TrackedEntityInstancesResponse;
+    data: EventsResponse | TrackedEntityInstancesResponse | EnrollmentsResponse | TrackedEntityResponse;
 }
 export interface TableRow {
     [key: string]: string | number;

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

@@ -8,6 +8,10 @@ export declare class LineListService {
     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): Observable<LineListResponse>;

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

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

package/package.json

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