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 @@ -
-| {{v.BillNO}} | {{v.BillAmount}} | @@ -46,7 +51,12 @@{{v.ModeOfPayment}} | ||