diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index e2b73356..bb3e67d3 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1869,7 +1869,7 @@ $REGID=''; $this->db->join(COURSE.' as CU', 'CU.UniversityID = US.UniversityID'); // $this->db->where('SD.IsActive','1'); // $this->db->order_by('CU.CreatedOn','DESC'); - $this->db->order_by('SM.SessionID','ASC'); + $this->db->order_by('SM.SessionID','DESC'); $this->db->where('CU.CourseID',$details['CourseID']); $this->db->where('US.BranchCode',$details['BranchCode']); $this->db->where('SM.BranchCode',$details['BranchCode']); diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index b7f032a8..6f411b6a 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -378,7 +378,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else if(details.ProgramType=='Y001' && details.SNo!='1') { - // console.log('if else1') + // console.log('if else1') if($scope.feesStructureInfo[0].SessionName!='') { @@ -434,7 +434,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('else') + console.log('else') // get session details var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2)); @@ -466,11 +466,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('function else') + console.log('function else') + + //console.log(details.ProgramType); // alert("function else"); if(details.ProgramType=='Y001' && details.SNo!='1') { - // console.log('else if') + //console.log('else if') // alert("else if"); $scope.sessionDetails=[]; $scope.sessionDetailsTo=[]; @@ -498,11 +500,20 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - - $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; + + + // console.log($scope.sessionDetails.length); + + var len = $scope.sessionDetails.length-1; + + + $scope.setModel.feesType.SessionName = $scope.sessionDetails[len].SessionID; + // $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; } else{ +//console.log('else') + angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ @@ -524,14 +535,14 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else { - // console.log('else else') + console.log('else else') //alert("else else"); $scope.sessionDetails=[]; $scope.sessionDetailsTo=[]; if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined) { - //console.log('else else if') + console.log('else else if') angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' ){ @@ -545,12 +556,21 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; + var len = $scope.sessionDetails.length-1; + + + $scope.setModel.feesType.SessionName = $scope.sessionDetails[len].SessionID; + + $scope.setModel.feesType.ToSessionName = $scope.sessionDetails[len-1].SessionID; + + // console.log($scope.sessionDetails[len-1].SessionID) + + //$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID; } else { - //console.log('else else else') + // console.log('else else else') // get session details var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2)); @@ -1026,7 +1046,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n //$scope.setModel.feesType = $scope.feesStructureInfo[lastval]; - console.log($scope.lastsetfee); + //console.log($scope.lastsetfee);return false; $scope.setModel = { "feesType": $scope.feesStructureInfo[$scope.lastsetfee],