From 6c5fdbaa68c833de4e728a8ac84b8a5a585c1bd2 Mon Sep 17 00:00:00 2001
From: Sanjeev <sanjeev.p@venbainfotech.com>
Date: Tue, 16 Mar 2021 21:46:15 +0530
Subject: [PATCH] live issues fixes : ps

---
 .../application/models/Calltracking_model.php |  4 ++--
 .../assets/js/controllers/feesStatusCtrl.js   |  3 ++-
 .../views/student/studentPaymentModal.html    | 24 +++++++++++++------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php
index 5826c879..f4d58784 100755
--- a/Apollo/api/application/models/Calltracking_model.php
+++ b/Apollo/api/application/models/Calltracking_model.php
@@ -2054,8 +2054,8 @@ public function GetStaffCountDetails($branchID,$myDate)
                 }
             }
         }
-               $result_array['searchst'] = true;
-               $result_array['details'] = $filtered_array;
+        if(!empty($filtered_array)){$result_array['searchst'] = true;$result_array['details'] = $filtered_array;
+        }else{$result_array['searchst'] = false;$result_array['details'] = "No records found!";}    
      }
      else
     {
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 2ae82fde..e974630b 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2703,7 +2703,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     };
     $scope.open1 = function (values,type,filterby) {
-        if(type == '1' || type == '2' ){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
+        if(type == '1' || type == '2' ){ var result = values;} 
         if(type == '3' || type == '5' || type == '7' || type == '8'){ 
             var result = [];
             for (var i = 0; i < values.length; i++)
@@ -2752,6 +2752,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
         });
 
         modalInstance1.result.then(function (selectedItem) {
+            console.log("selectedItem",selectedItem);
             $scope.selected = selectedItem;
         }, function () {
             $log.info('Modal dismissed at: ' + new Date());
diff --git a/Apollo/assets/views/student/studentPaymentModal.html b/Apollo/assets/views/student/studentPaymentModal.html
index c0a397f8..8e753a2d 100755
--- a/Apollo/assets/views/student/studentPaymentModal.html
+++ b/Apollo/assets/views/student/studentPaymentModal.html
@@ -13,17 +13,22 @@
 
                     </tr>
                     </thead>
-                    <tbody ng-repeat="l in items1.InstallmentDetails">
-                    <tr>
+                    <tbody ng-if="items1.InstallmentDetails.length!=0">
+                    <tr ng-repeat="l in items1.InstallmentDetails">
                         <td>{{l.Name}}</td>
-
                         <td>{{l.Amount}}</td>
                         <td>{{l.DueDate}}</td>
 
                     </tr>
-
-
                     </tbody>
+                    <tbody ng-if="items1.InstallmentDetails.length==0">
+                    <tr>
+                        <td colspan="3"><center> Details Not Found </center></td>
+                    </tr>
+                    </tbody>
+
+
+                    
 
                 </table>
                         <table class="table" ng-if="selectedtype=='2'">
@@ -37,7 +42,7 @@
 
                             </tr>
                             </thead>
-                            <tbody>
+                            <tbody ng-if="items1.paidDetails.length!=0" >
                             <tr ng-repeat="v in items1.paidDetails">
                                 <td>{{v.BillNO}}</td>
                                 <td>{{v.BillAmount}}</td>
@@ -46,7 +51,12 @@
                                 <td>{{v.ModeOfPayment}}</td>
 
                             </tr>
-
+                            </tbody>
+                                <tbody ng-if="items1.paidDetails.length==0">
+                                    <tr>
+                                        <td colspan="5"><center> Details Not Found </center></td>
+                                    </tr>
+                                </tbody>
                         </table>
                         <ul ng-if="selectedtype=='3' && items1!=false" >
                             <label style="background-color:black;">Batch History</label>