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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
gandhimathi 2018-04-24 13:13:55 +05:30
commit ce937837fc
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -422,8 +422,8 @@ class StatusUpdation_model extends CI_Model
if($University != '' && $Course == '' && $Batch == '') { if($University != '' && $Course == '' && $Batch == '') {
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName $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 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 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 SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
WHERE WHERE
SC.UniversityID = '$University' SC.UniversityID = '$University'
AND S.IsActive = '1' AND S.IsActive = '1'
@ -439,8 +439,8 @@ class StatusUpdation_model extends CI_Model
} else if ($University != '' && $Course != '' && $Batch == '' ) { } else if ($University != '' && $Course != '' && $Batch == '' ) {
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName $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 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 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 SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
WHERE WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University' SC.CourseID = '$Course' AND SC.UniversityID = '$University'
AND S.IsActive = '1' AND S.IsActive = '1'
@ -456,8 +456,8 @@ class StatusUpdation_model extends CI_Model
} else if ( $University != '' && $Course == '' && $Batch != '' ) { } else if ( $University != '' && $Course == '' && $Batch != '' ) {
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName $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 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 ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
LEFT JOIN ".COURSE." as C ON C.CourseID = SC.CourseID 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 LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
WHERE SFS.CourseID = SC.CourseID AND WHERE SFS.CourseID = SC.CourseID AND
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
@ -474,8 +474,8 @@ class StatusUpdation_model extends CI_Model
} else if ( $University != '' && $Course != '' && $Batch != '' ) { } else if ( $University != '' && $Course != '' && $Batch != '' ) {
$subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName $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 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 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 SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID
WHERE SFS.CourseID = SC.CourseID AND WHERE SFS.CourseID = SC.CourseID AND
SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' SFS.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University'

30
Apollo/api/application/models/Student_model.php
View File

@ -161,6 +161,16 @@ class Student_model extends CI_Model
AND S.IsActive = '$StuStatus' AND S.IsActive = '$StuStatus'
GROUP BY SC.StudentID GROUP BY SC.StudentID
ORDER BY S.CreatedOn"; 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' AND S.IsActive = '$StuStatus'
GROUP BY SC.StudentID GROUP BY SC.StudentID
ORDER BY S.CreatedOn"; 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' AND S.IsActive = '$StuStatus'
GROUP BY SC.StudentID GROUP BY SC.StudentID
ORDER BY S.CreatedOn"; 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 // ### query branch code changed from student branch code to student course branch code