Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/models/StatusUpdation_model.php

@@ -68,6 +68,7 @@ class StatusUpdation_model extends CI_Model {
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
                     $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
                     $this->smssend($arr, $mesg);
+                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
                     $cerNamtToMsg =  $this->get_certificate_name($arr[0]['CertificationType']);
                     $getSemYearMsg = $this->get_couser_name($arr[0]['CourseID']);
@@ -75,6 +76,7 @@ class StatusUpdation_model extends CI_Model {
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
                     $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
                     $this->smssend($arr, $mesg);
+                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else {
                 }
 
@@ -121,6 +123,7 @@ class StatusUpdation_model extends CI_Model {
 						// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
 						$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
 						$this->smssend($arr, $mesg);
+                        $this->mailsend($arr, $mesg, $cerNamtToMsg);
 					} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
 						$cerNamtToMsg = 'Mark Card';
 						$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@@ -128,6 +131,7 @@ class StatusUpdation_model extends CI_Model {
 						// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
 						$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
 						$this->smssend($arr, $mesg);
+                        $this->mailsend($arr, $mesg, $cerNamtToMsg);
 					} else {
 					}
 					// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
@@ -174,6 +178,15 @@ class StatusUpdation_model extends CI_Model {
         return $roleDetails->MobileNumber;
     }
 
+       // self function for getting registered email for mail send
+    public function get_registered_email($num) {
+        $this->db->select('EmailID');
+        $this->db->from(STUDENTS);
+        $this->db->where('StudentID', $num);
+        $roleDetails = $this->db->get()->first_row();
+        return $roleDetails->EmailID;
+    }
+
     // self function for getting the status for the LISTCODE
     public function get_ListCode_status($listCode) {
         $this->db->select('ListName');
@@ -297,8 +310,23 @@ class StatusUpdation_model extends CI_Model {
         $this->db->insert_batch(ANSWER_BOOKLET, $arr);
         if ($this->db->affected_rows() >= 1) {
             $this->updateBookletStatusInCallTrack($arr, $reqDetails);
-            $result['addStatus'] = true;
+            $studentName = $this->getStudentName($arr[0]['StudentID']);
-            $result['message'] = "Successfully Answer Booklet Status Updated";
+            $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
+                // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
+                if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
+                    $cerNamtToMsg = 'Answer booklet';
+                    $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
+                    $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
+                    // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
+                    $this->smssend($arr, $mesg);
+                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
+                    $result['addStatus'] = true;
+                    $result['message'] = "Successfully Answer Booklet Status Updated";
+                }else{
+                    $result['addStatus'] = true;
+                    $result['message'] = "Successfully Answer Booklet Status Updated";
+                }
         } else {
             $result['addStatus'] = false;
             $result['message'] = "Something went wrong.please try again";
@@ -340,6 +368,7 @@ class StatusUpdation_model extends CI_Model {
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
                     $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
                     $this->smssend($arr, $mesg);
+                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
                     $cerNamtToMsg = 'Study Material';
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@@ -347,6 +376,7 @@ class StatusUpdation_model extends CI_Model {
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
                     $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
                     $this->smssend($arr, $mesg);
+                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else {
                 }
             }
@@ -549,34 +579,44 @@ class StatusUpdation_model extends CI_Model {
         return $output;
     }
 
-    // public function mailsend() {
+    public function mailsend($arr, $msg, $sub) {
-    //     //Load email library
+        $emails = array();
-    //     $this->load->library('email');
+        foreach ($arr as $ar) {
-    //     //SMTP & mail configuration
+            $mobi = $this->get_registered_email($ar['StudentID']);
-    //     $config = array(
+            array_push($emails, "$mobi");
-    //         'protocol'  => 'smtp',
+        }
-    //         'smtp_host' => 'ssl://smtp.example.com',
+        $list = implode(',', $emails);
-    //         'smtp_port' => 465,
+        //Load email library
-    //         'smtp_user' => 'email@example.com',
+        $this->load->library('email');
-    //         'smtp_pass' => 'email_password',
+        //SMTP & mail configuration
-    //         'mailtype'  => 'html',
+        $config = array(
-    //         'charset'   => 'utf-8'
+            'protocol'  => 'ssmtp',
-    //     );
+            'smtp_host' => 'ssl://smtp.example.com',
-    //     $this->email->initialize($config);
+            'smtp_port' => 465,
-    //     $this->email->set_mailtype("html");
+            'smtp_user' => 'noreply@apollodec.com',
-    //     $this->email->set_newline("\r\n");
+            'smtp_pass' => 'Apollo@123',
-    //     //Email content
+            'mailtype'  => 'html',
-    //     $htmlContent = '<h1>Sending email via SMTP server</h1>';
+            'charset'   => 'utf-8'
-    //     $htmlContent .= '<p>This email has sent via SMTP server from CodeIgniter application.</p>';
+        );
-    //     // Email body load the html template
+        $this->email->initialize($config);
-    //     // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
+        $this->email->set_mailtype("html");
-    //     $this->email->to('recipient@example.com');
+        $this->email->set_newline("\r\n");
-    //     $this->email->from('sender@example.com','MyWebsite');
+        //Email content
-    //     $this->email->subject('How to send email via SMTP server in CodeIgniter');
+        // $htmlContent = '<h1>Sending email via SMTP server</h1>';
-    //     $this->email->message($htmlContent);
+        $htmlContent = $msg;
-    //     //Send email
+        // Email body load the html template
-    //     $this->email->send();
+        // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
-    // }
+        $this->email->to($list);
+        $this->email->from('noreply@apollodec.com','Apollo');
+        $subj = $sub;
+        $this->email->subject($subj);
+        $this->email->message($htmlContent);
+        //Send email
+        $result = $this->email->send();
+        //  echo $this->email->print_debugger(); exit();
+        return $result;
+       
+    }
     /*
      * update followup details for booklet details in call tracking
      * created by kms

Apollo/api/application/models/Student_model.php

@@ -592,6 +592,9 @@ class Student_model extends CI_Model {
                                 $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
                                 $arr = $userId;
                                 $this->smssend($arr, $msg);
+                                $emailId = $Arr['EmailID'];
+                                $sub = ' Apollo - Course Registration';
+                                $this->mailsend($emailId, $msg, $sub);
                                 $result['addStudentStatus'] = true;
                                 $result['message'] = "Successfully student details added";
                             } else {
@@ -636,11 +639,15 @@ class Student_model extends CI_Model {
                             $this->db->insert(LOGIN, $loginArr);
                             if ($this->db->affected_rows() == '1') {
                                 $userId = $Arr['MobileNumber'];
+                                
                                 $getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
                                 $getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
                                 $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
                                 $arr = $userId;
                                 $this->smssend($arr, $msg);
+                                $emailId = $Arr['EmailID'];
+                                $sub = ' Apollo - Course Registration';
+                                $this->mailsend($emailId, $msg, $sub);
                                 $result['addStudentStatus'] = true;
                                 $result['message'] = "Successfully student details added";
                             } else {
@@ -1170,4 +1177,44 @@ class Student_model extends CI_Model {
         return $output;
     }
 
+    public function mailsend($arr, $msg, $sub) {
+        // $emails = array();
+        // foreach ($arr as $ar) {
+        //     $mobi = $this->get_registered_email($ar['StudentID']);
+        //     array_push($emails, "$mobi");
+        // }
+        // $list = implode(',', $emails);
+        $list = $arr;
+        //Load email library
+        $this->load->library('email');
+        //SMTP & mail configuration
+        $config = array(
+            'protocol'  => 'ssmtp',
+            'smtp_host' => 'ssl://smtp.example.com',
+            'smtp_port' => 465,
+            'smtp_user' => 'noreply@apollodec.com',
+            'smtp_pass' => 'Apollo@123',
+            'mailtype'  => 'html',
+            'charset'   => 'utf-8'
+        );
+        $this->email->initialize($config);
+        $this->email->set_mailtype("html");
+        $this->email->set_newline("\r\n");
+        //Email content
+        // $htmlContent = '<h1>Sending email via SMTP server</h1>';
+        $htmlContent = $msg;
+        // Email body load the html template
+        // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
+        $this->email->to($list);
+        $this->email->from('noreply@apollodec.com','Apollo');
+        $subj = $sub;
+        $this->email->subject($subj);
+        $this->email->message($htmlContent);
+        //Send email
+        $result = $this->email->send();
+        //  echo $this->email->print_debugger(); exit();
+        return $result;
+       
+    }
+
 }

Apollo/assets/i18n/en.json

@@ -104,8 +104,9 @@
           "MAIN": "UPDATE STATUS ",
           "STUDYMATERIAL": "STUDY MATERIAL",
           "ANSWERBOOKLET": "ANSWER BOOKLET",
-          "CERTIFICATION": "MARK CARD",
+          "MARKCARD": "MARK CARD",
-          "APPLICATION" : "DOCUMENTS"
+          "APPLICATION" : "DOCUMENTS",
+          "CERTIFICATE": "CERTIFICATE"
         }
       },
       "status": {

Apollo/assets/js/config.constant.js

@@ -153,11 +153,11 @@ app.constant('JS_REQUIRES', {
         /*
         * student Certification status updation
         * */
-        'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js',
+        'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js',
          /*
         * student Certification status updation
         * */
-        'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js',
+        'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js',
          /*
         * Certificate Type 
         * */

Apollo/assets/js/config.router.js

@@ -307,22 +307,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'Answer Booklet'
                 },
                 // resolve: loadSequence('wizardCtrl')
-            }).state('app.student.status.certificationstatus', {
+            }).state('app.student.status.markcardstatus', {
-                url: '/certificationstatus',
+                url: '/markcardstatus',
-                templateUrl: "assets/views/status-update/certification_status.html",
+                templateUrl: "assets/views/status-update/markcard_status.html",
                 title: 'Mark Card',
-                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'),
+                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'),
                 ncyBreadcrumb: {
                     label: 'Mark Card'
                 },
                 // resolve: loadSequence('wizardCtrl')
-            }).state('app.student.status.applicationstatus', {
+            }).state('app.student.status.certificatestatus', {
-                url: '/applicationstatus',
+                url: '/certificatestatus',
-                templateUrl: "assets/views/status-update/application_status.html",
+                templateUrl: "assets/views/status-update/certificate_status.html",
-                title: 'Documents Status',
+                title: 'Certificate Status',
-                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'),
+                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'),
                 ncyBreadcrumb: {
-                    label: 'Documents Status'
+                    label: 'Certificate Status'
                 },
                 // resolve: loadSequence('wizardCtrl')
             }).state('app.status.application', {

Apollo/assets/js/controllers/certificateStatusCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
+app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
 
     /**
     * Application status update search / Document status update

Apollo/assets/js/controllers/markcardStatusCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
+app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
 
     /**
     * Certification status update search / Mark card status update

Apollo/assets/views/dashboard.html

@@ -36,7 +36,7 @@
 
 							</div>-->
 							<div class="panel-body">
-								<label class="text-bold">{{registration.UniversityName | uppercase}}</label>
+								<label>{{registration.UniversityName | uppercase}}</label>
 								<div>
 								<label>No of Registration &nbsp;:&nbsp;<span>{{registration.StudentCounts}}</span></label>
 								</div>

Apollo/assets/views/partials/nav.html

@@ -199,13 +199,13 @@
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkSuperAdmin()">
+						<a ui-sref="app.student.status.markcardstatus" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkSuperAdmin()">
 							Certification
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkSuperAdmin()">
+						<a ui-sref="app.student.status.certificatestatus" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkSuperAdmin()">
-							Application
+							Certificate
 						</a>
 					</li>
 				</ul>
@@ -648,13 +648,13 @@
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkAdmin()">
+						<a ui-sref="app.student.status.markcardstatus" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkAdmin()">
-							Certification
+							Markcard 
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkAdmin()">
+						<a ui-sref="app.student.status.certificatestatus" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkAdmin()">
-							Application
+							Certificate
 						</a>
 					</li>
 				</ul>
@@ -1020,12 +1020,12 @@
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION"  ng-click="checkStaff()">
+						<a ui-sref="app.student.status.markcardstatus" translate="sidebar.nav.student.status.MARKCARD"  ng-click="checkStaff()">
-							Certification
+							Markcard
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION"  ng-click="checkStaff()">
+						<a ui-sref="app.student.status.certificatestatus" translate="sidebar.nav.student.status.CERTIFICATE"  ng-click="checkStaff()">
 							Application
 						</a>
 					</li>
@@ -1276,12 +1276,12 @@
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION"  ng-click="checkStaff()">
+						<a ui-sref="app.student.status.markcardstatus" translate="sidebar.nav.student.status.MARKCARD"  ng-click="checkStaff()">
-							Certification
+							Markcard
 						</a>
 					</li>
 					<li ui-sref-active="active">
-						<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION"  ng-click="checkStaff()">
+						<a ui-sref="app.student.status.certificatestatus" translate="sidebar.nav.student.status.CERTIFICATE"  ng-click="checkStaff()">
 							Application
 						</a>
 					</li>

Apollo/assets/views/status-update/certificate_status.html

@@ -2,7 +2,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
+            <h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1>
             <span class="mainDescription">Update certificate status.</span>
         </div>
         <div ncy-breadcrumb></div>
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col-md-12">
             <!-- /// controller:  'UserCtrl' -  localtion: assets/js/controllers/userCtrl.js /// -->
-            <div ng-controller="applicationStatusCtrl">
+            <div ng-controller="certificateStatusCtrl">
                 <!-- start: STATUS -->
                 <div class="container" ng-init="init()">
                     <div class="row">
@@ -241,25 +241,25 @@
                                                 <div class="row">
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
                                                         <label for="form-field-select-2">
-                                               Document Type <span class="symbol required"></span>
+                                               Certificate Type <span class="symbol required"></span>
                                                 </label>
 
                                                         <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
                                                             required>
-                                                <option value="" disabled selected>Select Document Type</option>
+                                                <option value="" disabled selected>Select Certificate Type</option>
                                                 <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
                                                 </select>
-                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
 
                                                     </div>
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
                                                         <label>
-                                               Document Number
+                                               Certificate Number
                                                     
                                             </label>
                                                         <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
                                                         />
-                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
                                                     </div>
                                                 </div>
                                                 <div class="row">
@@ -352,25 +352,25 @@
                                                 <div class="row">
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
                                                         <label for="form-field-select-2">
-                                               Document Type <span class="symbol required"></span>
+                                               Certificate Type <span class="symbol required"></span>
                                                 </label>
 
                                                         <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
                                                             required>
-                                                <option value="" disabled selected>Select Document Type</option>
+                                                <option value="" disabled selected>Select Certificate Type</option>
                                                 <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
                                                 </select>
-                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
 
                                                     </div>
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
                                                         <label>
-                                               Document Number
+                                               Certificate Number
                                                     
                                             </label>
                                                         <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
                                                         />
-                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
                                                     </div>
                                                 </div>
                                                 <div class="row">

Apollo/assets/views/status-update/markcard_status.html

@@ -2,8 +2,8 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATION">{{ mainTitle }}</h1>
+            <h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1>
-            <span class="mainDescription">Update certification status.</span>
+            <span class="mainDescription">Update markcard status.</span>
         </div>
         <div ncy-breadcrumb></div>
     </div>
@@ -14,7 +14,7 @@
     <div class="row">
         <div class="col-md-12">
             <!-- /// controller:  'UserCtrl' -  localtion: assets/js/controllers/userCtrl.js /// -->
-            <div ng-controller="certificationStatusCtrl">
+            <div ng-controller="markcardStatusCtrl">
                 <!-- start: STATUS -->
                 <div class="container" ng-init="init()">
                     <div class="row">