From 6108cae1487e434c00c004aa314991ad7c5ffae3 Mon Sep 17 00:00:00 2001
From: Julius Peter Oketayot <juliuspeter441@gmail.com>
Date: Fri, 8 Dec 2023 19:41:22 +0300
Subject: [PATCH] Bug/FBR-488: Approve/Reject Loan Request Fixes

---
 .../loanAccount/EditLoanAccAppController.js   | 20 +++++++++++++++++--
 .../loanAccount/NewLoanAccAppController.js    |  1 -
 app/views/loans/editloanaccount.html          |  8 ++++----
 app/views/loans/newloanaccount.html           | 12 +++++------
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js
index 9ab7759960..afe365811e 100755
--- a/app/scripts/controllers/loanAccount/EditLoanAccAppController.js
+++ b/app/scripts/controllers/loanAccount/EditLoanAccAppController.js
@@ -10,7 +10,6 @@
             scope.restrictDate = new Date();
             scope.date = {};
             scope.rateFlag = false;
-            scope.isIndividualJlgLoanAccount = false;
 
             resourceFactory.loanResource.get({loanId: routeParams.id, template: true, associations: 'charges,collateral,meeting,multiDisburseDetails',staffInSelectedOfficeOnly:true}, function (data) {
                 scope.loanaccountinfo = data;
@@ -27,6 +26,24 @@
                     scope.clientId = data.clientId;
                     scope.clientName = data.clientName;
                     scope.formData.clientId = scope.clientId;
+                    resourceFactory.clientResource.get({clientId: scope.clientId}, function (clientData) {
+                        scope.clientData = clientData;
+                        scope.prequalificationOptions = clientData.clientPrequalifications;
+                        if(scope.loanaccountinfo.prequalificationData && scope.loanaccountinfo.prequalificationData.id){
+                            scope.formData.prequalificationId = scope.loanaccountinfo.prequalificationData.id;
+                            var addExisting = false;
+                            var matchingExists = false
+                            for(var i = 0; i < scope.prequalificationOptions.length; i++){
+                                if(scope.prequalificationOptions[i].id ==  scope.formData.prequalificationId){
+                                    matchingExists = true;
+                                }
+                            }
+                            console.log(matchingExists);
+                            if(!matchingExists){
+                                scope.prequalificationOptions.push(scope.loanaccountinfo.prequalificationData);
+                            }
+                        }
+                    });
                 }
 
                 if (data.group) {
@@ -42,7 +59,6 @@
 
                 if (scope.clientId && scope.groupId) {
                     scope.templateType = 'jlg';
-                    scope.isIndividualJlgLoanAccount = true;
                 }
                 else if (scope.groupId) {
                     scope.templateType = 'group';
diff --git a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
index e41ad419ad..69994decda 100755
--- a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
+++ b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
@@ -3,7 +3,6 @@
         NewLoanAccAppController: function (scope, routeParams, resourceFactory, location,$uibModal, dateFilter, uiConfigService, WizardHandler, translate) {
             scope.previewRepayment = false;
             scope.clientId = routeParams.clientId;
-            scope.isIndividualJlgLoanAccount = location.search().isIndividualJlgLoanAccount;
             scope.groupId = routeParams.groupId;
             scope.restrictDate = new Date();
             scope.formData = {};
diff --git a/app/views/loans/editloanaccount.html b/app/views/loans/editloanaccount.html
index 6a3787c4e6..5c413e8683 100755
--- a/app/views/loans/editloanaccount.html
+++ b/app/views/loans/editloanaccount.html
@@ -16,10 +16,10 @@
         <td class="width14" ng-hide="isIndividualJlgLoanAccount">
             <label>{{ 'label.anchor.prequalifications' | translate }}<span class="required">*</span>:&nbsp;</label>
         </td>
-        <td class="width36 paddedbottom10" ng-hide="isIndividualJlgLoanAccount">
-            <select id="prequailificationId" ng-model="prequailificationId" class="form-control width170px"
-                    ng-options="prequalification.id as prequalification.groupName for prequalification in prequalificationOptions"
-                    value="{{prequalification.id}}" ng-change="prequalificationChange(prequailificationId)">
+        <td class="width36 paddedbottom10">
+            <select id="prequalificationId" ng-model="formData.prequalificationId" class="form-control width170px"
+                    ng-options="prequalification.id as prequalification.prequalificationNumber + ' (' + prequalification.productName + ')' for prequalification in prequalificationOptions"
+                    value="{{prequalification.id}}" ng-change="prequalificationChange(formData.prequalificationId)">
                 <option style="display:none" value="">{{'label.input.select.prequalification' | translate}}</option>
             </select>
         </td>
diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html
index 2028cafa3d..c36d503ccd 100755
--- a/app/views/loans/newloanaccount.html
+++ b/app/views/loans/newloanaccount.html
@@ -20,15 +20,15 @@
                     <hr>
                     <table class="" style="border-spacing: 10px; border-collapse: separate">
                         <tr>
-                            <td class="width14" ng-hide="isIndividualJlgLoanAccount">
+                            <td class="width14">
                                 <label>{{'label.anchor.prequalifications' | translate }}
                                     <span class="required">*</span>:&nbsp;
                                 </label>
                                 <i class="fa fa-question-circle" uib-tooltip="{{'label.tooltip.prequalification' | translate}}"></i>
                             </td>
-                            <td class="width36 paddedbottom20" ng-hide="isIndividualJlgLoanAccount">
-                                <select id="prequalificationId" ng-model="prequalificationId" ng-options="prequalification.id as prequalification.prequalificationNumber for prequalification in prequalificationOptions"
-                                        value="{{prequalification.id}}" ng-change="prequalificationChange(prequalificationId)" class="form-control width170px">
+                            <td class="width36 paddedbottom20">
+                                <select id="prequalificationId" ng-model="formData.prequalificationId" ng-options="prequalification.id as prequalification.prequalificationNumber + ' (' + prequalification.productName + ')' for prequalification in prequalificationOptions"
+                                        value="{{prequalification.id}}" ng-change="prequalificationChange(formData.prequalificationId)" class="form-control width170px">
                                     <option style="display:none" value="">{{'label.input.select.prequalification' | translate}}
                                     </option>
                                 </select>
@@ -42,7 +42,7 @@
                             <td class="width36 paddedbottom20">
                                 <select id="productId" ng-model="formData.productId" class="form-control width170px" ng-options="product.id as product.name for product in products"
                                     value="{{product.id}}" ng-change="loanProductChange(formData.productId)" class="form-control width170px"
-                                    required="required" ng-disabled="!isIndividualJlgLoanAccount">
+                                    required="required" ng-disabled="true">
                                     <option style="display:none" value="">{{'label.selectloanproduct' | translate}}
                                     </option>
                                 </select>
@@ -216,7 +216,7 @@ <h3>{{ 'label.heading.cupolinkage' | translate}}</h3>
                             </td>
                             <td class="width31 paddedbottom20">
                                 <input type="text" class="form-control" id="principal" name="principal" ng-model="formData.principal" number-format required
-                                    late-Validate ng-disabled="!isIndividualJlgLoanAccount"/>&nbsp;{{loanaccountinfo.currency.displaySymbol}}
+                                    late-Validate ng-disabled="true"/>&nbsp;{{loanaccountinfo.currency.displaySymbol}}
                                 <form-validate valattributeform="Terms" valattribute="principal" />
                             </td>
                             <td class="width14">