WEB-678: Restructure Reporting Plugin to Support Branch Model Operations

src/app/clients/clients-view/general-tab/general-tab.component.ts

@@ -39,7 +39,7 @@ import { DateFormatPipe } from '../../../pipes/date-format.pipe';
 import { FormatNumberPipe } from '../../../pipes/format-number.pipe';
 import { CurrencyPipe } from '@angular/common';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Subject } from 'rxjs';
 import { takeUntil, catchError } from 'rxjs/operators';

src/app/clients/clients-view/personal-data-tab/personal-data-tab.component.ts

@@ -20,7 +20,7 @@ import { DateFormatPipe } from '../../../pipes/date-format.pipe';
 import { LegalFormId } from 'app/clients/models/legal-form.enum';
 import { ClientsService } from 'app/clients/clients.service';
 import { MatIcon } from '@angular/material/icon';
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { AlertService } from 'app/core/alert/alert.service';
 import { SystemService } from 'app/system/system.service';

src/app/loans/common-resolvers/loans-transaction-reciept.resolver.ts

@@ -14,7 +14,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 
 /**
  * Loans Transaction Reciept resolver.

src/app/loans/loans-view/transactions/export-transactions/export-transactions.component.ts

@@ -13,7 +13,7 @@ import { UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/fo
 import { ActivatedRoute, RouterLink } from '@angular/router';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 import { Dates } from 'app/core/utils/dates';
 import { SettingsService } from 'app/settings/settings.service';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';

src/app/organization/sms-campaigns/sms-campaign-stepper/edit-sms-campaign-step/edit-business-rule-parameters/edit-business-rule-parameters.component.ts

@@ -14,12 +14,12 @@ import { Validators, UntypedFormGroup, UntypedFormControl, ReactiveFormsModule }
 import { distinctUntilChanged } from 'rxjs/operators';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 
 /** Custom Models */
-import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
-import { SelectOption } from 'app/reports/common-models/select-option.model';
+import { ReportParameter } from 'app/reporting-plugin/models/report-parameter.model';
+import { SelectOption } from 'app/reporting-plugin/models/select-option.model';
 import { Dates } from 'app/core/utils/dates';
 import { MatDivider } from '@angular/material/divider';
 import { NgFor, NgSwitch, NgIf, NgSwitchCase } from '@angular/common';

src/app/organization/sms-campaigns/sms-campaign-stepper/edit-sms-campaign-step/edit-sms-campaign-step.component.ts

@@ -17,10 +17,10 @@ import {
 } from '@angular/forms';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 
 /** Custom Models */
-import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
+import { ReportParameter } from 'app/reporting-plugin/models/report-parameter.model';
 import { SettingsService } from 'app/settings/settings.service';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { EditBusinessRuleParametersComponent } from './edit-business-rule-parameters/edit-business-rule-parameters.component';

src/app/organization/sms-campaigns/sms-campaign-stepper/sms-campaign-step/business-rule-parameters/business-rule-parameters.component.ts

