feat: add permissions (#1198)

- add permission in centers, loans, recurring deposits, products and account transfer module
- add charges action in loans view

src/app/loans/common-resolvers/loan-details-charges.resolver.ts

@@ -24,7 +24,7 @@ export class LoanDetailsChargesResolver implements Resolve<Object> {
      * @returns {Observable<any>}
      */
     resolve(route: ActivatedRouteSnapshot): Observable<any> {
-        const loanId = route.parent.paramMap.get('loanId');
+        const loanId = route.parent.parent.paramMap.get('loanId');
         return this.loansService.getLoanAccountAssociationDetails(loanId);
     }
 

src/app/loans/common-resolvers/loans-account-charge.resolver.ts

@@ -0,0 +1,33 @@
+/** Angular Imports */
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+/** Custom Services */
+import { LoansService } from '../loans.service';
+
+/**
+ * Loans Account Charge data resolver.
+ */
+@Injectable()
+export class LoansAccountChargeResolver implements Resolve<Object> {
+
+    /**
+     * @param {LoansService} LoansService Loans service.
+     */
+    constructor(private loansService: LoansService) { }
+
+    /**
+     * Returns the Loans Account Charge data.
+     * @param {ActivatedRouteSnapshot} route Route Snapshot
+     * @returns {Observable<any>}
+     */
+    resolve(route: ActivatedRouteSnapshot): Observable<any> {
+        const loanAccountId = route.parent.parent.paramMap.get('loanId');
+        const chargeId = route.paramMap.get('id');
+        return this.loansService.getLoansAccountCharge(loanAccountId, chargeId);
+    }
+
+}

src/app/loans/custom-dialog/loan-account-load-documents-dialog/loan-account-load-documents-dialog.component.html

@@ -20,7 +20,7 @@
 
     <mat-dialog-actions align="end">
       <button mat-raised-button mat-dialog-close>Cancel</button>
-      <button mat-raised-button color="primary" [disabled]="!uploadDocumentForm.valid"
+      <button mat-raised-button color="primary" [disabled]="!uploadDocumentForm.valid" *mifosxHasPermission="'CREATE_DOCUMENT'"
         [mat-dialog-close]="{data: {name: uploadDocumentForm.value.name, description: uploadDocumentForm.value.description, file: uploadDocumentForm.value.file} }">Confirm</button>
     </mat-dialog-actions>
 

src/app/loans/loans-routing.module.ts

@@ -35,6 +35,8 @@ import { LoanActionButtonResolver } from './common-resolvers/loan-action-button.
 import { LoansAccountTemplateResolver } from './common-resolvers/loans-account-template.resolver';
 import { LoanDocumentsResolver } from './common-resolvers/loan-documents.resolver';
 import { LoansAccountAndTemplateResolver } from './common-resolvers/loans-account-and-template.resolver';
+import { LoansAccountChargeResolver } from './common-resolvers/loans-account-charge.resolver';
+import { ViewChargeComponent } from './loans-view/view-charge/view-charge.component';
 
 /** Loans Route. */
 const routes: Routes = [
@@ -128,11 +130,24 @@ const routes: Routes = [
             },
             {
               path: 'charges',
-              component: ChargesTabComponent,
-              data: { title: extract('Charges'), breadcrumb: 'Charges', routeParamBreadcrumb: false },
-              resolve: {
-                loanDetailsAssociationData: LoanDetailsChargesResolver
-              }
+              data: { title: extract('Loans Account Charges'), breadcrumb: 'Charges', routeParamBreadcrumb: false },
+              children: [
+                {
+                  path: '',
+                  component: ChargesTabComponent,
+                  resolve: {
+                    loanDetailsAssociationData: LoanDetailsChargesResolver
+                  }
+                },
+                {
+                  path: ':id',
+                  data: { routeParamBreadcrumb: 'id' },
+                  component: ViewChargeComponent,
+                  resolve: {
+                    loansAccountCharge: LoansAccountChargeResolver
+                  }
+                }
+              ]
             },
             {
               path: 'loan-documents',
@@ -206,7 +221,8 @@ const routes: Routes = [
     LoanActionButtonResolver,
     LoansAccountTemplateResolver,
     LoanDocumentsResolver,
-    LoansAccountAndTemplateResolver
+    LoansAccountAndTemplateResolver,
+    LoansAccountChargeResolver
   ]
 })
 

src/app/loans/loans-view/charges-tab/charges-tab.component.html

@@ -1,4 +1,4 @@
-<div class="container">
+<div class="tab-container">
 
     <table mat-table [dataSource]="dataSource" matSort>
 
@@ -52,24 +52,30 @@
 
       <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> Actions </th>
-        <td mat-cell *matCellDef="let charge"> 
-          <button class="charges-action-button" mat-raised-button color="primary" *ngIf="status === 'Submitted and pending approval'">
-            <i class="fa fa-edit" matTooltip="edit"></i>
-          </button>
-          <button class="charges-action-button" mat-raised-button color="warning" *ngIf="status === 'Submitted and pending approval'">
-            <i class="fa fa-trash-o" matTooltip="delete"></i>
-          </button>
-          <button class="charges-action-button" mat-raised-button color="primary" *ngIf="!charge.actionFlag">
-            <i class="fa fa-flag"></i>
-          </button>
-          <button class="charges-action-button" mat-raised-button color="success" *ngIf="charge.chargePayable && status=='Active'">
-            Pay
-          </button>
+        <td mat-cell *matCellDef="let charge">
+          <span *ngIf="status === 'Submitted and pending approval'">
+            <button class="account-action-button" mat-raised-button color="primary" matTooltip="Edit Charge"
+              (click)="routeEdit($event); editCharge(charge)">
+              <i class="fa fa-pencil"></i>
+            </button>
+            <button class="account-action-button" mat-raised-button color="warn" matTooltip="Delete Charge"
+              (click)="routeEdit($event); deleteCharge(charge.id)">
+              <i class="fa fa-trash"></i>
+            </button>
+          </span>
+            <button class="account-action-button" mat-raised-button color="primary" matTooltip="Pay Charge" *ngIf="charge.chargePayable && status=='Active'"
+               (click)="routeEdit($event); payCharge(charge.id)">
+              <i class="fa fa-dollar"></i>
+            </button>
+            <button class="account-action-button" mat-raised-button color="primary" matTooltip="Waive Charge" *ngIf="!charge.actionFlag"
+              (click)="routeEdit($event); waiveCharge(charge.id)">
+              <i class="fa fa-flag"></i>
+            </button>
         </td>
       </ng-container>
 
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-      <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns;" class="select-row" [routerLink]="[row.id]"></tr>
     </table>
 
     <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>

src/app/loans/loans-view/charges-tab/charges-tab.component.scss

@@ -1,4 +1,20 @@
-table {
+.tab-container {
+  padding: 1%;
+  margin: 1%;
+  h3 {
+    margin:1% auto;
+  }
+  table {
     width: 100%;
     margin-top: 3%;
+    .account-action-button{
+      min-width: 26px;
+      padding: 0 6px;
+      margin: 4px;
+      line-height: 25px;
+    }
+    .select-row:hover {
+      cursor: pointer;
+    }
+  }
 }

src/app/loans/loans-view/charges-tab/charges-tab.component.ts

@@ -1,7 +1,21 @@
 /** Angular Imports */
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MatDialog, MatTableDataSource, MatTable, MatPaginator, MatSort } from '@angular/material';
+import { DatePipe } from '@angular/common';
+
+/** Custom Services */
+import { LoansService } from 'app/loans/loans.service';
+
+/** Custom Dialogs */
+import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
+import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
+import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
+
+/** Custom Models */
+import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
+import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
 
 @Component({
   selector: 'mifosx-charges-tab',
@@ -30,7 +44,11 @@ export class ChargesTabComponent implements OnInit {
    * Retrieves the loans data from `resolve`.
    * @param {ActivatedRoute} route Activated Route.
    */
-  constructor(private route: ActivatedRoute) {
+  constructor(private loansService: LoansService,
+              private route: ActivatedRoute,
+              private datePipe: DatePipe,
+              private router: Router,
+              public dialog: MatDialog) {
     this.route.data.subscribe(( data: { loanDetailsAssociationData: any }) => {
       this.loanDetails = data.loanDetailsAssociationData;
     });
@@ -54,4 +72,139 @@ export class ChargesTabComponent implements OnInit {
     this.dataSource.sort = this.sort;
   }
 
+  /**
+   * Pays the charge.
+   * @param {any} chargeId Charge Id
+   */
+  payCharge(chargeId: any) {
+    const formfields: FormfieldBase[] = [
+      new InputBase({
+        controlName: 'amount',
+        label: 'Amount',
+        value: '',
+        type: 'number',
+        required: true
+      }),
+      new DatepickerBase({
+        controlName: 'dueDate',
+        label: 'Payment Date',
+        value: '',
+        type: 'date',
+        required: true
+      })
+    ];
+    const data = {
+      title: `Pay Charge ${chargeId}`,
+      layout: { addButtonText: 'Confirm' },
+      formfields: formfields
+    };
+    const payChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+    payChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.data) {
+        const locale = 'en';
+        const dateFormat = 'dd MMMM yyyy';
+        const dataObject = {
+          ...response.data.value,
+          dueDate: this.datePipe.transform(response.data.value.dueDate, dateFormat),
+          dateFormat,
+          locale
+        };
+        this.loansService.executeLoansAccountChargesCommand(this.loanDetails.id, 'paycharge', dataObject, chargeId)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Waive's the charge
+   * @param {any} chargeId Charge Id
+   */
+  waiveCharge(chargeId: any) {
+    const waiveChargeDialogRef = this.dialog.open(ConfirmationDialogComponent, { data: { heading: 'Waive Charge', dialogContext: `Are you sure you want to waive charge with id: ${chargeId}`, type: 'Basic' } });
+    waiveChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.confirm) {
+        this.loansService.executeLoansAccountChargesCommand(this.loanDetails.id, 'waive', {}, chargeId)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Edits the charge
+   * @param {any} charge Charge
+   */
+  editCharge(charge: any) {
+    const formfields: FormfieldBase[] = [
+      new InputBase({
+        controlName: 'amount',
+        label: 'Amount',
+        value: charge.amount || charge.amountOrPercentage,
+        type: 'number',
+        required: true
+      })
+    ];
+    const data = {
+      title: `Edit Charge ${charge.id}`,
+      layout: { addButtonText: 'Confirm' },
+      formfields: formfields
+    };
+    const editChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+    editChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.data) {
+        const locale = 'en';
+        const dateFormat = 'dd MMMM yyyy';
+        const dataObject = {
+          ...response.data.value,
+          dateFormat,
+          locale
+        };
+        this.loansService.editLoansAccountCharge(this.loanDetails.id, dataObject, charge.id)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Deletes the charge
+   * @param {any} chargeId Charge Id
+   */
+  deleteCharge(chargeId: any) {
+    const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
+      data: { deleteContext: `charge id:${chargeId}` }
+    });
+    deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.delete) {
+        this.loansService.deleteLoansAccountCharge(this.loanDetails.id, chargeId)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Stops the propagation to view charge page.
+   * @param $event Mouse Event
+   */
+  routeEdit($event: MouseEvent) {
+    $event.stopPropagation();
+  }
+
+  /**
+   * Refetches data fot the component
+   * TODO: Replace by a custom reload component instead of hard-coded back-routing.
+   */
+  private reload() {
+    const clientId = this.loanDetails.clientId;
+    const url: string = this.router.url;
+    this.router.navigateByUrl(`/clients/${clientId}/loans`, { skipLocationChange: true })
+      .then(() => this.router.navigate([url]));
+  }
+
 }

src/app/loans/loans-view/loan-account-actions/add-loan-charge/add-loan-charge.component.html

@@ -48,7 +48,7 @@
 
     <mat-card-actions fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center">
       <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
-      <button mat-raised-button color="primary" [disabled]="!loanChargeForm.valid">Submit</button>
+      <button mat-raised-button color="primary" [disabled]="!loanChargeForm.valid" *mifosxHasPermission="'CREATE_LOANCHARGE'">Submit</button>
     </mat-card-actions>
 
   </mat-card-content>

src/app/loans/loans-view/loan-account-actions/view-guarantors/view-guarantors.component.html

@@ -150,7 +150,7 @@
       <th mat-header-cell *matHeaderCellDef> Action </th>
       <td mat-cell *matCellDef="let guarantor; let id = index">
         <span *ngIf="!guarantor.guarantorFundingDetails">
-          <button mat-raised-button class="account-action-button" color="primary" (click)="viewGuarantorDetails(guarantor)">
+          <button mat-raised-button class="account-action-button" color="primary" *mifosxHasPermission="'READ_SAVINGSACCOUNT'" (click)="viewGuarantorDetails(guarantor)">
             <fa-icon icon="eye"></fa-icon>&nbsp;&nbsp;
           </button>
           <button mat-raised-button class="account-action-button" color="primary" *ngIf="guarantor.status && guarantor.guarantorType.id == 3 && guarantor.id">

src/app/loans/loans-view/view-charge/view-charge.component.html

@@ -0,0 +1,119 @@
+<div *ngIf="loansAccountData.status.value === 'Active' && chargeData.amountOutstanding !== 0"
+  fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
+    <button mat-raised-button color="accent" *mifosxHasPermission="'PAY_SAVINGSACCOUNTCHARGE'" (click)="payCharge()">
+      <fa-icon icon="dollar-sign"></fa-icon>&nbsp;&nbsp;
+      Pay
+    </button>
+    <button mat-raised-button color="primary" *mifosxHasPermission="'WAIVE_SAVINGSACCOUNTCHARGE'" (click)="waiveCharge()">
+      <fa-icon icon="flag"></fa-icon>&nbsp;&nbsp;
+      Waive
+    </button>
+</div>
+
+<div *ngIf="loansAccountData.status.value === 'Submitted and pending approval'"
+  fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
+    <button mat-raised-button color="primary" *mifosxHasPermission="'UPDATE_SAVINGSACCOUNTCHARGE'" (click)="editCharge()">
+      <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
+      Edit
+    </button>
+    <button mat-raised-button color="warn" *mifosxHasPermission="'DELETE_SAVINGSACCOUNTCHARGE'" (click)="deleteCharge()">
+      <fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
+      Delete
+    </button>
+</div>
+
+<div class="container">
+
+  <mat-card>
+
+    <mat-card-content>
+
+      <div fxLayout="row wrap" class="content">
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Name
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.name }}
+        </div>
+        
+        <div fxFlex="50%" class="mat-body-strong">
+          Charge Type
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.penalty ? 'Penalty' : 'Fees' }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Currency
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.currency.displayLabel }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Payment due at
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.chargeTimeType.value }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Payment due as of
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.dueDate | date }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Calculation Type
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.chargeCalculationType.value }}
+        </div>
+        
+        <div fxFlex="50%" class="mat-body-strong">
+          Due
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.amount }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Paid
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.amountPaid }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Waived
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.amountWaived }}
+        </div>
+
+        <div fxFlex="50%" class="mat-body-strong">
+          Outstanding
+        </div>
+
+        <div fxFlex="50%">
+          {{ chargeData.amountOutstanding }}
+        </div>
+
+      </div>
+
+    </mat-card-content>
+
+  </mat-card>
+
+</div>

