WEB-95 Fix problems with GLIM application: saved total ,Moratorium, Overdue Charges

Author: JaySoni1

src/app/loans/glim-account/create-glim-account/create-glim-account.component.ts

@@ -175,37 +175,36 @@ export class CreateGlimAccountComponent {
     };
   }
 
-  setData(client: any, totalLoan: number): any {
+  setData(client: any, totalLoan: number, isParent?: boolean): any {
     const locale = this.settingsService.language.code;
     const dateFormat = this.settingsService.dateFormat;
     // const monthDayFormat = 'dd MMMM';
-    const data = {
+    const data: any = {
       ...this.loansAccount,
       charges: this.loansAccount.charges.map((charge: any) => ({
         chargeId: charge.id,
         amount: charge.amount
       })),
       clientId: client.id,
-      totalLoan: totalLoan,
       loanType: 'glim',
       amortizationType: 1,
-      isParentAccount: true,
       principal: client.principal,
       syncDisbursementWithMeeting: false,
       expectedDisbursementDate: this.dateUtils.formatDate(this.loansAccount.expectedDisbursementDate, dateFormat),
       submittedOnDate: this.dateUtils.formatDate(this.loansAccount.submittedOnDate, dateFormat),
-      dateFormat,
-      // monthDayFormat,
-      locale
+      dateFormat: dateFormat,
+      locale: locale,
+      groupId: this.loansAccountTemplate.group.id
     };
-    data.groupId = this.loansAccountTemplate.group.id;
-
+    if (isParent) {
+      data.totalLoan = totalLoan;
+      data.isParentAccount = true;
+    }
     delete data.principalAmount;
     // TODO: 2025-03-17: Apparently (?!) unsupported for GLIM
     delete data.allowPartialPeriodInterestCalculation;
     delete data.multiDisburseLoan;
     delete data.isFloatingInterestRate;
-
     return JSON.stringify(data);
   }
 
@@ -214,12 +213,22 @@ export class CreateGlimAccountComponent {
     const requestData = [];
     const memberSelected = this.selectedMembers.selectedMembers;
     const totalLoan = this.totalLoanAmount();
+    requestData.push({
+      requestId: '0',
+      method: 'POST',
+      relativeUrl: 'loans',
+      body: this.setData(
+        { id: this.loansAccountTemplate.group.id, principal: totalLoan, isParentAccount: true },
+        totalLoan,
+        true
+      )
+    });
     for (let index = 0; index < memberSelected.length; index++) {
       requestData.push({
-        requestId: index.toString(),
+        requestId: (index + 1).toString(),
         method: 'POST',
         relativeUrl: 'loans',
-        body: this.setData(memberSelected[index], totalLoan)
+        body: this.setData(memberSelected[index], totalLoan, false)
       });
     }
     return requestData;
@@ -234,27 +243,6 @@ export class CreateGlimAccountComponent {
     return total;
   }
 
-  /**
-   * Creates a new GLIM account.
-   */
-  submit() {
-    const data = this.buildRequestData();
-    this.loansService.createGlimAccount(data).subscribe((response: any) => {
-      const body = JSON.parse(response[0].body);
-      if (body.glimId) {
-        this.router.navigate(
-          [
-            '../',
-            body.glimId
-          ],
-          { relativeTo: this.route }
-        );
-      } else {
-        this.notify(body, data);
-      }
-    });
-  }
-
   notify(body: any, data: any) {
     let message = body.defaultUserMessage + ' ';
     while (body.errors?.length > 0) message += body.errors.pop().developerMessage + ' ';

src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html

@@ -39,7 +39,13 @@
       <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
       <td mat-cell *matCellDef="let charge">
         {{ charge.amount }}
-        <button mat-icon-button color="primary" (click)="editChargeAmount(charge)">
+        <button
+          mat-icon-button
+          color="primary"
+          (click)="editChargeAmount(charge)"
+          type="button"
+          aria-label="Edit charge amount"
+        >
           <fa-icon icon="pen"></fa-icon>
         </button>
       </td>
@@ -84,6 +90,8 @@
             charge.chargeTimeType.value === 'Specified due date'
           "
           (click)="editChargeDate(charge)"
+          type="button"
+          aria-label="Edit charge date"
         >
           <fa-icon icon="pen"></fa-icon>
         </button>
@@ -93,7 +101,7 @@
     <ng-container matColumnDef="action">
       <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
       <td mat-cell *matCellDef="let charge">
-        <button mat-icon-button color="warn" (click)="deleteCharge(charge)">
+        <button mat-icon-button color="warn" (click)="deleteCharge(charge)" type="button" aria-label="Delete charge">
           <fa-icon icon="trash"></fa-icon>
         </button>
       </td>
@@ -120,7 +128,18 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Overdue Charges' | translate }}</h
 
     <ng-container matColumnDef="amount">
       <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
-      <td mat-cell *matCellDef="let charge">{{ charge.amount | formatNumber }}</td>
+      <td mat-cell *matCellDef="let charge">
+        {{ charge.amount | formatNumber }}
+        <button
+          mat-icon-button
+          color="primary"
+          (click)="editOverdueChargeAmount(charge)"
+          type="button"
+          aria-label="Edit overdue charge amount"
+        >
+          <fa-icon icon="pen"></fa-icon>
+        </button>
+      </td>
     </ng-container>
 
     <ng-container matColumnDef="collectedon">
@@ -134,15 +153,15 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Overdue Charges' | translate }}</h
 </div>
 
 <div class="layout-row responsive-column align-center gap-2px margin-t">
-  <button mat-raised-button matStepperPrevious>
+  <button mat-raised-button matStepperPrevious type="button">
     <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
     {{ 'labels.buttons.Previous' | translate }}
   </button>
-  <button mat-raised-button matStepperNext>
+  <button mat-raised-button matStepperNext type="button">
     {{ 'labels.buttons.Next' | translate }}
     <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
   </button>
-  <button mat-raised-button *ngIf="loanId" [routerLink]="['../', 'general']">
+  <button mat-raised-button *ngIf="loanId" [routerLink]="['../', 'general']" type="button">
     {{ 'labels.buttons.Cancel' | translate }}
   </button>
 </div>

src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts

@@ -303,6 +303,33 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges {
     });
   }
 
+  editOverdueChargeAmount(charge: any) {
+    const formfields: FormfieldBase[] = [
+      new InputBase({
+        controlName: 'amount',
+        label: 'Amount',
+        value: charge.amount,
+        type: 'number',
+        required: false
+      })
+
+    ];
+    const data = {
+      title: 'Edit Overdue Charge Amount',
+      layout: { addButtonText: 'Confirm' },
+      formfields: formfields
+    };
+    const editNoteDialogRef = this.dialog.open(FormDialogComponent, { data });
+    editNoteDialogRef.afterClosed().subscribe((response: any) => {
+      if (response.data) {
+        const newCharge = { ...charge, amount: response.data.value.amount };
+        this.overDueChargesDataSource.splice(this.overDueChargesDataSource.indexOf(charge), 1, newCharge);
+        this.overDueChargesDataSource = this.overDueChargesDataSource.concat([]);
+      }
+    });
+    this.pristine = false;
+  }
+
   get isValid() {
     return true;
     // !this.activeClientMembers ||