diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index a8e6a0fd..cdaba979 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -19,6 +19,8 @@ class StatusUpdation_model extends CI_Model { $searchFor = 'C001'; } else if ($reqDetails == 'ANSWERBOOKLET_STATUS') { $searchFor = 'B001'; + } else if ($reqDetails == 'APPICATIONFORM_STATUS') { + $searchFor = 'L001'; } return $searchFor; } @@ -937,7 +939,7 @@ class StatusUpdation_model extends CI_Model { $courseId = $reqData['courseId']; // echo $studentId;exit(); // $searchTableFor = APPLICATION_FORM; - $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName '); + $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments'); $this->db->from('T_ApplicationFormStatus as t1'); $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID'); $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType'); diff --git a/Apollo/api/application/models/University_model.php b/Apollo/api/application/models/University_model.php index 470eeb59..f842b76a 100755 --- a/Apollo/api/application/models/University_model.php +++ b/Apollo/api/application/models/University_model.php @@ -338,6 +338,7 @@ class University_model extends CI_Model $this->db->or_where('ListGroup','7'); $this->db->or_where('ListGroup','8'); $this->db->or_where('ListGroup','9'); + $this->db->or_where('ListGroup','12'); $defaultActivityDetails=$this->db->get(PICK_LIST_DETAILS); if($defaultActivityDetails->result()){ $activity_result['activityStatus'] = true; diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index 43d7babc..fe89f7a6 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -30,7 +30,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - const localUpdateStatus = 'APPICATION_STATUS'; + const localUpdateStatus = 'APPICATIONFORM_STATUS'; $scope.localTypeSuperAdmin = false; $scope.localBranchDetails = ''; @@ -364,7 +364,7 @@ $scope.editStatusID = id; $scope.statusUpdate = { submit: function (form, localBranchDetails, id) { - // alert(id); + // alert(localBranchDetails); var firstError = null; if (form.$invalid) { var field = null, firstError = null; diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index d826a642..f10b322c 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -261,7 +261,7 @@ -
+