diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index 3b8cfb5b..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"; @@ -93,7 +93,7 @@ class StatusUpdation_model extends CI_Model $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"; 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/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