diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index c9fe7455..86472ff3 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -168,7 +168,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,FormType as FormType,StatusName as ApplicationPendingStatus,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); }; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 4b552004..279a05a1 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -252,7 +252,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } console.log($scope.selectedStudentsID); } - $scope.isClick = function(e){ + $scope.isClick = function(e,s){ var ide = e.target; var val = (ide.checked ? true : false); var sid = e.target.id; @@ -260,7 +260,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", // console.log($scope.balfee_data); angular.forEach($scope.balfee_data,function(value,key){ - if(sid == value.Student_id) + if(sid == value.Student_id && s == value.Sem_year) { sid = value; } @@ -353,7 +353,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ comments [stuid] ="Call Tracking For Report Balance Fee - Sem:"+selectedStudents[stuid].Sem_year + " - Balance Fee:" +selectedStudents[stuid].bal; } - //console.log(selectedStudents); + //console.log(selectedStudents);return false; if(isNaN(myModel.date)){ $scope.nextFollowupDate = myModel.date; diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 4bb35e71..7774e21c 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -107,8 +107,8 @@