Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

live issues fixes : ps

Browse Source
This commit is contained in:
Sanjeev 2021-03-16 21:46:15 +05:30
parent e8e25d8660
commit 6c5fdbaa68
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Calltracking_model.php
View File

@ -2054,8 +2054,8 @@ public function GetStaffCountDetails($branchID,$myDate)
} }
} }
} }
$result_array['searchst'] = true; if(!empty($filtered_array)){$result_array['searchst'] = true;$result_array['details'] = $filtered_array;
$result_array['details'] = $filtered_array; }else{$result_array['searchst'] = false;$result_array['details'] = "No records found!";}
} }
else else
{ {

3
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2703,7 +2703,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}; };
$scope.open1 = function (values,type,filterby) { $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'){ if(type == '3' || type == '5' || type == '7' || type == '8'){
var result = []; var result = [];
for (var i = 0; i < values.length; i++) for (var i = 0; i < values.length; i++)
@ -2752,6 +2752,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
}); });
modalInstance1.result.then(function (selectedItem) { modalInstance1.result.then(function (selectedItem) {
console.log("selectedItem",selectedItem);
$scope.selected = selectedItem; $scope.selected = selectedItem;
}, function () { }, function () {
$log.info('Modal dismissed at: ' + new Date()); $log.info('Modal dismissed at: ' + new Date());

24
Apollo/assets/views/student/studentPaymentModal.html
View File

@ -13,17 +13,22 @@
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="l in items1.InstallmentDetails"> <tbody ng-if="items1.InstallmentDetails.length!=0">
<tr> <tr ng-repeat="l in items1.InstallmentDetails">
<td>{{l.Name}}</td> <td>{{l.Name}}</td>
<td>{{l.Amount}}</td> <td>{{l.Amount}}</td>
<td>{{l.DueDate}}</td> <td>{{l.DueDate}}</td>
</tr> </tr>
</tbody> </tbody>
<tbody ng-if="items1.InstallmentDetails.length==0">
<tr>
<td colspan="3"><center> Details Not Found </center></td>
</tr>
</tbody>
</table> </table>
<table class="table" ng-if="selectedtype=='2'"> <table class="table" ng-if="selectedtype=='2'">
@ -37,7 +42,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-if="items1.paidDetails.length!=0" >
<tr ng-repeat="v in items1.paidDetails"> <tr ng-repeat="v in items1.paidDetails">
<td>{{v.BillNO}}</td> <td>{{v.BillNO}}</td>
<td>{{v.BillAmount}}</td> <td>{{v.BillAmount}}</td>
@ -46,7 +51,12 @@
<td>{{v.ModeOfPayment}}</td> <td>{{v.ModeOfPayment}}</td>
</tr> </tr>
</tbody>
<tbody ng-if="items1.paidDetails.length==0">
<tr>
<td colspan="5"><center> Details Not Found </center></td>
</tr>
</tbody>
</table> </table>
<ul ng-if="selectedtype=='3' && items1!=false" > <ul ng-if="selectedtype=='3' && items1!=false" >
<label style="background-color:black;">Batch History</label> <label style="background-color:black;">Batch History</label>