diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 316c1c50..0bba8714 100644 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -230,7 +230,8 @@ class StatusUpdation_Controller extends REST_Controller { 'Comments' => $reqData[$i]['Comments'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime, - 'CertificationType' => $reqData[$i]['CertificateType'], + // 'CertificationType' => $reqData[$i]['CertificateType'], + 'CertificationType' => 'MARK CARD', 'CertificationNo' =>$reqData[$i]['CertificateNumber'], ); } diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 6cea1732..69e6a225 100644 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -64,10 +64,10 @@ class StatusUpdation_model extends CI_Model $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg."; $this->smssend($arr, $mesg); } + // $result['addStatus'] = true; + // $result['message'] = "Successfully Certification Status Updated"; $result['addStatus'] = true; - $result['message'] = "Successfully Certification Status Updated"; - $result['addStatus'] = true; - $result['message'] = "Successfully Application Status Updated"; + $result['message'] = "Successfully Documents Status Updated"; } else { $result['addStatus'] = false; $result['message'] = "Something went wrong.please try again"; @@ -87,12 +87,13 @@ class StatusUpdation_model extends CI_Model if($this->get_ListCode_status($arr[0]['ListCode'])){ $dateToMsg = $arr[0]['CDate']; $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']); - $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); + // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); + $cerNamtToMsg = 'MARK CARD'; $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg."; $this->smssend($arr, $mesg); } $result['addStatus'] = true; - $result['message'] = "Successfully Certification Status Updated"; + $result['message'] = "Successfully Mark Card Status Updated"; } else { $result['addStatus'] = false; $result['message'] = "Something went wrong.please try again"; @@ -192,7 +193,7 @@ class StatusUpdation_model extends CI_Model } else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) { $searchFor = 'C001'; $searchTableFor = CERTIFICATION_STATUS; - $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); + $this->db->select('t1.*, t4.Firstname, t5.ListName'); $this->db->from(''. $searchTableFor . ' as t1'); $this->db->where('t1.StudentID', $reqDetails['student']); $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); @@ -200,7 +201,7 @@ class StatusUpdation_model extends CI_Model $this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT'); $this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT'); $this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT'); - $this->db->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT'); + // $this->db->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT'); $this->db->order_by('t1.CreatedOn', 'DESC'); $statusDetails = $this->db->get(); $prevStatusDetails = $statusDetails->result(); diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 6c36fb4f..d9d226db 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -80,8 +80,8 @@ "MAIN": "STATUS UPDATE", "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", - "CERTIFICATION": "CERTIFICATION", - "APPLICATION" : "APPLICATION" + "CERTIFICATION": "MARK CARD", + "APPLICATION" : "DOCUMENTS" } }, "status": { diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9e2352a5..060b0d4a 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -249,19 +249,19 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.student.status.certificationstatus', { url: '/certificationstatus', templateUrl: "assets/views/status-update/certification_status.html", - title: 'Certification', + title: 'Mark Card', resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), ncyBreadcrumb: { - label: 'Certification' + label: 'Mark Card' }, // resolve: loadSequence('wizardCtrl') }).state('app.student.status.applicationstatus', { url: '/applicationstatus', templateUrl: "assets/views/status-update/application_status.html", - title: 'Application Status', + title: 'Documents Status', resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), ncyBreadcrumb: { - label: 'Application Status' + label: 'Documents Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index b6541735..2426322d 100644 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -29,7 +29,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.init = function () { $scope.getUniversityList(); - $scope.getCertificateList(); + // $scope.getCertificateList(); } $scope.searchData = { diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index 96f94ce0..9729d3b5 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -175,7 +175,7 @@ Status Comments - Application Name + Document Name Date Updated By @@ -223,25 +223,25 @@
- Certificate Type is Required + Document Type is Required
- - Status is Required + Document Number is Required
diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/certification_status.html index debf8852..ef1f0db6 100644 --- a/Apollo/assets/views/status-update/certification_status.html +++ b/Apollo/assets/views/status-update/certification_status.html @@ -173,14 +173,16 @@ Status Comments - Certificate Name + Type + Mark Card Number Date Updated By {{s.ListName}} {{s.Comments}} - {{s.CertificateName}} + {{s.CertificationType}} + {{s.CertificationNo}} {{s.CDate}} {{s.Firstname}} @@ -219,7 +221,7 @@ Update Status
-
+ +
@@ -256,7 +247,19 @@ Sem/Year is Required
-
+
+ + + Number is Required +
+
+
+ +
@@ -279,7 +282,7 @@ Status is Required
-->
-
+