+1
-1
@@ -29,7 +29,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="select-row"></tr>
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.criteriaId]" class="select-row"></tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -33,8 +33,8 @@ export class LoanProvisioningCriteriaComponent implements OnInit {
|
|||||||
* @param {ActivatedRoute} route Activated Route.
|
* @param {ActivatedRoute} route Activated Route.
|
||||||
*/
|
*/
|
||||||
constructor(private route: ActivatedRoute) {
|
constructor(private route: ActivatedRoute) {
|
||||||
this.route.data.subscribe(( data: { loanProvisioningCriteria: any }) => {
|
this.route.data.subscribe(( data: { loanProvisioningCriterias: any }) => {
|
||||||
this.loanProvisioningCriteriaData = data.loanProvisioningCriteria;
|
this.loanProvisioningCriteriaData = data.loanProvisioningCriterias;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -1,6 +1,6 @@
|
|||||||
/** Angular Imports */
|
/** Angular Imports */
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Resolve } from '@angular/router';
|
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
|
||||||
|
|
||||||
/** rxjs Imports */
|
/** rxjs Imports */
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
@@ -23,8 +23,9 @@ export class LoanProvisioningCriteriaResolver implements Resolve<Object> {
|
|||||||
* Returns the loan provisioning criteria data.
|
* Returns the loan provisioning criteria data.
|
||||||
* @returns {Observable<any>}
|
* @returns {Observable<any>}
|
||||||
*/
|
*/
|
||||||
resolve(): Observable<any> {
|
resolve(route: ActivatedRouteSnapshot): Observable<any> {
|
||||||
return this.organizationService.getProvisioningCriteria();
|
const provisioningId = route.paramMap.get('id');
|
||||||
|
return this.organizationService.getProvisioningCriteria(provisioningId);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Resolve } from '@angular/router';
|
||||||
|
|
||||||
|
/** rxjs Imports */
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
/** Custom Services */
|
||||||
|
import { OrganizationService } from '../organization.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Charges data resolver.
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class LoanProvisioningCriteriasResolver implements Resolve<Object> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {OrganizationService} organizationService Products service.
|
||||||
|
*/
|
||||||
|
constructor(private organizationService: OrganizationService) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the products data.
|
||||||
|
* @returns {Observable<any>}
|
||||||
|
*/
|
||||||
|
resolve(): Observable<any> {
|
||||||
|
return this.organizationService.getProvisioningCriterias();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+76
@@ -0,0 +1,76 @@
|
|||||||
|
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
|
||||||
|
<button mat-raised-button color="primary" [routerLink]="['edit']">
|
||||||
|
<fa-icon icon="edit"></fa-icon>
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
<button mat-raised-button color="warn" (click)="deleteCharge()">
|
||||||
|
<fa-icon icon="trash"></fa-icon>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
|
||||||
|
<mat-card>
|
||||||
|
|
||||||
|
<mat-card-content>
|
||||||
|
|
||||||
|
<div fxLayout="row wrap" class="content">
|
||||||
|
|
||||||
|
<h2 class="mat-h2" fxFlexFill>{{provisioningData.criteriaName}}</h2>
|
||||||
|
<mat-divider [inset]="true"></mat-divider>
|
||||||
|
|
||||||
|
<div fxFlexFill class="loanProduct">
|
||||||
|
<span fxFlex="40%">Loan Product:</span>
|
||||||
|
<span fxFlex="60%">{{ loanProducts }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
|
||||||
|
<table mat-table [dataSource]="dataSource" matSort>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="category">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Category </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.categoryName}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="minAge">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Min Age </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.minAge}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="maxAge">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Max Age </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.maxAge}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="percentage">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Percentage </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.provisioningPercentage}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="liabilityAccount">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Liability Account </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.liabilityName}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="expenseAccount">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Expense Account </th>
|
||||||
|
<td mat-cell *matCellDef="let provisioningData"> {{provisioningData.expenseName}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</mat-card-content>
|
||||||
|
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
|
</div>
|
||||||
+24
@@ -0,0 +1,24 @@
|
|||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-elevation-z1 {
|
||||||
|
margin: 1em 0 1.5em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2, h3, h4 {
|
||||||
|
margin: 0;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
span {
|
||||||
|
margin: 0.5em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-divider {
|
||||||
|
margin: 0 0 0.5em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loanProduct {
|
||||||
|
padding: 10px 0px;
|
||||||
|
}
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ViewLoanProvisioningCriteriaComponent } from './view-loan-provisioning-criteria.component';
|
||||||
|
|
||||||
|
describe('ViewLoanProvisioningCriteriaComponent', () => {
|
||||||
|
let component: ViewLoanProvisioningCriteriaComponent;
|
||||||
|
let fixture: ComponentFixture<ViewLoanProvisioningCriteriaComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ViewLoanProvisioningCriteriaComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ViewLoanProvisioningCriteriaComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+86
@@ -0,0 +1,86 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
|
import { MatDialog } from '@angular/material';
|
||||||
|
import { Router, ActivatedRoute } from '@angular/router';
|
||||||
|
import { MatPaginator } from '@angular/material/paginator';
|
||||||
|
import { MatTableDataSource } from '@angular/material/table';
|
||||||
|
|
||||||
|
/** Custom Services */
|
||||||
|
import { OrganizationService } from 'app/organization/organization.service';
|
||||||
|
|
||||||
|
/** Dialog Component */
|
||||||
|
import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* View Loan Provisioning
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-view-loan-provisioning-criteria',
|
||||||
|
templateUrl: './view-loan-provisioning-criteria.component.html',
|
||||||
|
styleUrls: ['./view-loan-provisioning-criteria.component.scss']
|
||||||
|
})
|
||||||
|
export class ViewLoanProvisioningCriteriaComponent implements OnInit {
|
||||||
|
|
||||||
|
/** Loan Provisioning data. */
|
||||||
|
provisioningData: any;
|
||||||
|
/** Loan Product String. */
|
||||||
|
loanProducts = '';
|
||||||
|
/** Column Headers for Mat Table. */
|
||||||
|
displayedColumns: string[] = ['category', 'minAge', 'maxAge', 'percentage', 'liabilityAccount', 'expenseAccount'];
|
||||||
|
/** Data source for loan provisioning criteria table. */
|
||||||
|
dataSource: MatTableDataSource<any>;
|
||||||
|
|
||||||
|
/** Paginator for loan provisioning criteria table. */
|
||||||
|
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the Provisioning data from `resolve`.
|
||||||
|
* @param {OrganizationService} organizationService Organization Service.
|
||||||
|
* @param {ActivatedRoute} route Activated Route.
|
||||||
|
* @param {Router} router Router for navigation.
|
||||||
|
* @param {MatDialog} dialog Dialog reference.
|
||||||
|
*/
|
||||||
|
constructor(private organizationService: OrganizationService,
|
||||||
|
private route: ActivatedRoute,
|
||||||
|
private router: Router,
|
||||||
|
public dialog: MatDialog) {
|
||||||
|
this.route.data.subscribe((data: { loanProvisioningCriteria: any }) => {
|
||||||
|
this.provisioningData = data.loanProvisioningCriteria;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.setLoanProvisioningSelectedCriteria();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the data source, paginator for loan provisioning criteria table.
|
||||||
|
*/
|
||||||
|
setLoanProvisioningSelectedCriteria() {
|
||||||
|
this.dataSource = new MatTableDataSource(this.provisioningData.definitions);
|
||||||
|
this.dataSource.paginator = this.paginator;
|
||||||
|
|
||||||
|
/** Get load products as a string. */
|
||||||
|
for (let _id = 0; _id < this.provisioningData.loanProducts.length; _id++) {
|
||||||
|
this.loanProducts += this.provisioningData.loanProducts[_id].name + ',';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete Selected Provisioning Criteria.
|
||||||
|
*/
|
||||||
|
deleteCharge() {
|
||||||
|
const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
|
||||||
|
data: { deleteContext: `loanProvisioningCriteria ${this.provisioningData.criteriaId}` }
|
||||||
|
});
|
||||||
|
deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
|
||||||
|
if (response.delete) {
|
||||||
|
this.organizationService.deleteProvisioningCriteria(this.provisioningData.criteriaId)
|
||||||
|
.subscribe(() => {
|
||||||
|
this.router.navigate(['/organization/provisioningcriteria']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -54,6 +54,8 @@ import { WorkingDaysResolver } from './working-days/working-days.resolver';
|
|||||||
import { EditOfficeResolver } from './offices/edit-office/edit-office.resolver';
|
import { EditOfficeResolver } from './offices/edit-office/edit-office.resolver';
|
||||||
import { EditOfficeComponent } from './offices/edit-office/edit-office.component';
|
import { EditOfficeComponent } from './offices/edit-office/edit-office.component';
|
||||||
import { AdhocQueryTemplateResolver } from './adhoc-query/adhoc-query-template.resolver';
|
import { AdhocQueryTemplateResolver } from './adhoc-query/adhoc-query-template.resolver';
|
||||||
|
import { ViewLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component';
|
||||||
|
import { LoanProvisioningCriteriasResolver } from './loan-provisioning-criteria/loan-provisioning-criterias.resolver';
|
||||||
|
|
||||||
/** Organization Routes */
|
/** Organization Routes */
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
@@ -68,11 +70,30 @@ const routes: Routes = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'provisioning-criteria',
|
path: 'provisioning-criteria',
|
||||||
component: LoanProvisioningCriteriaComponent,
|
|
||||||
data: { title: extract('Provisioning Criteria'), breadcrumb: 'Provisioning Criteria' },
|
data: { title: extract('Provisioning Criteria'), breadcrumb: 'Provisioning Criteria' },
|
||||||
resolve: {
|
children: [
|
||||||
loanProvisioningCriteria: LoanProvisioningCriteriaResolver
|
{
|
||||||
}
|
path: '',
|
||||||
|
component: LoanProvisioningCriteriaComponent,
|
||||||
|
resolve: {
|
||||||
|
loanProvisioningCriterias: LoanProvisioningCriteriasResolver
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
path: ':id',
|
||||||
|
data: { title: extract('View Provisioning Criteria'), routeParamBreadcrumb: 'id' },
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '',
|
||||||
|
component: ViewLoanProvisioningCriteriaComponent,
|
||||||
|
resolve: {
|
||||||
|
loanProvisioningCriteria: LoanProvisioningCriteriaResolver
|
||||||
|
}
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'offices',
|
path: 'offices',
|
||||||
@@ -338,7 +359,8 @@ const routes: Routes = [
|
|||||||
EntityDataTableChecksResolver,
|
EntityDataTableChecksResolver,
|
||||||
WorkingDaysResolver,
|
WorkingDaysResolver,
|
||||||
EditOfficeResolver,
|
EditOfficeResolver,
|
||||||
AdhocQueryTemplateResolver
|
AdhocQueryTemplateResolver,
|
||||||
|
LoanProvisioningCriteriasResolver,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class OrganizationRoutingModule { }
|
export class OrganizationRoutingModule { }
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import { HolidaysComponent } from './holidays/holidays.component';
|
|||||||
import { EditEmployeeComponent } from './employees/edit-employee/edit-employee.component';
|
import { EditEmployeeComponent } from './employees/edit-employee/edit-employee.component';
|
||||||
import { CreateTellerComponent } from './tellers/create-teller/create-teller.component';
|
import { CreateTellerComponent } from './tellers/create-teller/create-teller.component';
|
||||||
import { EditTellerComponent } from './tellers/edit-teller/edit-teller.component';
|
import { EditTellerComponent } from './tellers/edit-teller/edit-teller.component';
|
||||||
|
import { ViewLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Organization Module
|
* Organization Module
|
||||||
@@ -69,7 +70,8 @@ import { EditTellerComponent } from './tellers/edit-teller/edit-teller.component
|
|||||||
EditOfficeComponent,
|
EditOfficeComponent,
|
||||||
EditEmployeeComponent,
|
EditEmployeeComponent,
|
||||||
CreateTellerComponent,
|
CreateTellerComponent,
|
||||||
EditTellerComponent
|
EditTellerComponent,
|
||||||
|
ViewLoanProvisioningCriteriaComponent,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class OrganizationModule { }
|
export class OrganizationModule { }
|
||||||
|
|||||||
@@ -21,10 +21,34 @@ export class OrganizationService {
|
|||||||
/**
|
/**
|
||||||
* @returns {Observable<any>} Loan Provisioning Criteria data
|
* @returns {Observable<any>} Loan Provisioning Criteria data
|
||||||
*/
|
*/
|
||||||
getProvisioningCriteria(): Observable<any> {
|
getProvisioningCriterias(): Observable<any> {
|
||||||
return this.http.get('/provisioningcriteria');
|
return this.http.get('/provisioningcriteria');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @returns {Observable<any>} Loan Provisioning Criteria template.
|
||||||
|
*/
|
||||||
|
getProvisioningCriteriaTemplate(): Observable<any> {
|
||||||
|
return this.http.get('/provisioningcriteria/template');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} provisioningId Provisioning ID of Loan Provisioning Criteria.
|
||||||
|
* @returns {Observable<any>} Provisioning Criteria.
|
||||||
|
*/
|
||||||
|
getProvisioningCriteria(provisioningId: string, template: boolean = false): Observable<any> {
|
||||||
|
const httpParams = new HttpParams().set('template', template.toString());
|
||||||
|
return this.http.get(`/provisioningcriteria/${provisioningId}`, { params: httpParams });
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} provisioningId Provisioning ID of provisioning criteria to be deleted.
|
||||||
|
* @returns {Observable<any>}
|
||||||
|
*/
|
||||||
|
deleteProvisioningCriteria(criteriaId: string): Observable<any> {
|
||||||
|
return this.http.delete(`/provisioningcriteria/${criteriaId}`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns {Observable<any>} Offices data
|
* @returns {Observable<any>} Offices data
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user