diff --git a/src/app/customApis.service.ts b/src/app/customApis.service.ts index 19da5188a9..5fd1e2536a 100644 --- a/src/app/customApis.service.ts +++ b/src/app/customApis.service.ts @@ -231,3 +231,65 @@ export class OrganizationService { }); } } + +/** + * Home Service + */ +@Injectable({ + providedIn: 'root' +}) +export class HomeService { + /** + * @param {HttpClient} http Http Client to send requests. + */ + constructor(private http: HttpClient) {} + + /** + * @param {number} officeId Office Id. + * @returns {Observable} + */ + getCollectedAmount(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/Demand Vs Collection', { params: httpParams }); + } + + getDisbursedAmount(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/Disbursal Vs Awaitingdisbursal', { params: httpParams }); + } + + /** + * @param {number} officeId Office Id. + * @returns {Observable} + */ + + getClientTrendsByDay(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/ClientTrendsByDay', { params: httpParams }); + } + + getLoanTrendsByDay(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/LoanTrendsByDay', { params: httpParams }); + } + + getClientTrendsByWeek(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/ClientTrendsByWeek', { params: httpParams }); + } + + getClientTrendsByMonth(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/ClientTrendsByMonth', { params: httpParams }); + } + + getLoanTrendsByWeek(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/LoanTrendsByWeek', { params: httpParams }); + } + + getLoanTrendsByMonth(officeId: number): Observable { + const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); + return this.http.get('/runreports/LoanTrendsByMonth', { params: httpParams }); + } +} diff --git a/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.ts b/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.ts index cace219e8b..f7fa28b726 100644 --- a/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.ts +++ b/src/app/home/dashboard/amount-collected-pie/amount-collected-pie.component.ts @@ -4,7 +4,7 @@ import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; /** Custom Services */ -import { HomeService } from '../../home.service'; +import { HomeService } from 'app/customApis.service'; /** Charting Imports */ import Chart from 'chart.js'; diff --git a/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.ts b/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.ts index 5a33471a96..9772fe1340 100644 --- a/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.ts +++ b/src/app/home/dashboard/amount-disbursed-pie/amount-disbursed-pie.component.ts @@ -4,7 +4,7 @@ import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; /** Custom Services */ -import { HomeService } from '../../home.service'; +import { HomeService } from 'app/customApis.service'; /** Charting Imports */ import Chart from 'chart.js'; diff --git a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.ts b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.ts index cc2bea834f..d42f2be103 100644 --- a/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.ts +++ b/src/app/home/dashboard/client-trends-bar/client-trends-bar.component.ts @@ -8,7 +8,7 @@ import { forkJoin, merge } from 'rxjs'; import { skip } from 'rxjs/operators'; /** Custom Services */ -import { HomeService } from '../../home.service'; +import { HomeService } from 'app/customApis.service'; /** Charting Imports */ import { Dates } from 'app/core/utils/dates'; diff --git a/src/app/home/home.service.ts b/src/app/home/home.service.ts deleted file mode 100644 index 6c76862d75..0000000000 --- a/src/app/home/home.service.ts +++ /dev/null @@ -1,91 +0,0 @@ -/** Angular Imports */ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpParams } from '@angular/common/http'; - -/** rxjs Imports */ -import { Observable } from 'rxjs'; - -/** - * Home Service - */ -@Injectable({ - providedIn: 'root' -}) -export class HomeService { - /** - * @param {HttpClient} http Http Client to send requests. - */ - constructor(private http: HttpClient) {} - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getCollectedAmount(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/Demand Vs Collection', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getDisbursedAmount(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/Disbursal Vs Awaitingdisbursal', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getClientTrendsByDay(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/ClientTrendsByDay', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getClientTrendsByWeek(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/ClientTrendsByWeek', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getClientTrendsByMonth(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/ClientTrendsByMonth', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getLoanTrendsByDay(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/LoanTrendsByDay', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getLoanTrendsByWeek(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/LoanTrendsByWeek', { params: httpParams }); - } - - /** - * @param {number} officeId Office Id. - * @returns {Observable} - */ - getLoanTrendsByMonth(officeId: number): Observable { - const httpParams = new HttpParams().set('R_officeId', officeId.toString()).set('genericResultSet', 'false'); - return this.http.get('/runreports/LoanTrendsByMonth', { params: httpParams }); - } -}