@@ -11,12 +11,12 @@ import { Component, OnChanges, Input, Output, EventEmitter, OnInit, inject } fro
 import { Validators, UntypedFormGroup, UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 
 /** Custom Models */
-import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
-import { SelectOption } from 'app/reports/common-models/select-option.model';
+import { ReportParameter } from 'app/reporting-plugin/models/report-parameter.model';
+import { SelectOption } from 'app/reporting-plugin/models/select-option.model';
 import { Dates } from 'app/core/utils/dates';
 import { MatDivider } from '@angular/material/divider';
 import { NgFor, NgSwitch, NgIf, NgSwitchCase } from '@angular/common';

src/app/organization/sms-campaigns/sms-campaign-stepper/sms-campaign-step/sms-campaign-step.component.ts

@@ -17,10 +17,10 @@ import {
 } from '@angular/forms';
 
 /** Custom Services */
-import { ReportsService } from 'app/reports/reports.service';
+import { ReportsService } from 'app/reporting-plugin/services/reports.service';
 
 /** Custom Models */
-import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
+import { ReportParameter } from 'app/reporting-plugin/models/report-parameter.model';
 
 /** Custom Components */
 import { BusinessRuleParametersComponent } from './business-rule-parameters/business-rule-parameters.component';

src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html

@@ -39,10 +39,7 @@
 
         @if (taxComponentData.debitAccountType) {
           <div class="flex-50">
-            {{
-              'labels.inputs.accounting.' + (taxComponentData.debitAccountType.value?.split('.')[1] || '').toUpperCase()
-                | translate
-            }}
+            {{ taxComponentData.debitAccountType.code | translateKey: 'inputs.accounting' }}
           </div>
         }
 
@@ -67,10 +64,7 @@
 
         @if (taxComponentData.creditAccountType) {
           <div class="flex-50">
-            {{
-              'labels.inputs.accounting.' +
-                (taxComponentData.creditAccountType.value?.split('.')[1] || '').toUpperCase() | translate
-            }}
+            {{ taxComponentData.creditAccountType.code | translateKey: 'inputs.accounting' }}
           </div>
         }
 

src/app/reports/common-models/chart-data.model.ts → src/app/reporting-plugin/models/chart-data.model.ts

@@ -6,17 +6,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/** Chart Data Response Interface */
+export interface ChartDataResponse {
+  columnHeaders: { columnName: string }[];
+  data: { row: (string | number)[] }[];
+}
+
 /** Chart Data Model */
 export class ChartData {
   keysLabel: string;
   valuesLabel: string;
   keys: string[];
   values: number[];
 
-  constructor(response: any) {
+  constructor(response: ChartDataResponse) {
     this.keysLabel = response.columnHeaders[0].columnName;
     this.valuesLabel = response.columnHeaders[1].columnName;
-    this.keys = response.data.map((object: any) => object.row[0]);
-    this.values = response.data.map((object: any) => object.row[1]);
+    this.keys = response.data.map((object: { row: (string | number)[] }) => object.row[0] as string);
+    this.values = response.data.map((object: { row: (string | number)[] }) => object.row[1] as number);
   }
 }

src/app/reporting-plugin/models/report-parameter.model.ts

@@ -0,0 +1,40 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Custom Models */
+import { SelectOption } from './select-option.model';
+
+/** Report Parameter Model */
+export class ReportParameter {
+  name: string;
+  variable: string;
+  label: string;
+  displayType: string;
+  formatType: string;
+  defaultVal: string | number | boolean | null;
+  selectOne: string | null;
+  selectAll: string | null;
+  parentParameterName: string | null;
+  inputName: string;
+  selectOptions: SelectOption[] = [];
+  childParameters: ReportParameter[] = [];
+  pentahoName: string | null;
+
+  constructor(options: (string | number | boolean | null)[]) {
+    this.name = options[0] as string;
+    this.variable = options[1] as string;
+    this.label = options[2] as string;
+    this.displayType = options[3] as string;
+    this.formatType = options[4] as string;
+    this.defaultVal = options[5];
+    this.selectOne = options[6];
+    this.selectAll = options[7];
+    this.parentParameterName = options[8] as string | null;
+    this.inputName = `R_${this.variable}`;
+  }
+}

src/app/reports/common-models/select-option.model.ts → src/app/reporting-plugin/models/select-option.model.ts

@@ -11,7 +11,7 @@ export class SelectOption {
   id: number;
   name: string;
 
-  constructor(options: any[]) {
+  constructor(options: [number, string]) {
     this.id = options[0];
     this.name = options[1];
   }

src/app/reports/common-resolvers/reports.resolver.ts → src/app/reporting-plugin/resolvers/reports.resolver.ts

@@ -13,7 +13,7 @@ import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { ReportsService } from '../reports.service';
+import { ReportsService } from '../services/reports.service';
 
 /**
  * Reports data resolver.

src/app/reports/common-resolvers/run-report.resolver.ts → src/app/reporting-plugin/resolvers/run-report.resolver.ts

@@ -14,7 +14,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { ReportsService } from '../reports.service';
+import { ReportsService } from '../services/reports.service';
 
 /**
  * Reports data resolver.

src/app/reporting-plugin/services/reports.service.ts

@@ -0,0 +1,186 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Angular Imports */
+import { Injectable, inject } from '@angular/core';
+import { HttpClient, HttpParams } from '@angular/common/http';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+/** Custom Models */
+import { ReportParameter } from '../models/report-parameter.model';
+import { SelectOption } from '../models/select-option.model';
+import { ChartData } from '../models/chart-data.model';
+
+/**
+ * Reports service.
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class ReportsService {
+  private http = inject(HttpClient);
+
+  /**
+   * @returns {Observable<any>} Reports data
+   */
+  getReports(): Observable<any> {
+    return this.http.get('/reports');
+  }
+
+  /**
+   * @param {string} officeId Office ID to filter reports.
+   * @returns {Observable<any>} Reports data for a specific office.
+   */
+  getReportsByOffice(officeId: string): Observable<any> {
+    const httpParams = new HttpParams().set('officeId', officeId);
+    return this.http.get('/reports', { params: httpParams });
+  }
+
+  /**
+   * @param {string} reportName Report name for which parameters are needed.
+   * @returns {Observable<ReportParameter[]>}
+   */
+  getReportParams(reportName: string): Observable<ReportParameter[]> {
+    const httpParams = new HttpParams().set('R_reportListing', `'${reportName}'`).set('parameterType', 'true');
+    return this.http
+      .get(`/runreports/FullParameterList`, { params: httpParams })
+      .pipe(map((response: any) => response.data.map((entry: any) => new ReportParameter(entry.row))));
+  }
+
+  /**
+   * @param {string} inputString URL substring containing object details.
+   * @returns {Observable<SelectOption[]>}
+   */
+  getSelectOptions(inputString: string): Observable<SelectOption[]> {
+    const httpParams = new HttpParams().set('parameterType', 'true');
+    return this.http
+      .get(`/runreports/${inputString}`, { params: httpParams })
+      .pipe(map((response: any) => response.data.map((entry: any) => new SelectOption(entry.row))));
+  }
+
+  /**
+   * @param {number} reportId Report id for which pentaho parameters are needed.
+   * @returns {Observable<any>}
+   */
+  getPentahoParams(reportId: number): Observable<any> {
+    const httpParams = new HttpParams().set('fields', 'reportParameters');
+    return this.http
+      .get(`/reports/${reportId}`, { params: httpParams })
+      .pipe(map((response: any) => response.reportParameters));
+  }
+
+  /**
+   * Run Report Data for Table and SMS.
+   * @param {any} reportName report name
+   * @param {object} formData Form Data.
+   * @returns {Observable<any>}
+   */
+  getRunReportData(reportName: string, formData: object): Observable<any> {
+    let httpParams = new HttpParams();
+    for (const [
+      key,
+      value
+    ] of Object.entries(formData)) {
+      httpParams = httpParams.set(key, value);
+    }
+    return this.http.get(`/runreports/${reportName}`, { params: httpParams });
+  }
+
+  /**
+   * Run Report Data for Charts.
+   * @param {any} reportName report name
+   * @param {object} formData Form Data.
+   * @returns {Observable<ChartData>}
+   */
+  getChartRunReportData(reportName: string, formData: object): Observable<ChartData> {
+    let httpParams = new HttpParams();
+    for (const [
+      key,
+      value
+    ] of Object.entries(formData)) {
+      httpParams = httpParams.set(key, value);
+    }
+    return this.http
+      .get(`/runreports/${reportName}`, { params: httpParams })
+      .pipe(map((response: any) => new ChartData(response)));
+  }
+
+  /**
+   * Run Report Data for Pentaho.
+   * @param {any} reportName report name
+   * @param {object} formData Form Data.
+   * @returns {Observable<any>}
+   */
+  getPentahoRunReportData(
+    reportName: string,
+    formData: object,
+    tenantIdentifier: string,
+    locale: string,
+    dateFormat: string
+  ): Observable<any> {
+    let httpParams = new HttpParams()
+      .set('tenantIdentifier', tenantIdentifier)
+      .set('locale', locale)
+      .set('dateFormat', dateFormat);
+    for (const [
+      key,
+      value
+    ] of Object.entries(formData)) {
+      httpParams = httpParams.set(key, value);
+    }
+    return this.http.get(`/runreports/${reportName}`, {
+      responseType: 'arraybuffer',
+      observe: 'response',
+      params: httpParams
+    });
+  }
+
+  /**
+   * @param {number} reportId
+   * @returns {Observable<any>}
+   */
+  getBirtParams(reportId: number): Observable<any> {
+    const httpParams = new HttpParams().set('fields', 'reportParameters');
+    return this.http
+      .get(`/reports/${reportId}`, { params: httpParams })
+      .pipe(map((response: any) => response.reportParameters));
+  }
+
+  /**
+   * Run Report Data for BIRT.
+   * @param {any} reportName
+   * @param {object} formData
+   * @returns {Observable<any>}
+   */
+  getBirtRunReportData(
+    reportName: string,
+    formData: object,
+    tenantIdentifier: string,
+    locale: string,
+    dateFormat: string
+  ): Observable<any> {
+    let httpParams = new HttpParams()
+      .set('tenantIdentifier', tenantIdentifier)
+      .set('locale', locale)
+      .set('dateFormat', dateFormat);
+    for (const [
+      key,
+      value
+    ] of Object.entries(formData)) {
+      httpParams = httpParams.set(key, value);
+    }
+    return this.http.get(`/runreports/${reportName}`, {
+      responseType: 'arraybuffer',
+      observe: 'response',
+      params: httpParams
+    });
+  }
+}