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

Manage Report views updated (#1635)

Browse Source 
Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>
This commit is contained in:
José Alberto Hernández
2023-01-09 00:26:46 -06:00
committed by GitHub
co-authored by Jose Alberto Hernandez
parent 3a3d96222e
commit 1bccd96c37
9 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/loans/loans-view/loans-view.component.html
+3
View File
@@ -48,6 +48,9 @@
<span *ngIf="loanDetailsData.inArrears">Arrears Since: {{loanDetailsData.summary.overdueSinceDate | <span *ngIf="loanDetailsData.inArrears">Arrears Since: {{loanDetailsData.summary.overdueSinceDate |
dateFormat}} dateFormat}}
</span> </span>
<span *ngIf="loanDetailsData.totalOverpaid && loanDetailsData.totalOverpaid > 0">
Overpaid By: {{loanDetailsData.currency.displaySymbol}} {{loanDetailsData.totalOverpaid | number}}
</span>
</div> </div>
<span fxFlex="auto"></span> <span fxFlex="auto"></span>
src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
+3 -3
View File
@@ -2,16 +2,16 @@
*ngIf="!(transactionData.type.contra)"> *ngIf="!(transactionData.type.contra)">
<span *mifosxHasPermission="'ADJUST_LOAN'"> <span *mifosxHasPermission="'ADJUST_LOAN'">
<button mat-raised-button color="primary" [routerLink]="'edit'" [disabled]="!allowEdition"> <button mat-raised-button color="primary" [routerLink]="'edit'" [disabled]="!allowEdition">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;{{ 'Edit' | translate }} <fa-icon icon="edit" class="m-r-10"></fa-icon>{{ 'Edit' | translate }}
</button> </button>
<button mat-raised-button color="warn" (click)="undoTransaction()" [disabled]="!allowUndo"> <button mat-raised-button color="warn" (click)="undoTransaction()" [disabled]="!allowUndo">
<fa-icon icon="undo"></fa-icon>&nbsp;&nbsp;{{ 'Undo' | translate }} <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'Undo' | translate }}
</button> </button>
</span> </span>
<span *mifosxHasPermission="'CHARGEBACK_LOAN'"> <span *mifosxHasPermission="'CHARGEBACK_LOAN'">
<button mat-raised-button color="warn" [disabled]="!allowChargeback" (click)="chargebackTransaction()"> <button mat-raised-button color="warn" [disabled]="!allowChargeback" (click)="chargebackTransaction()">
<fa-icon icon="undo"></fa-icon>&nbsp;&nbsp;{{ 'Chargeback' | translate }} <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'Chargeback' | translate }}
</button> </button>
</span> </span>
</div> </div>
src/app/loans/loans-view/view-charge/view-charge.component.html
+9 -9
View File
@@ -1,18 +1,18 @@
<div *ngIf="loansAccountData.status.value === 'Active' && chargeData.amountOutstanding !== 0" fxLayout="row" <div *ngIf="loansAccountData.status.value === 'Active' && chargeData.amountOutstanding !== 0" fxLayout="row"
fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20"> fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()"> <button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()">
<fa-icon icon="flag"></fa-icon>&nbsp;&nbsp; <fa-icon icon="flag" class="m-r-10"></fa-icon>
Edit Edit
</button> </button>
<span *ngIf="allowPayCharge"> <span *ngIf="allowPayCharge">
<button mat-raised-button color="accent" *mifosxHasPermission="'PAY_SAVINGSACCOUNTCHARGE'" (click)="payCharge()"> <button mat-raised-button color="accent" *mifosxHasPermission="'PAY_SAVINGSACCOUNTCHARGE'" (click)="payCharge()">
<fa-icon icon="dollar-sign"></fa-icon>&nbsp;&nbsp; <fa-icon icon="dollar-sign" class="m-r-10"></fa-icon>
Pay Pay
</button> </button>
</span> </span>
<span *ngIf="allowWaive"> <span *ngIf="allowWaive">
<button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="waiveCharge()"> <button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="waiveCharge()">
<fa-icon icon="flag"></fa-icon>&nbsp;&nbsp; <fa-icon icon="flag" class="m-r-10"></fa-icon>
Waive Waive
</button> </button>
</span> </span>
@@ -21,11 +21,11 @@
<div *ngIf="loansAccountData.status.value === 'Submitted and pending approval'" fxLayout="row" fxLayoutAlign="end" <div *ngIf="loansAccountData.status.value === 'Submitted and pending approval'" fxLayout="row" fxLayoutAlign="end"
fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20"> fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" *mifosxHasPermission="'UPDATE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()"> <button mat-raised-button color="primary" *mifosxHasPermission="'UPDATE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp; <fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit Edit
</button> </button>
<button mat-raised-button color="warn" *mifosxHasPermission="'DELETE_SAVINGSACCOUNTCHARGE'" (click)="deleteCharge()"> <button mat-raised-button color="warn" *mifosxHasPermission="'DELETE_SAVINGSACCOUNTCHARGE'" (click)="deleteCharge()">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp; <fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete Delete
</button> </button>
</div> </div>
@@ -93,7 +93,7 @@
</div> </div>
<div fxFlex="50%"> <div fxFlex="50%">
{{ chargeData.amount }} {{ chargeData.amount | number }}
</div> </div>
<div fxFlex="50%" class="mat-body-strong"> <div fxFlex="50%" class="mat-body-strong">
@@ -101,7 +101,7 @@
</div> </div>
<div fxFlex="50%"> <div fxFlex="50%">
{{ chargeData.amountPaid }} {{ chargeData.amountPaid | number }}
</div> </div>
<div fxFlex="50%" class="mat-body-strong"> <div fxFlex="50%" class="mat-body-strong">
@@ -109,7 +109,7 @@
</div> </div>
<div fxFlex="50%"> <div fxFlex="50%">
{{ chargeData.amountWaived }} {{ chargeData.amountWaived | number }}
</div> </div>
<div fxFlex="50%" class="mat-body-strong"> <div fxFlex="50%" class="mat-body-strong">
@@ -117,7 +117,7 @@
</div> </div>
<div fxFlex="50%"> <div fxFlex="50%">
{{ chargeData.amountOutstanding }} {{ chargeData.amountOutstanding | number }}
</div> </div>
</div> </div>
src/app/loans/loans-view/view-charge/view-charge.component.ts
+1
View File
@@ -127,6 +127,7 @@ export class ViewChargeComponent {
label: 'Due Date', label: 'Due Date',
value: new Date(this.chargeData.dueDate), value: new Date(this.chargeData.dueDate),
type: 'date', type: 'date',
maxDate: this.settingsService.maxAllowedDate,
required: true required: true
}) })
]; ];
src/app/reports/reports.component.html
-1
View File
@@ -26,7 +26,6 @@
<td mat-cell *matCellDef="let report"> {{ report.reportCategory }} </td> <td mat-cell *matCellDef="let report"> {{ report.reportCategory }} </td>
</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" [routerLink]="['/reports','run', row.reportName]" [queryParams]="{ type: row.reportType, id: row.id }"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;" class="select-row" [routerLink]="['/reports','run', row.reportName]" [queryParams]="{ type: row.reportType, id: row.id }"></tr>
src/app/system/manage-reports/create-report/create-report.component.html
+8 -4
View File
@@ -45,11 +45,16 @@
<mat-form-field fxFlex="40%"> <mat-form-field fxFlex="40%">
<mat-label>Report Category</mat-label> <mat-label>Report Category</mat-label>
<input matInput formControlName="reportCategory"> <mat-select formControlName="reportCategory">
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions"
[value]="reportCategoryType">
{{ reportCategoryType }}
</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<div fxFlex="10%" class="user-report-wrapper"> <div fxFlex="10%" class="user-report-wrapper">
<mat-checkbox class="user-report" labelPosition="before" formControlName="useReport"> <mat-checkbox class="user-report" labelPosition="after" formControlName="useReport">
User Report (UI) User Report (UI)
</mat-checkbox> </mat-checkbox>
</div> </div>
@@ -80,8 +85,7 @@
<p fxFlex="20%" class="mat-title">Report Parameters</p> <p fxFlex="20%" class="mat-title">Report Parameters</p>
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addReportParameter()"> <button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addReportParameter()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp; <fa-icon icon="plus" class="m-r-10"></fa-icon>Add Report Parameter
Add Report Parameter
</button> </button>
</div> </div>
src/app/system/manage-reports/create-report/create-report.component.ts
+2
View File
@@ -46,6 +46,8 @@ export class CreateReportComponent implements OnInit {
/** Sorter for report parameters table. */ /** Sorter for report parameters table. */
@ViewChild(MatSort, { static: true }) sort: MatSort; @ViewChild(MatSort, { static: true }) sort: MatSort;
reportCategoryTypeOptions: string[] = ['Client', 'Loan', 'Savings', 'Fund', 'Accounting'];
/** /**
* Retrieves the report template data from `resolve`. * Retrieves the report template data from `resolve`.
* @param {FormBuilder} formBuilder Form Builder. * @param {FormBuilder} formBuilder Form Builder.
src/app/system/manage-reports/edit-report/edit-report.component.html
+7 -2
View File
@@ -44,11 +44,16 @@
<mat-form-field fxFlex="40%"> <mat-form-field fxFlex="40%">
<mat-label>Report Category</mat-label> <mat-label>Report Category</mat-label>
<input matInput formControlName="reportCategory"> <mat-select formControlName="reportCategory">
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions"
[value]="reportCategoryType">
{{ reportCategoryType }}
</mat-option>
</mat-select>
</mat-form-field> </mat-form-field>
<div fxFlex="10%" class="user-report-wrapper"> <div fxFlex="10%" class="user-report-wrapper">
<mat-checkbox class="user-report" labelPosition="before" formControlName="useReport"> <mat-checkbox class="user-report" labelPosition="after" formControlName="useReport">
User Report (UI) User Report (UI)
</mat-checkbox> </mat-checkbox>
</div> </div>
src/app/system/manage-reports/edit-report/edit-report.component.ts
+2
View File
@@ -46,6 +46,8 @@ export class EditReportComponent implements OnInit {
/** Boolean to check if report parameters data is changed or not. */ /** Boolean to check if report parameters data is changed or not. */
isReportParametersChanged: Boolean = false; isReportParametersChanged: Boolean = false;
reportCategoryTypeOptions: string[] = ['Client', 'Loan', 'Savings', 'Fund', 'Accounting'];
/** Paginator for report parameters table. */ /** Paginator for report parameters table. */
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
/** Sorter for report parameters table. */ /** Sorter for report parameters table. */