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

Fix to upload documents (#1621)

Browse Source 
Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>
This commit is contained in:
José Alberto Hernández
2023-01-03 20:47:10 -06:00
committed by GitHub
co-authored by Jose Alberto Hernandez
parent 9d19d1b061
commit 28d5d7595f
14 changed files with 227 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/loans/loans-view/loan-documents-tab/loan-documents-tab.component.html
+42 -49
View File
@@ -1,59 +1,52 @@
<div class="tab-container mat-typography">
<div>
<div fxLayout="column" fxFlex="100%">
<div fxLayout="row" fxLayoutAlign="flex-end">
<button mat-raised-button color="primary" (click)="uploadDocument()" *ngIf="choice">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Upload
<h3>Documents</h3>
<button mat-raised-button class="f-right" color="primary" (click)="uploadDocument()"
*mifosxHasPermission="'CREATE_DOCUMENT'">
<fa-icon icon="plus" class="m-r-10"></fa-icon>Add
</button>
<table mat-table #documentsTable [dataSource]="dataSource" matSort>
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let document"> {{ document.name }} </td>
</ng-container>
<ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Description </th>
<td mat-cell *matCellDef="let document"> {{ document.description }} </td>
</ng-container>
<ng-container matColumnDef="filename">
<th mat-header-cell *matHeaderCellDef mat-sort-header> File Name </th>
<td mat-cell *matCellDef="let document"> {{ document.fileName }} </td>
</ng-container>
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Actions </th>
<td mat-cell *matCellDef="let document; let index">
<button class="document-action-button" mat-raised-button color="primary">
<fa-icon icon="cloud-download-alt"></fa-icon>
</button>
</div>
</div>
</div>
<ng-container *ngIf="loanDocuments.length > 0">
<button class="document-action-button" mat-raised-button color="primary" *ngIf="document.fileIsImage">
<i class="fa fa-eye"></i>
</button>
<table mat-table #documentsTable [dataSource]="dataSource" matSort>
<button class="document-action-button" mat-raised-button color="warn"
(click)="deleteDocument(document.id, index)">
<fa-icon icon="times"></fa-icon>
</button>
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let document"> {{ document.name }} </td>
</ng-container>
</td>
</ng-container>
<ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Description </th>
<td mat-cell *matCellDef="let document"> {{ document.description }} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<ng-container matColumnDef="filename">
<th mat-header-cell *matHeaderCellDef mat-sort-header> File Name </th>
<td mat-cell *matCellDef="let document"> {{ document.fileName }} </td>
</ng-container>
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Actions </th>
<td mat-cell *matCellDef="let document; let index">
<button class="loan-document-action-button" mat-raised-button color="primary">
<fa-icon icon="cloud-download-alt"></fa-icon>
</button>
<button class="loan-document-action-button" mat-raised-button color="primary" *ngIf="document.fileIsImage">
<i class="fa fa-eye"></i>
</button>
<button class="loan-document-action-button" mat-raised-button color="warn"
(click)="deleteDocument(document.id, index)">
<fa-icon icon="times"></fa-icon>
</button>
</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>
</ng-container>
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
src/app/loans/loans-view/loan-documents-tab/loan-documents-tab.component.scss
+2 -2
View File
@@ -1,12 +1,12 @@
table {
width: 100%;
margin-top: 3%;
.account-action-button{
.document-action-button {
min-width: 26px;
padding: 0 6px;
margin: 4px;
line-height: 25px;
}
}
}
.tab-container {
src/app/loans/loans-view/loan-documents-tab/loan-documents-tab.component.ts
+22 -7
View File
@@ -11,9 +11,9 @@ import { environment } from 'environments/environment';
import { LoansService } from 'app/loans/loans.service';
/** Dialog Components */
import { LoanAccountLoadDocumentsDialogComponent } from 'app/loans/custom-dialog/loan-account-load-documents-dialog/loan-account-load-documents-dialog.component';
import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
import { SettingsService } from 'app/settings/settings.service';
import { UploadDocumentDialogComponent } from 'app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component';
/**
* Overdue charges tab component
@@ -24,7 +24,7 @@ import { SettingsService } from 'app/settings/settings.service';
styleUrls: ['./loan-documents-tab.component.scss']
})
export class LoanDocumentsTabComponent implements OnInit {
@ViewChild('documentsTable') documentsTable: MatTable<Element>;
@ViewChild('documentsTable', { static: true }) documentsTable: MatTable<Element>;
/** Stores the resolved loan documents data */
loanDocuments: any;
@@ -91,11 +91,26 @@ export class LoanDocumentsTabComponent implements OnInit {
}
uploadDocument() {
const uploadLoanDocumentDialogRef = this.dialog.open(LoanAccountLoadDocumentsDialogComponent);
uploadLoanDocumentDialogRef.afterClosed().subscribe((data: any) => {
if (data) {
this.loansService.loadLoanDocument(this.loanDetailsData.id, data)
.subscribe(() => {});
const uploadDocumentDialogRef = this.dialog.open(UploadDocumentDialogComponent, {
data: { documentIdentifier: false, entityType: 'Loan' }
});
uploadDocumentDialogRef.afterClosed().subscribe((dialogResponse: any) => {
if (dialogResponse) {
const formData: FormData = new FormData;
formData.append('name', dialogResponse.fileName);
formData.append('file', dialogResponse.file);
formData.append('description', dialogResponse.description);
this.loansService.loadLoanDocument(this.loanDetailsData.id, formData).subscribe((res: any) => {
this.loanDocuments.push({
id: res.resourceId,
parentEntityType: 'loans',
parentEntityId: this.loanDetailsData.id,
name: dialogResponse.fileName,
description: dialogResponse.description,
fileName: dialogResponse.file.name
});
this.documentsTable.renderRows();
});
}
});
}