CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: loans module (#1237)

Browse Source
This commit is contained in:
Muskan Khedia
2020-08-30 19:50:58 +05:30
committed by GitHub
parent d357263c3e
commit 3c858e308c
83 changed files with 1480 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/clients/clients-routing.module.ts
+1 -2
View File
@@ -229,8 +229,7 @@ const routes: Routes = [
]
},
{
path: 'loans',
data: { title: extract('Loans'), breadcrumb: 'loans', routeParamBreadcrumb: false },
path: 'loans-accounts',
loadChildren: () => import('../loans/loans.module').then(m => m.LoansModule)
},
{
src/app/clients/clients-view/clients-view.component.html
+1 -1
View File
@@ -62,7 +62,7 @@
<button mat-raised-button [matMenuTriggerFor]="Applications">
<i class="fa fa-file"></i>Applications</button>
<mat-menu #Applications="matMenu">
<button mat-menu-item [routerLink]="['loans', 'create-loans-account']">New Loan Account</button>
<button mat-menu-item [routerLink]="['loans-accounts', 'create']">New Loan Account</button>
<button mat-menu-item [routerLink]="['savings-accounts', 'create']">New Savings Account</button>
<button mat-menu-item *mifosxHasPermission="'CREATE_SHAREACCOUNT'" [routerLink]="['shares-accounts', 'create']">New Share Account</button>
<button mat-menu-item *mifosxHasPermission="'CREATE_RECURRINGDEPOSITACCOUNT'" [routerLink]="['recurringdeposits', 'create-recurring-deposits-account']">New Recurring Deposit Account</button>
src/app/clients/clients-view/general-tab/general-tab.component.html
+6 -6
View File
@@ -82,7 +82,7 @@
</table>
<!-- loans overview table -->
<!-- loans accounts overview table -->
<div class="heading-content">
<div fxLayout="column" fxFlex="50%">
<div class="heading-name">
@@ -137,20 +137,20 @@
<th mat-header-cell *matHeaderCellDef> Actions </th>
<td mat-cell *matCellDef="let element">
<button *ngIf="element.status.active" class="account-action-button" mat-raised-button color="primary" matTooltip="Make Repayment" matTooltipPosition="above"
(click)="routeEdit($event)" [routerLink]="['../','loans', element.id, 'actions', 'make-repayment']">
(click)="routeEdit($event)" [routerLink]="['../','loans-accounts', element.id, 'actions', 'Make Repayment']">
<i class="fa fa-dollar"></i>
</button>
<span *ngIf="element.status.pendingApproval">
<button class="account-action-button" mat-raised-button color="primary" matTooltip="Approve"
matTooltipPosition="above" *mifosxHasPermission="'APPROVE_LOAN'" (click)="routeEdit($event)"
[routerLink]="['../','loans', element.id, 'actions', 'approve']">
[routerLink]="['../','loans-accounts', element.id, 'actions', 'Approve']">
<i class="fa fa-check"></i>
</button>
</span>
<span *ngIf="!element.status.pendingApproval && !element.status.active && !element.status.overpaid">
<button class="account-action-button" mat-raised-button color="primary" matTooltip="Disburse"
matTooltipPosition="above" *mifosxHasPermission="'DISBURSE_LOAN'"
(click)="routeEdit($event)" [routerLink]="['../','loans', element.id, 'actions', 'disburse']">
(click)="routeEdit($event)" [routerLink]="['../','loans-accounts', element.id, 'actions', 'Disburse']">
<i class="fa fa-flag"></i>
</button>
</span>
@@ -166,7 +166,7 @@
<tr mat-header-row *matHeaderRowDef="openLoansColumns"></tr>
<tr mat-row *matRowDef="let row; columns: openLoansColumns;"
[routerLink]="['../', 'loans', row.id, 'general']" class="select-row"></tr>
[routerLink]="['../', 'loans-accounts', row.id, 'general']" class="select-row"></tr>
</table>
@@ -215,7 +215,7 @@
<tr mat-header-row *matHeaderRowDef="closedLoansColumns"></tr>
<tr mat-row *matRowDef="let row; columns: closedLoansColumns;"
[routerLink]="['../', 'loans', row.id, 'general']" class="select-row"></tr>
[routerLink]="['../', 'loans-accounts', row.id, 'general']" class="select-row"></tr>
</table>
src/app/clients/clients-view/general-tab/general-tab.component.ts
+1 -1
View File
@@ -148,7 +148,7 @@ export class GeneralTabComponent {
*/
routeTransferFund(loanId: any) {
const queryParams: any = { loanId: loanId, accountType: 'fromloans' };
this.router.navigate(['../', 'loans', loanId, 'transfer-funds', 'make-account-transfer'], { relativeTo: this.route, queryParams: queryParams });
this.router.navigate(['../', 'loans-accounts', loanId, 'transfer-funds', 'make-account-transfer'], { relativeTo: this.route, queryParams: queryParams });
}
}