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

change sessions in fees

Browse Source
This commit is contained in:
gandhimathi 2018-05-07 15:46:23 +05:30
parent a88890c5e1
commit 8f1b7753bc
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
if(details.ProgramType=='Y001' && details.SNo=='1'){ if(details.ProgramType=='Y001' && details.SNo=='1'){
// get session details // get session details
var found = $filter('getById')($scope.masterSessionDetails, details.SessionName); 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) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){
$scope.sessionDetails.push({ $scope.sessionDetails.push({
"SessionName":svalues.SessionName +'('+svalues.SessionDate+')', "SessionName":svalues.SessionName,
"SessionID":svalues.SessionID, "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) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){ if(svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID){
$scope.sessionDetails.push({ $scope.sessionDetails.push({
"SessionName":svalues.SessionName +'('+svalues.SessionDate+')', "SessionName":svalues.SessionName,
"SessionID":svalues.SessionID, "SessionID":svalues.SessionID,
}); });
@ -355,13 +359,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
}); });
}*/ }
} }
else{ else{
$scope.sessionDetails=[];
$scope.sessionDetailsTo=[];
if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined){ if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined){
angular.forEach($scope.masterSessionDetails,function (svalues,skey) { angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
if(svalues.IsActive=='1' ){ if(svalues.IsActive=='1' ){