From 684c132b5c21616ab6235b90d0548e34ecaa3863 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 25 Apr 2018 09:11:39 +0530 Subject: [PATCH] status updation screen changes: kdk --- .../controllers/StatusUpdation_Controller.php | 8 ++++---- Apollo/api/application/models/StatusUpdation_model.php | 9 +++++---- Apollo/assets/js/controllers/answerBookletStatusCtrl.js | 5 +++-- Apollo/assets/js/controllers/applicationStatusCtrl.js | 3 ++- Apollo/assets/js/controllers/certificationStatusCtrl.js | 3 ++- Apollo/assets/js/controllers/studyMaterialStatusCtrl.js | 6 ++++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index d36ec258..ffbaf0c0 100755 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -84,8 +84,8 @@ class StatusUpdation_Controller extends REST_Controller { public function getSemYearForCourse_post() { $reqData = $this->post('data'); $stuFor = $this->post('stuFor'); - - $getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData, $stuFor);// Check if the employee exist + $reqBranch = $this->post('reqBranch'); + $getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData, $stuFor, $reqBranch);// Check if the employee exist if ($getSemYeatList) { $getSemYeatList['status'] = REST_Controller::HTTP_OK; @@ -304,8 +304,8 @@ class StatusUpdation_Controller extends REST_Controller { public function getStatusListForUpdate_post() { $reqData = $this->post('data'); $reqDetails = $this->post('statusFor'); - - $getStatusList = $this->statusupdation_model->get_status_list($reqData);// Check if the employee exist + $reqBranch = $this->post('reqBranch'); + $getStatusList = $this->statusupdation_model->get_status_list($reqData, $reqBranch);// Check if the employee exist if ($getStatusList) { $getStatusList['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index edc41800..6fcc9a30 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -28,12 +28,13 @@ class StatusUpdation_model extends CI_Model } // get status list - public function get_status_list($reqDetails) { + public function get_status_list($reqDetails, $reqBranch) { $statusCode = $this->get_status_list_code($reqDetails); $subQuery = "SELECT P.ListCode , P.ListName FROM ".PICK_LIST_DETAILS." as P LEFT JOIN ".DEFAULTACTIVITY." as SM ON SM.StatusCode = P.ListCode WHERE SM.StudentActivityCode = '$statusCode' + AND SM.BranchCode = '$reqBranch' AND SM.IsActive = '1'"; $queryDetails = $this->db->query($subQuery); @@ -320,7 +321,7 @@ class StatusUpdation_model extends CI_Model } // get sem/Year for the course - public function get_semyear_result($reqData, $stuFor) { + public function get_semyear_result($reqData, $stuFor, $reqBranch) { // echo $stuFor;exit(); $subQuery = "SELECT CF.Sem_Year, CF.ID , IF(CF.ProgramType = 'Y001', '0', '1') as SEM_YEAR_TYPE FROM ".COURSE_FEES." as CF LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.FeesType = CF.ID @@ -458,7 +459,7 @@ 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 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 + LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.StudentID = SC.StudentID AND SC.BranchID = SFS.BranchCode WHERE SFS.CourseID = SC.CourseID AND SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' AND S.IsActive = '1' @@ -475,7 +476,7 @@ class StatusUpdation_model extends CI_Model $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 AND SC.BranchID = U.BranchCode LEFT JOIN ".COURSE." as C ON - SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode + SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode AND SC.BranchID = SFS.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/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index b042270b..a3081ee7 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -238,8 +238,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa 'Content-Type': 'application/json' }, data: { - statusFor: 'studyMaterial', - data: localUpdateStatus + statusFor: 'studyMaterial', + data: localUpdateStatus, + reqBranch: localDetails.localBranchID } }; $http(getStatusL).then(function (response) { diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index df69b153..0861eaee 100755 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -269,7 +269,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl }, data: { statusFor: 'studyMaterial', - data: localUpdateStatus + data: localUpdateStatus, + reqBranch: localDetails.localBranchID } }; $http(getStatusL).then(function (response) { diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index bef98771..3342c6c5 100755 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -273,7 +273,8 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }, data: { statusFor: 'studyMaterial', - data: localUpdateStatus + data: localUpdateStatus, + reqBranch: localDetails.localBranchID } }; $http(getStatusL).then(function (response) { diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 742c07fe..fd121baf 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -248,7 +248,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }, data: { statusFor: 'studyMaterial', - data: localUpdateStatus + data: localUpdateStatus, + reqBranch: localDetails.localBranchID } }; $http(getStatusL).then(function (response) { @@ -273,7 +274,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa }, data: { data: courseID, - stuFor: StuId + stuFor: StuId, + reqBranch: localDetails.localBranchID } }; $http(getSemYear).then(function (response) {