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

new registration universitycheck

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-21 12:35:39 +05:30
parent 7c6d8f5b9f
commit 289059c6dd
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Reports_model.php
View File

@ -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();

14
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -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;
}

4
Apollo/assets/views/newreg_report.html
View File

@ -156,10 +156,10 @@
<div>
<div ng-if="isLoaderShow">
<center> <h1>{{load}}</h1> </center>
<center> <h1>No Records Found !!</h1> </center>
</div>
<div class="col-md-12">
<div class="col-md-12" ng-if="isShow">
<div class="table-responsive">
<table id="datatable" class="table table-hover">
<thead>