diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index e286ea0f..42c5beff 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -153,7 +153,16 @@ $route['getUniversityCourseForFees'] = 'Fees_Status_Controller/getUniversityCour * */ $route['getDefaultActivityDetails'] = 'University_Controller/getDefaultActivityDetails'; $route['updateDefaultActivityDetails'] = 'University_Controller/updateDefaultActivityDetails'; - +// statu updation details studymaterial, answerbooklet, application, certification +$route['getUniveCourseBratch'] = 'StatusUpdation_Controller/getUniveCourseBratch'; +$route['getSearchAutoDetails'] = 'StatusUpdation_Controller/getSearchDetails'; +$route['getSemYearForCourse'] = 'StatusUpdation_Controller/getSemYearForCourse'; +$route['updateStudentMaterialStatus'] = 'StatusUpdation_Controller/updateStudentMaterialStatus'; +$route['updateAnswerBookLetStatus'] = 'StatusUpdation_Controller/updateAnswerBookLetStatus'; +$route['getCertificateList'] = 'StatusUpdation_Controller/getCertificateList'; +$route['updateCertificationStatus'] = 'StatusUpdation_Controller/updateCertificationStatus'; +$route['updateApplicationStatus'] = 'StatusUpdation_Controller/updateApplicationStatus'; +$route['getStatusListForUpdate'] = 'StatusUpdation_Controller/getStatusListForUpdate'; diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 006dfdcb..6f68efed 100644 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -298,7 +298,7 @@ class StatusUpdation_Controller extends REST_Controller { $reqData = $this->post('data'); $reqDetails = $this->post('statusFor'); - $getStatusList = $this->statusupdation_model->get_status_list($reqDetails);// Check if the employee exist + $getStatusList = $this->statusupdation_model->get_status_list($reqData);// 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 e5d7ef30..35c4aaf6 100644 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -14,15 +14,35 @@ class StatusUpdation_model extends CI_Model * created by kdk * */ + public function get_status_list_code($reqDetails) { + if( $reqDetails == 'STUDY_MATERIAL') { + $searchFor = 'M001'; + } else if ( $reqDetails == 'APPICATION_STATUS' ) { + $searchFor = 'A001'; + } else if ( $reqDetails == 'CERTIFICATION_STATUS' ) { + $searchFor = 'C001'; + } else if ( $reqDetails == 'ANSWERBOOKLET_STATUS' ) { + $searchFor = 'B001'; + } + return $searchFor; + } // get status list - public function get_status_list() { - $this->db->select('ListCode, ListName'); - $this->db->order_by('CreatedOn', 'DESC'); - $this->db->from('T_PickListDetails'); - $this->db->where('ListCode', 'S034'); - $staDetails = $this->db->get(); - $statusDetails = $staDetails->result(); + public function get_status_list($reqDetails) { + $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.IsActive = '1'"; + + $queryDetails = $this->db->query($subQuery); + // $this->db->select('ListCode, ListName'); + // $this->db->order_by('CreatedOn', 'DESC'); + // $this->db->from('T_PickListDetails'); + // $this->db->where('ListCode', 'S034'); + // $staDetails = $this->db->get(); + $statusDetails = $queryDetails->result(); if (count($statusDetails) > 0) { $results['statusList'] = true; $results['statusList_details'] = $statusDetails; @@ -35,7 +55,7 @@ class StatusUpdation_model extends CI_Model // update Application status public function update_applicationStatus($arr) { - $this->db->insert_batch('T_ApplicationStatus', $arr); + $this->db->insert_batch(APPLICATION_STATUS, $arr); if ($this->db->affected_rows() >= 1) { $result['addStatus'] = true; $result['message'] = "Successfully Application Status Updated"; @@ -48,12 +68,18 @@ class StatusUpdation_model extends CI_Model // update certificate stauts public function update_certificateStatus($arr) { + // $this->get_status_name_ListCode($arr[0]['ListCode']); // $dateToMsg = $arr[0]['CDate']; - $this->db->insert_batch('T_CertificationStatus', $arr); + // print_r($arr);exit(); + // echo $this->get_status_name_ListCode($arr[0]['ListCode']);exit(); + $this->db->insert_batch(CERTIFICATION_STATUS, $arr); if ($this->db->affected_rows() >= 1) { - if((get_status_name_ListCode($arr[0]['ListCode'] == 'Received' || 'received') || (get_status_name_ListCode($arr[0]['ListCode'] == 'Issued' || 'issued') ) { + // if( ($this->get_status_name_ListCode($arr[0]['ListCode']) == 'Received' || 'received' || 'RECEIVED') || ($this->get_status_name_ListCode($arr[0]['ListCode']) == 'Issued' || 'issued' || 'ISSUED')) { + if($this->get_status_name_ListCode($arr[0]['ListCode'])){ $dateToMsg = $arr[0]['CDate']; - $mesg = "Your new password for logging into Apollo student portal is $dateToMsg'. Please change the password as soon as you login."; + $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); + $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); + $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg."; $this->smssend($arr, $mesg); } $result['addStatus'] = true; @@ -69,7 +95,7 @@ class StatusUpdation_model extends CI_Model public function get_certificate_list() { $this->db->select('*'); $this->db->order_by('CreatedOn', 'DESC'); - $this->db->from('T_CertificationMaster'); + $this->db->from(CERTIFICATION); $this->db->where('IsActive', 1); $cerfDetails = $this->db->get(); $certificateDetails = $cerfDetails->result(); @@ -98,14 +124,29 @@ class StatusUpdation_model extends CI_Model $this->db->select('ListName'); $this->db->from(PICK_LIST_DETAILS); $this->db->where('ListCode', $listCode); + $this->db->like('ListName', 'received'); + $this->db->like('ListName', 'issued'); $statusDetails = $this->db->get()->first_row(); - return $statusDetails->ListName; + if ( count($statusDetails) == 1) { + return true; + } else { + return false; + } + } + + // self function for getting certificate name for the CERTIFICATECODE + public function get_certificate_name($listCode) { + $this->db->select('CertificateName'); + $this->db->from(CERTIFICATION); + $this->db->where('CertificationID', $listCode); + $cerfDetails = $this->db->get()->first_row(); + return $cerfDetails->CertificateName; } // update answer booklet status public function update_answerbooklet($arr) { // print_r($arr);exit(); - $this->db->insert_batch('T_AnswerBookletStatus', $arr); + $this->db->insert_batch('ANSWER_BOOKLET', $arr); if ($this->db->affected_rows() >= 1) { // $this->smssend($arr); $result['addStatus'] = true; @@ -119,12 +160,15 @@ class StatusUpdation_model extends CI_Model // update study material status public function update_semyear($arr) { - - $this->db->insert_batch('T_StudyMaterialStatus', $arr); + $this->get_status_name_ListCode($arr[0]['ListCode']); + $this->db->insert_batch(STUDY_MATERIAL_STATUS, $arr); if ($this->db->affected_rows() >= 1) { - if((get_status_name_ListCode($arr[0]['ListCode'] == 'Received' || 'received') || (get_status_name_ListCode($arr[0]['ListCode'] == 'Issued' || 'issued') ) { + // if(($this->get_status_name_ListCode($arr[0]['ListCode']) == 'Received' || 'received' || 'Active') || ($this->get_status_name_ListCode($arr[0]['ListCode']) == 'Issued' || 'issued')) { + if($this->get_status_name_ListCode($arr[0]['ListCode'])) { $dateToMsg = $arr[0]['SDate']; - $mesg = "Your new password for logging into Apollo student portal is $dateToMsg'. Please change the password as soon as you login."; + $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); + $cerNamtToMsg = 'Study Material'; + $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg."; $this->smssend($arr, $mesg); } // $this->smssend($arr); @@ -162,8 +206,10 @@ class StatusUpdation_model extends CI_Model $Course = $reqData['Course']; $Batch = $reqData['Batch']; - $subQuery = "SELECT S.* - FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID + $subQuery = "SELECT S.* , 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%' diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 7202906e..bfdbd326 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -76,7 +76,10 @@ "STUDENTDETAILS": "STUDENT DETAILS", "status" : { "MAIN": "STATUS UPDATE", - "STUDYMATERIAL": "STUDY MATERIAL" + "STUDYMATERIAL": "STUDY MATERIAL", + "ANSWERBOOKLET": "ANSWER BOOKLET", + "CERTIFICATION": "CERTIFICATION", + "APPLICATION" : "APPLICATION" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index e4d62d21..56bf73dc 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -130,6 +130,19 @@ app.constant('JS_REQUIRES', { * */ 'feesStatusCtrl':'assets/js/controllers/feesStatusCtrl.js', /*student status update*/ + /* + * student Answer Booklet status updation + * */ + 'answerBookletStatusCtrl': 'assets/js/controllers/answerBookletStatusCtrl.js', + /* + * student Certification status updation + * */ + 'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', + /* + * student Certification status updation + * */ + 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', + 'studentStatusUpdateCtrl':'assets/js/controllers/studentStatusUpdateCtrl.js', //*** Filters diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index c685e44b..88e5a348 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -152,7 +152,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.master.studentStatusUpdate', { url: '/default activity', templateUrl: "assets/views/studentStatusUpdate.html", - resolve: loadSequence('studentStatusUpdateCtrl','ngTable', 'ladda', 'angular-ladda'), + resolve: loadSequence('ui.select','studentStatusUpdateCtrl','ngTable', 'ladda', 'angular-ladda'), title: 'Status', ncyBreadcrumb: { label: 'Status' @@ -207,9 +207,36 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com url: '/studymaterial', templateUrl: "assets/views/status-update/study_material_status.html", title: 'Study Material', - resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'ngTable', 'studyMaterialStatusCtrl'), + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'studyMaterialStatusCtrl'), ncyBreadcrumb: { label: 'Study Material' + }, + // resolve: loadSequence('wizardCtrl') + }).state('app.student.status.answerbooklet', { + url: '/answerbooklet', + templateUrl: "assets/views/status-update/answer_booklet_status.html", + title: 'Answer Booklet', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'answerBookletStatusCtrl'), + ncyBreadcrumb: { + label: 'Answer Booklet' + }, + // resolve: loadSequence('wizardCtrl') + }).state('app.student.status.certificationstatus', { + url: '/certificationstatus', + templateUrl: "assets/views/status-update/certification_status.html", + title: 'Certification', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), + ncyBreadcrumb: { + label: 'Certification' + }, + // resolve: loadSequence('wizardCtrl') + }).state('app.student.status.applicationstatus', { + url: '/applicationstatus', + templateUrl: "assets/views/status-update/application_status.html", + title: 'Application Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + ncyBreadcrumb: { + label: 'Application Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index 5d5539f3..112794bb 100644 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -7,6 +7,11 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa * by : kdk */ + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index ed4ea2ad..d1339685 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -7,6 +7,11 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl * by : kdk */ + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index d112a302..11f38412 100644 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -7,6 +7,10 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa * by : kdk */ + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); @@ -307,7 +311,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa return true; } }); - alert(JSON.stringify(studentForUpdate)); + // alert(JSON.stringify(studentForUpdate)); function getStudentForUpdateDetails(id) { this.StudentID = id; this.CourseID = $scope.myStatusModel.semYear; diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 1ef08639..69cc7e9a 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -7,6 +7,10 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa * by : kdk */ + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 40ae9422..a5321bbb 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -226,6 +226,21 @@ Fess +
  • + + Answer Booklet + +
    • +
  • + + Certification + +
    • +
  • + + Application + +
    • diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index 0a705799..6ccc3dad 100644 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -99,8 +99,8 @@ $("#search").focus(); }); -

    +

    @@ -108,7 +108,8 @@ - + First Name @@ -122,6 +123,9 @@ Email ID + Course + + @@ -137,6 +141,7 @@ {{p.Lastname}} {{p.MobileNumber}} {{p.EmailID}} + {{p.CourseName}} @@ -152,34 +157,38 @@
    -
    -
    -