diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 9ca9b140..cb65291c 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -386,7 +386,7 @@ class StatusUpdation_model extends CI_Model LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID WHERE - SC.BatchCode = '$Batch' AND SC.UniversityID = '$University' + SC.SessionID = '$Batch' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.IsActive = '1'"; // AND S.BranchCode = '$branch' @@ -402,7 +402,7 @@ class StatusUpdation_model extends CI_Model LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID WHERE - SC.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' + SC.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.IsActive = '1'"; // AND S.BranchCode = '$branch' @@ -457,7 +457,7 @@ class StatusUpdation_model extends CI_Model LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID WHERE - SC.BatchCode = '$Batch' AND SC.UniversityID = '$University' + SC.SessionID = '$Batch' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.BranchID = '$branch' AND SC.IsActive = '1'"; @@ -474,7 +474,7 @@ class StatusUpdation_model extends CI_Model LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID WHERE - SC.BatchCode = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' + SC.SessionID = '$Batch' AND SC.CourseID = '$Course' AND SC.UniversityID = '$University' AND S.IsActive = '1' AND SC.BranchID = '$branch' AND SC.IsActive = '1'"; @@ -513,10 +513,19 @@ class StatusUpdation_model extends CI_Model $courseDetails = $courDetails->result(); $resultArr['Course'] =$courseDetails; // Batch Details - $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); + // $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); + + //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); + $batDetails = $this->db->get(); $batchDetails = $batDetails->result(); $resultArr['Batch'] =$batchDetails; diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 6eb82b6b..01e89313 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -708,25 +708,25 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.stepsModel.length = 0; } - $scope.getChangeDate = function () { - // alert(); - try { - var formate = "dd-MM-yyyy"; - $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); - // alert($scope.myModel.dateofbirth); - // var myDate = new Date($scope.myModel.dateofbirth); - // alert(myDate); - // if(typeof myDate === 'function') { - // alert("true") - // } else { - // alert("error") - // } - } - catch(e) { - // alert('error'); - // alert(err); - } - } + // $scope.getChangeDate = function () { + // // alert(); + // try { + // var formate = "dd-MM-yyyy"; + // $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); + // // alert($scope.myModel.dateofbirth); + // // var myDate = new Date($scope.myModel.dateofbirth); + // // alert(myDate); + // // if(typeof myDate === 'function') { + // // alert("true") + // // } else { + // // alert("error") + // // } + // } + // catch(e) { + // // alert('error'); + // // alert(err); + // } + // } // add student $scope.studentFORM = { @@ -750,7 +750,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } else { $scope.disableButton = true; var formate = "dd-MM-yyyy"; - // $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); + $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); $scope.myModel.switchsetting = $scope.myModel.switchsetting === true ? 1 : 0; $scope.myModelCourseAdd.dateofjoining = $filter('date')(new Date($scope.myModelCourseAdd.dateofjoining), formate); var idStuProof = $scope.files[0]; @@ -2057,11 +2057,11 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.stepsModel.length = 0; } - $scope.getChangeDate = function () { - var formate = "dd-MM-yyyy"; - $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); + // $scope.getChangeDate = function () { + // var formate = "dd-MM-yyyy"; + // $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); - } + // } $scope.tabactive1 = false; $scope.tabactive2 = false; @@ -2140,6 +2140,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl } else { $scope.disableButton = true; var formate = "dd-MM-yyyy"; + $scope.myModel.dateofbirth = $filter('date')(new Date($scope.myModel.dateofbirth), formate); myModel.switchsetting = myModel.switchsetting === true ? 1 : 0; myModelCourseAdd.dateofjoining = $filter('date')(new Date(myModelCourseAdd.dateofjoining), formate); var idStuProof = $scope.files[0]; diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index c2fb96d2..f0ff3dbf 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 @@