src/app/loans/loans-view/view-charge/view-charge.component.scss

@@ -0,0 +1,10 @@
+.container {
+  max-width: 37rem;
+  
+  .content {
+    div {
+      margin: 1rem 0;
+      word-wrap: break-word;
+    }
+  }
+}

src/app/loans/loans-view/view-charge/view-charge.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ViewChargeComponent } from './view-charge.component';
+
+describe('ViewChargeComponent', () => {
+  let component: ViewChargeComponent;
+  let fixture: ComponentFixture<ViewChargeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewChargeComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ViewChargeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/loans/loans-view/view-charge/view-charge.component.ts

@@ -0,0 +1,179 @@
+/** Angular Imports */
+import { Component } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MatDialog } from '@angular/material';
+import { DatePipe } from '@angular/common';
+
+/** Custom Services */
+import { LoansService } from 'app/loans/loans.service';
+
+/** Custom Dialogs */
+import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
+import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
+import { ConfirmationDialogComponent } from 'app/shared/confirmation-dialog/confirmation-dialog.component';
+
+/** Custom Models */
+import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
+import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
+
+/**
+ * View Charge Component.
+ */
+@Component({
+  selector: 'mifosx-view-charge',
+  templateUrl: './view-charge.component.html',
+  styleUrls: ['./view-charge.component.scss']
+})
+export class ViewChargeComponent {
+
+  /** Charge data. */
+  chargeData: any;
+  /** Loans Account Data */
+  loansAccountData: any;
+
+  /**
+   * Retrieves the Charge data from `resolve`.
+   * @param {LoansService} loansService Loans Service
+   * @param {ActivatedRoute} route Activated Route.
+   * @param {Router} router Router for navigation.
+   * @param {MatDialog} dialog Dialog reference.
+   * @param {DatePipe} datePipe DatePipe.
+   */
+  constructor(private loansService: LoansService,
+              private route: ActivatedRoute,
+              private datePipe: DatePipe,
+              private router: Router,
+              public dialog: MatDialog) {
+    this.route.data.subscribe((data: { loansAccountCharge: any }) => {
+      this.chargeData = data.loansAccountCharge;
+    });
+    this.route.parent.parent.data.subscribe((data: { loanDetailsData: any }) => {
+      this.loansAccountData = data.loanDetailsData;
+    });
+  }
+
+  /**
+   * Pays the charge.
+   */
+  payCharge() {
+    const formfields: FormfieldBase[] = [
+      new InputBase({
+        controlName: 'amount',
+        label: 'Amount',
+        value: '',
+        type: 'number',
+        required: true
+      }),
+      new DatepickerBase({
+        controlName: 'dueDate',
+        label: 'Payment Date',
+        value: '',
+        type: 'date',
+        required: true
+      })
+    ];
+    const data = {
+      title: 'Pay Charge',
+      layout: { addButtonText: 'Confirm' },
+      formfields: formfields
+    };
+    const payChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+    payChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.data) {
+        const locale = 'en';
+        const dateFormat = 'dd MMMM yyyy';
+        const dataObject = {
+          ...response.data.value,
+          dueDate: this.datePipe.transform(response.data.value.dueDate, dateFormat),
+          dateFormat,
+          locale
+        };
+        this.loansService.executeLoansAccountChargesCommand(this.chargeData.accountId, 'paycharge', dataObject, this.chargeData.id)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Waive's the charge
+   */
+  waiveCharge() {
+    const waiveChargeDialogRef = this.dialog.open(ConfirmationDialogComponent, { data: { heading: 'Waive Charge', dialogContext: `Are you sure you want to waive charge with id: ${this.chargeData.id}`, type: 'Basic' } });
+    waiveChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.confirm) {
+        this.loansService.executeLoansAccountChargesCommand(this.chargeData.accountId, 'waive', {}, this.chargeData.id)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Edits the charge
+   */
+  editCharge() {
+    const formfields: FormfieldBase[] = [
+      new InputBase({
+        controlName: 'amount',
+        label: 'Amount',
+        value: this.chargeData.amount || this.chargeData.amountOrPercentage,
+        type: 'number',
+        required: true
+      })
+    ];
+    const data = {
+      title: 'Edit Charge',
+      layout: { addButtonText: 'Confirm' },
+      formfields: formfields
+    };
+    const editChargeDialogRef = this.dialog.open(FormDialogComponent, { data });
+    editChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.data) {
+        const locale = 'en';
+        const dateFormat = 'dd MMMM yyyy';
+        const dataObject = {
+          ...response.data.value,
+          dateFormat,
+          locale
+        };
+        this.loansService.editLoansAccountCharge(this.loansAccountData.id, dataObject, this.chargeData.id)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Deletes the charge
+   */
+  deleteCharge() {
+    const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
+      data: { deleteContext: `charge id:${this.chargeData.id}` }
+    });
+    deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.delete) {
+        this.loansService.deleteLoansAccountCharge(this.loansAccountData.id, this.chargeData.id)
+          .subscribe(() => {
+            this.reload();
+          });
+      }
+    });
+  }
+
+  /**
+   * Refetches data fot the component
+   * TODO: Replace by a custom reload component instead of hard-coded back-routing.
+   */
+  private reload() {
+    const clientId = this.loansAccountData.clientId;
+    const url: string = this.router.url.replace(`/${this.chargeData.id}`, '');
+    this.router.navigateByUrl(`/clients/${clientId}/loansaccounts`, {skipLocationChange: true})
+      .then(() => this.router.navigate([url]));
+  }
+
+}

