From e1891c8ba2c3c0a286b878f6b07a7770bbb6dffe Mon Sep 17 00:00:00 2001 From: resicovenba Date: Fri, 2 Mar 2018 17:48:05 +0530 Subject: [PATCH] Status updation screen changes based on batch search : kdk --- .../application/models/Broadcast_model.php | 74 ++++++++++++++++--- .../models/StatusUpdation_model.php | 60 ++++++++------- Apollo/assets/views/daybook/daybook.html | 15 ++-- Apollo/assets/views/daybook/daybookadmin.html | 6 +- .../views/daybook/daybooksuperadmin.html | 24 +++--- .../status-update/answer_booklet_status.html | 6 +- .../status-update/application_status.html | 6 +- .../status-update/certification_status.html | 6 +- .../status-update/study_material_status.html | 6 +- .../student/editStudentCourseDetails.html | 14 ++-- .../assets/views/student/student_details.html | 8 +- .../student/student_details_SuperAdmin.html | 8 +- 12 files changed, 142 insertions(+), 91 deletions(-) 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 @@ {{p.VoucherNumber}} {{p.PaidTo}} - {{p.TypeName}} - {{p.TypeName}} + {{p.TypeName}} + {{p.TypeName}} {{p.Amount}} - + {{p.Status}} @@ -289,7 +289,6 @@ Type is Required -
@@ -337,12 +336,11 @@
Amount is Required - +
-
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 9ed19424..c1bdb866 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -240,7 +240,7 @@ - + -
- + diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 7068f695..e574b44c 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -157,13 +157,13 @@ - - @@ -190,8 +190,8 @@ - - + + @@ -259,12 +259,12 @@
Branch - + Branch/Date + Date + Income/Expense
{{p.BranchName}}{{p.Date}}{{p.BranchName}}
{{p.Date}}		 {{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}}
- - @@ -291,8 +291,8 @@ - - + + diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index f0ff3dbf..c2fb96d2 100755 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -45,12 +45,12 @@
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index 695cc0bc..a664f900 100755 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -45,12 +45,12 @@
diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/certification_status.html index 83708c97..c98b1bf6 100755 --- a/Apollo/assets/views/status-update/certification_status.html +++ b/Apollo/assets/views/status-update/certification_status.html @@ -45,12 +45,12 @@
diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html index e1b801ed..678d9fd4 100755 --- a/Apollo/assets/views/status-update/study_material_status.html +++ b/Apollo/assets/views/status-update/study_material_status.html @@ -45,12 +45,12 @@
diff --git a/Apollo/assets/views/student/editStudentCourseDetails.html b/Apollo/assets/views/student/editStudentCourseDetails.html index 59673862..ab54fe3b 100755 --- a/Apollo/assets/views/student/editStudentCourseDetails.html +++ b/Apollo/assets/views/student/editStudentCourseDetails.html @@ -23,8 +23,8 @@ - + - + @@ -95,7 +95,7 @@ -
+
@@ -290,7 +290,7 @@ -
+
diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 14236cbf..7cb88ad6 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -659,7 +659,7 @@
-
+
@@ -1229,7 +1229,7 @@
-
+
diff --git a/Apollo/assets/views/student/student_details_SuperAdmin.html b/Apollo/assets/views/student/student_details_SuperAdmin.html index 9b024a44..344c5589 100644 --- a/Apollo/assets/views/student/student_details_SuperAdmin.html +++ b/Apollo/assets/views/student/student_details_SuperAdmin.html @@ -681,7 +681,7 @@
-
+
@@ -1264,7 +1264,7 @@
-
+
Branch - + Branch/Date + Date + Income/Expense
{{p.BranchName}}{{p.Date}}{{p.BranchName}}
{{p.Date}}		 {{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} Specilization 2 Session - Date of Joining @@ -37,7 +37,7 @@ {{s.CourseName}}({{s.CourseCode}}) {{s.Specilization1}} {{s.Specilization2}}{{s.SessionName}} {{s.DOJ}}