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

status updation screen changes: kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-25 09:11:39 +05:30
parent e8a61e6a43
commit 684c132b5c
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/controllers/StatusUpdation_Controller.php
View File

@ -84,8 +84,8 @@ class StatusUpdation_Controller extends REST_Controller {
public function getSemYearForCourse_post() { public function getSemYearForCourse_post() {
$reqData = $this->post('data'); $reqData = $this->post('data');
$stuFor = $this->post('stuFor'); $stuFor = $this->post('stuFor');
$reqBranch = $this->post('reqBranch');
$getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData, $stuFor);// Check if the employee exist $getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData, $stuFor, $reqBranch);// Check if the employee exist
if ($getSemYeatList) if ($getSemYeatList)
{ {
$getSemYeatList['status'] = REST_Controller::HTTP_OK; $getSemYeatList['status'] = REST_Controller::HTTP_OK;
@ -304,8 +304,8 @@ class StatusUpdation_Controller extends REST_Controller {
public function getStatusListForUpdate_post() { public function getStatusListForUpdate_post() {
$reqData = $this->post('data'); $reqData = $this->post('data');
$reqDetails = $this->post('statusFor'); $reqDetails = $this->post('statusFor');
$reqBranch = $this->post('reqBranch');
$getStatusList = $this->statusupdation_model->get_status_list($reqData);// Check if the employee exist $getStatusList = $this->statusupdation_model->get_status_list($reqData, $reqBranch);// Check if the employee exist
if ($getStatusList) if ($getStatusList)
{ {
$getStatusList['status'] = REST_Controller::HTTP_OK; $getStatusList['status'] = REST_Controller::HTTP_OK;

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

@ -28,12 +28,13 @@ class StatusUpdation_model extends CI_Model
} }
// get status list // get status list
public function get_status_list($reqDetails) { public function get_status_list($reqDetails, $reqBranch) {
$statusCode = $this->get_status_list_code($reqDetails); $statusCode = $this->get_status_list_code($reqDetails);
$subQuery = "SELECT P.ListCode , P.ListName $subQuery = "SELECT P.ListCode , P.ListName
FROM ".PICK_LIST_DETAILS." as P LEFT JOIN ".DEFAULTACTIVITY." as SM ON SM.StatusCode = P.ListCode FROM ".PICK_LIST_DETAILS." as P LEFT JOIN ".DEFAULTACTIVITY." as SM ON SM.StatusCode = P.ListCode
WHERE WHERE
SM.StudentActivityCode = '$statusCode' SM.StudentActivityCode = '$statusCode'
AND SM.BranchCode = '$reqBranch'
AND SM.IsActive = '1'"; AND SM.IsActive = '1'";
$queryDetails = $this->db->query($subQuery); $queryDetails = $this->db->query($subQuery);
@ -320,7 +321,7 @@ class StatusUpdation_model extends CI_Model
} }
// get sem/Year for the course // get sem/Year for the course
public function get_semyear_result($reqData, $stuFor) { public function get_semyear_result($reqData, $stuFor, $reqBranch) {
// echo $stuFor;exit(); // echo $stuFor;exit();
$subQuery = "SELECT CF.Sem_Year, CF.ID , IF(CF.ProgramType = 'Y001', '0', '1') as SEM_YEAR_TYPE $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 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 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 ".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 ".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 WHERE SFS.CourseID = SC.CourseID AND
SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University' SFS.BatchCode = '$Batch' AND SC.UniversityID = '$University'
AND S.IsActive = '1' 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 $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 AND SC.BranchID = U.BranchCode 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 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 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'

5
Apollo/assets/js/controllers/answerBookletStatusCtrl.js
View File

@ -238,8 +238,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {
statusFor: 'studyMaterial', statusFor: 'studyMaterial',
data: localUpdateStatus data: localUpdateStatus,
reqBranch: localDetails.localBranchID
} }
}; };
$http(getStatusL).then(function (response) { $http(getStatusL).then(function (response) {

3
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -269,7 +269,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
}, },
data: { data: {
statusFor: 'studyMaterial', statusFor: 'studyMaterial',
data: localUpdateStatus data: localUpdateStatus,
reqBranch: localDetails.localBranchID
} }
}; };
$http(getStatusL).then(function (response) { $http(getStatusL).then(function (response) {

3
Apollo/assets/js/controllers/certificationStatusCtrl.js
View File

@ -273,7 +273,8 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}, },
data: { data: {
statusFor: 'studyMaterial', statusFor: 'studyMaterial',
data: localUpdateStatus data: localUpdateStatus,
reqBranch: localDetails.localBranchID
} }
}; };
$http(getStatusL).then(function (response) { $http(getStatusL).then(function (response) {

6
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -248,7 +248,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}, },
data: { data: {
statusFor: 'studyMaterial', statusFor: 'studyMaterial',
data: localUpdateStatus data: localUpdateStatus,
reqBranch: localDetails.localBranchID
} }
}; };
$http(getStatusL).then(function (response) { $http(getStatusL).then(function (response) {
@ -273,7 +274,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}, },
data: { data: {
data: courseID, data: courseID,
stuFor: StuId stuFor: StuId,
reqBranch: localDetails.localBranchID
} }
}; };
$http(getSemYear).then(function (response) { $http(getSemYear).then(function (response) {