diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index a1cedcd8..131662eb 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -224,6 +224,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } if(details.ProgramType=='Y001' && details.SNo=='1'){ + + // get session details var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); @@ -263,12 +265,14 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); } - /*else{ + + // after branch changes + else{ angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ $scope.sessionDetails.push({ - "SessionName":svalues.SessionName +'('+svalues.SessionDate+')', + "SessionName":svalues.SessionName, "SessionID":svalues.SessionID, }); @@ -277,7 +281,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - }*/ + } @@ -340,13 +344,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); } - /* else{ + else{ angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ $scope.sessionDetails.push({ - "SessionName":svalues.SessionName +'('+svalues.SessionDate+')', + "SessionName":svalues.SessionName, "SessionID":svalues.SessionID, }); @@ -355,13 +359,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); - }*/ + } } else{ + $scope.sessionDetails=[]; + $scope.sessionDetailsTo=[]; + if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined){ + angular.forEach($scope.masterSessionDetails,function (svalues,skey) { if(svalues.IsActive=='1' ){