diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 0db40537..03126283 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -362,57 +362,191 @@ class Student_model extends CI_Model { $Batch = ''; $StuStatus = $getSearchData['Status']; if ($StuStatus == '') { - if ($University != '' && $Course == '') { + if ($University != '' && $Course == '' && $batchcode=='') { $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + WHERE SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' ORDER BY S.CreatedOn"; - } else if ($University != '' && $Course != '') { + } else if ($University != '' && $Course != '' && $batchcode=='') { $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + WHERE SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' ORDER BY S.CreatedOn"; } - } else { - if ($University != '' && $Course == '') { + + + else if($University !='' && $Course == '' && $batchcode!='') + { + $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE + SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND sfs.BatchCode = '$batchcode' + group by Student_Course_id,StudentID + ORDER BY S.CreatedOn"; + + + } + + + else if($University !=''&&$Course != '' && $batchcode !='') + { + + $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE + SC.CourseID = '$Course' AND SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND sfs.BatchCode = '$batchcode' + group by Student_Course_id,StudentID + ORDER BY S.CreatedOn"; + + } + + + } + else + { + if ($University != '' && $Course == '' && $batchcode =='') { $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' AND S.IsActive = '$StuStatus' ORDER BY S.CreatedOn"; - } else if ($University != '' && $Course != '') { + } + else if ($University != '' && $Course != '' && $batchcode =='') + { $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' AND S.IsActive = '$StuStatus' ORDER BY S.CreatedOn"; - } else { + } + + + + else if($University != '' && $Course == '' && $batchcode !='') + { + + $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + + WHERE + SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID + ORDER BY S.CreatedOn"; + } + + else if($University != '' && $Course != '' && $batchcode !='') + { + + + $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + + WHERE + SC.CourseID = '$Course' AND SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID + ORDER BY S.CreatedOn"; + } + + else + { $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE SC.BranchID = '$loginUserBranchId' AND S.IsActive = '$StuStatus' @@ -454,62 +588,218 @@ class Student_model extends CI_Model { $Batch = ''; $StuStatus = $getSearchData['Status']; if ($StuStatus == '') { - if ($University != '' && $Course == '') { + if ($University != '' && $Course == '' && $batchcode=='') { $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + WHERE SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' GROUP BY SC.id ORDER BY S.CreatedOn"; - } else if ($University != '' && $Course != '') { + } else if ($University != '' && $Course != '' && $batchcode=='') { $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' GROUP BY SC.id ORDER BY S.CreatedOn"; - } // ### query branch code changed from student branch code to student course branch code + } + + + else if ($University != '' && $Course == '' && $batchcode !='') + { + $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE + SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID,SC.id + + ORDER BY S.CreatedOn"; + } + + + + else if ($University != '' && $Course != '' && $batchcode !='') { + $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + + WHERE + SC.CourseID = '$Course' AND SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID,SC.id + + ORDER BY S.CreatedOn"; + } + + + + + + + + + + + + + + // ### query branch code changed from student branch code to student course branch code // AND S.BranchCode = '$loginUserBranchId' -> SC.BranchCode = '$loginUserBranchId' // (SC.UniversityID = '$University' // OR (SC.CourseID = '$Course' AND SC.UniversityID = '$University')) } else { - if ($University != '' && $Course == '') { + if ($University != '' && $Course == '' && $batchcode=='') { $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + + WHERE SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' AND S.IsActive = '$StuStatus' GROUP BY SC.id ORDER BY S.CreatedOn"; - } else if ($University != '' && $Course != '') { + } else if ($University != '' && $Course != '' && $batchcode=='') { $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + WHERE SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND SC.BranchID = '$loginUserBranchId' AND S.IsActive = '$StuStatus' GROUP BY SC.id ORDER BY S.CreatedOn"; - } else { + } + + + + + else if ($University != '' && $Course == '' && $batchcode !='') { + $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + + + WHERE + SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID,SC.id + + ORDER BY S.CreatedOn"; + } + + + + else if ($University != '' && $Course != '' && $batchcode!='') { + $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName + FROM " . STUDENTCOURSE . " as SC + LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID + + LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID + and C.CourseID=sfs.CourseID + + WHERE + SC.CourseID = '$Course' AND SC.UniversityID = '$University' + AND SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + + AND sfs.BatchCode = '$batchcode' + + group by Student_Course_id,StudentID,SC.id + + ORDER BY S.CreatedOn"; + } + + + + + + + + + + + + + + + + + + else { $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index ecd54a5f..67da7b2f 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -186,6 +186,9 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.studentListLength = 0; $scope.getStudentList = function () { $scope.loader = true; + + + console.log($scope.searchData); var empListreq = { method: 'POST', url: apiPoint.url + 'getStudentList/', diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 09c9182f..7001a8de 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -122,6 +122,28 @@ + + + + +
+ +
+ + +
+ +
+ + + + + + +