src/app/loans/loans.module.ts

@@ -51,16 +51,17 @@ import { WithdrawnByClientComponent } from './loans-view/loan-account-actions/wi
 import { UndoDisbursalComponent } from './loans-view/loan-account-actions/undo-disbursal/undo-disbursal.component';
 import { AddCollateralComponent } from './loans-view/loan-account-actions/add-collateral/add-collateral.component';
 import { LoanDocumentsTabComponent } from './loans-view/loan-documents-tab/loan-documents-tab.component';
+import { ViewChargeComponent } from './loans-view/view-charge/view-charge.component';
+import { StandingInstructionsTabComponent } from './loans-view/standing-instructions-tab/standing-instructions-tab.component';
+import { EditLoansAccountComponent } from './edit-loans-account/edit-loans-account.component';
+import { LoanScreenReportsComponent } from './loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component';
+import { ApproveLoanComponent } from './loans-view/loan-account-actions/approve-loan/approve-loan.component';
 
 /** Dialog Components */
 import { LoansAccountViewGuarantorDetailsDialogComponent } from './custom-dialog/loans-account-view-guarantor-details-dialog/loans-account-view-guarantor-details-dialog.component';
 import { LoansAccountAddCollateralDialogComponent } from './custom-dialog/loans-account-add-collateral-dialog/loans-account-add-collateral-dialog.component';
 import { LoansConfirmationDialogBoxComponent } from './custom-dialog/loans-confirmation-dialog-box/loans-confirmation-dialog-box.component';
 import { LoanAccountLoadDocumentsDialogComponent } from './custom-dialog/loan-account-load-documents-dialog/loan-account-load-documents-dialog.component';
