diff --git a/Apollo/api/application/models/Broadcast_model.php b/Apollo/api/application/models/Broadcast_model.php index 50640bb2..7cec67fa 100644 --- a/Apollo/api/application/models/Broadcast_model.php +++ b/Apollo/api/application/models/Broadcast_model.php @@ -24,23 +24,78 @@ class Broadcast_model extends CI_Model $Course = $reqData['Course']; $Batch = $reqData['Batch']; - $subQuery = "SELECT S.* , SC.CourseID , C.CourseName , U.UniversityName + 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 WHERE - SC.UniversityID LIKE '%$University%' - AND SC.CourseID LIKE '%$Course%' - AND SC.BatchCode LIKE '%$Batch%' + SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.IsActive = '1'"; + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); + } 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 + WHERE + SC.CourseID = '$Course' AND SC.UniversityID = '$University' + AND S.IsActive = '1' + AND SC.IsActive = '1'"; + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); + } 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 ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID + WHERE SFS.CourseID = SC.CourseID AND + SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' + AND S.IsActive = '1' + AND SC.IsActive = '1'"; + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); + } 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 ".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' + AND S.IsActive = '1' + AND SC.IsActive = '1'"; + // AND S.BranchCode = '$branch' + // SC.UniversityID LIKE '%$University%' + // AND SC.CourseID LIKE '%$Course%' + // AND SC.BatchCode LIKE '%$Batch%' + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); + } + // $subQuery = "SELECT S.* , SC.CourseID , C.CourseName , 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 + // WHERE + // SC.UniversityID LIKE '%$University%' + // AND SC.CourseID LIKE '%$Course%' + // AND SC.BatchCode LIKE '%$Batch%' + // AND S.IsActive = '1' + // AND SC.IsActive = '1'"; - $queryDetails = $this->db->query($subQuery); - $results['searchResult'] = true; - $results['search_result_details'] = $queryDetails->result(); + // $queryDetails = $this->db->query($subQuery); + // $results['searchResult'] = true; + // $results['search_result_details'] = $queryDetails->result(); return $results; - } + } // get list of universities, course, batch public function get_university_course_batch() { @@ -137,10 +192,7 @@ class Broadcast_model extends CI_Model $results['smsSendDetailsList'] = $smsSendDetailsList; $results['smsSendDetailsListStatus'] = true; $results['smsSendDetailsList'] = $smsSendDetailsList; - } - - return $results; } diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index cb65291c..6076a7d3 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -385,8 +385,9 @@ class StatusUpdation_model extends CI_Model 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.SessionID = '$Batch' AND SC.UniversityID = '$University' + 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' AND S.IsActive = '1' AND SC.IsActive = '1'"; // AND S.BranchCode = '$branch' @@ -401,8 +402,9 @@ class StatusUpdation_model extends CI_Model 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.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' + 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' AND S.IsActive = '1' AND SC.IsActive = '1'"; // AND S.BranchCode = '$branch' @@ -452,12 +454,13 @@ class StatusUpdation_model extends CI_Model $results['searchResult'] = true; $results['search_result_details'] = $queryDetails->result(); } 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 - LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON - SC.CourseID = C.CourseID - WHERE - SC.SessionID = '$Batch' AND SC.UniversityID = '$University' + LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID + LEFT JOIN ".COURSE." as C ON C.CourseID = SC.CourseID + 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' AND S.IsActive = '1' AND SC.BranchID = '$branch' AND SC.IsActive = '1'"; @@ -465,16 +468,17 @@ class StatusUpdation_model extends CI_Model // SC.UniversityID LIKE '%$University%' // AND SC.CourseID LIKE '%$Course%' // AND SC.BatchCode LIKE '%$Batch%' - $queryDetails = $this->db->query($subQuery); - $results['searchResult'] = true; - $results['search_result_details'] = $queryDetails->result(); + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); } 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 LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID - WHERE - SC.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' + 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' AND S.IsActive = '1' AND SC.BranchID = '$branch' AND SC.IsActive = '1'"; @@ -482,9 +486,9 @@ class StatusUpdation_model extends CI_Model // SC.UniversityID LIKE '%$University%' // AND SC.CourseID LIKE '%$Course%' // AND SC.BatchCode LIKE '%$Batch%' - $queryDetails = $this->db->query($subQuery); - $results['searchResult'] = true; - $results['search_result_details'] = $queryDetails->result(); + $queryDetails = $this->db->query($subQuery); + $results['searchResult'] = true; + $results['search_result_details'] = $queryDetails->result(); } } return $results; @@ -513,18 +517,18 @@ class StatusUpdation_model extends CI_Model $courseDetails = $courDetails->result(); $resultArr['Course'] =$courseDetails; // Batch Details - // $this->db->select('t3.BatchName, t3.BatchCode'); - // $this->db->from(''.SESSIONMASTER. ' as t3'); - // $this->db->where('t3.UniversityID', $clip->UniversityID); - // $this->db->where('t3.IsActive', 1); + $this->db->select('t3.BatchName, t3.BatchCode'); + $this->db->from(''.BATCH. ' as t3'); + $this->db->where('t3.UniversityID', $clip->UniversityID); + $this->db->where('t3.IsActive', 1); //Session Details - $this->db->select('B.SessionID, B.SessionName'); - $this->db->from(SESSIONMASTER . ' as B'); - $this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID'); - $this->db->where('SD.UniversityID', $clip->UniversityID); - $this->db->where('B.IsActive', 1); - $this->db->where('SD.IsActive', 1); + // $this->db->select('B.SessionID, B.SessionName'); + // $this->db->from(SESSIONMASTER . ' as B'); + // $this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID'); + // $this->db->where('SD.UniversityID', $clip->UniversityID); + // $this->db->where('B.IsActive', 1); + // $this->db->where('SD.IsActive', 1); $batDetails = $this->db->get(); $batchDetails = $batDetails->result(); diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 43067976..a47bf991 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -134,10 +134,10 @@
| + | |
|---|---|
| - |