From e7f5b2972edc73eb46118fdcf3c2f4e914cf5426 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Tue, 24 Apr 2018 13:02:57 +0530 Subject: [PATCH] student status updation changes : kdk --- .../models/StatusUpdation_model.php | 20 ++++++------- .../api/application/models/Student_model.php | 30 +++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 622f79f1..edc41800 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -418,12 +418,12 @@ class StatusUpdation_model extends CI_Model } else { // echo $University; // echo $branch; - + if($University != '' && $Course == '' && $Batch == '') { $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName - FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID - LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON - SC.CourseID = C.CourseID + FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC 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 WHERE SC.UniversityID = '$University' AND S.IsActive = '1' @@ -439,8 +439,8 @@ class StatusUpdation_model extends CI_Model } else if ($University != '' && $Course != '' && $Batch == '' ) { $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID - LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON - SC.CourseID = C.CourseID + 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 WHERE SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND S.IsActive = '1' @@ -456,8 +456,8 @@ class StatusUpdation_model extends CI_Model } else if ( $University != '' && $Course == '' && $Batch != '' ) { $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID - LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID - LEFT JOIN ".COURSE." as C ON C.CourseID = SC.CourseID + LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode + LEFT JOIN ".COURSE." as C ON C.CourseID = SC.CourseID AND SC.BranchID = C.BranchCode LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID WHERE SFS.CourseID = SC.CourseID AND SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' @@ -474,8 +474,8 @@ class StatusUpdation_model extends CI_Model } else if ( $University != '' && $Course != '' && $Batch != '' ) { $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID - LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON - SC.CourseID = C.CourseID + 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.StudentID = SC.StudentID WHERE SFS.CourseID = SC.CourseID AND SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index f75e52dd..ddfcd8eb 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -161,6 +161,16 @@ class Student_model extends CI_Model AND S.IsActive = '$StuStatus' GROUP BY SC.StudentID ORDER BY S.CreatedOn"; + } else { + $subQuery = "SELECT S.* + FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON + SC.CourseID = C.CourseID + WHERE + SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + GROUP BY SC.StudentID + ORDER BY S.CreatedOn"; } } @@ -300,6 +310,16 @@ class Student_model extends CI_Model AND S.IsActive = '$StuStatus' GROUP BY SC.StudentID ORDER BY S.CreatedOn"; + }else { + $subQuery = "SELECT S.* + FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON + SC.CourseID = C.CourseID + WHERE + SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + GROUP BY SC.StudentID + ORDER BY S.CreatedOn"; } } @@ -416,6 +436,16 @@ class Student_model extends CI_Model AND S.IsActive = '$StuStatus' GROUP BY SC.StudentID ORDER BY S.CreatedOn"; + } else { + $subQuery = "SELECT S.* + FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID + LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON + SC.CourseID = C.CourseID + WHERE + SC.BranchID = '$loginUserBranchId' + AND S.IsActive = '$StuStatus' + GROUP BY SC.StudentID + ORDER BY S.CreatedOn"; } // ### query branch code changed from student branch code to student course branch code