-import { StandingInstructionsTabComponent } from './loans-view/standing-instructions-tab/standing-instructions-tab.component';
-import { EditLoansAccountComponent } from './edit-loans-account/edit-loans-account.component';
-import { LoanScreenReportsComponent } from './loans-view/loan-account-actions/loan-screen-reports/loan-screen-reports.component';
-import { ApproveLoanComponent } from './loans-view/loan-account-actions/approve-loan/approve-loan.component';
 
 /**
  * Loans Module
@@ -119,7 +120,8 @@ import { ApproveLoanComponent } from './loans-view/loan-account-actions/approve-
     StandingInstructionsTabComponent,
     EditLoansAccountComponent,
     LoanScreenReportsComponent,
-    ApproveLoanComponent
+    ApproveLoanComponent,
+    ViewChargeComponent
   ],
   entryComponents: [
     LoansAccountAddCollateralDialogComponent,

src/app/loans/loans.service.ts

@@ -364,4 +364,44 @@ export class LoansService {
     return this.http.get(`/loans/${loanId}/guarantors/accounts/template`, { params: httpParams });
   }
 
+  /**
+   * @param {string} accountId loans account Id
+   * @param {string} chargeId loans charge Id
+   * @returns {Observable<any>}
+   */
+  getLoansAccountCharge(accountId: string, chargeId: string): Observable<any> {
+    return this.http.get(`/loans/${accountId}/charges/${chargeId}`);
+  }
+
+  /**
+   * @param {string} accountId Loans Account Id
+   * @param {string} command Command
+   * @param {any} data Data
+   * @param {string} chargeId Charge Id
+   * @returns {Observable<any>}
+   */
+  executeLoansAccountChargesCommand(accountId: string, command: string, data: any, chargeId: any): Observable<any> {
+    const httpParams = new HttpParams().set('command', command);
+    return this.http.post(`/loans/${accountId}/charges/${chargeId}`, data, { params: httpParams });
+  }
+
+  /**
+   * @param {string} accountId  Loans Account Id
+   * @param {any} data Charge Data
+   * @param {any} chargeId Charge Id
+   * @returns {Observable<any>}
+   */
+  editLoansAccountCharge(accountId: string, data: any, chargeId: any): Observable<any> {
+    return this.http.put(`/loans/${accountId}/charges/${chargeId}`, data);
+  }
+
+  /**
+   * @param {string} accountId  Loans Account Id
+   * @param {any} chargeId Charge Id
+   * @returns {Observable<any>}
+   */
+  deleteLoansAccountCharge(accountId: string, chargeId: any): Observable<any> {
+    return this.http.delete(`/loans/${accountId}/charges/${chargeId}`);
+  }
+
 }