diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 0461f0fb..2ec17b71 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -879,9 +879,9 @@ JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.Stud JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode -WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=?'; +WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=?'; -$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1')); +$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$university)); $searchDetails =$query->result(); diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index ac7c32c1..4430940c 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -83,11 +83,13 @@ app.controller('newreg_reportCtrl', ["$scope","$rootScope","toaster", "$filter", //$scope.opinctotal=''; $scope.newreglist=''; $scope.isLoaderShow =''; +$scope.load = ''; +$scope.isShow= ''; $scope.getDetails = function (form,myModel) { // alert('in') - console.log(form.$dirty); + //console.log(form.$dirty); var from = $scope.filters.from_date; var to = $scope.filters.to_date; var university = myModel.myUnivSearch @@ -110,16 +112,20 @@ $scope.isLoaderShow =''; $http(getstudentdetails).then(function (response) { - if(response.data.status == 200) + if(response.data.status == 200 && response.data.searchst==true) { + + console.log(response.data); $scope.newreglist = response.data.details; - $scope.isLoaderShow = true; + $scope.isShow=true; + $scope.isLoaderShow=false; } else { - $scope.isLoaderShow=false; + $scope.isLoaderShow=true; + $scope.isShow=false; } diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html index 9882e15b..d9564c94 100644 --- a/Apollo/assets/views/newreg_report.html +++ b/Apollo/assets/views/newreg_report.html @@ -156,10 +156,10 @@