From 24f8c83d417614cb2f20cf0633ddd9f09a9ec566 Mon Sep 17 00:00:00 2001
From: resicovenba <venbatechnologies@gmail.com>
Date: Thu, 28 Dec 2017 18:41:17 +0530
Subject: [PATCH 1/2] mark card type added: kdk

---
 .../controllers/StatusUpdation_Controller.php |  3 +-
 .../models/StatusUpdation_model.php           |  7 ++--
 .../js/controllers/certificationStatusCtrl.js |  2 +-
 .../status-update/certification_status.html   | 39 ++++++++++---------
 4 files changed, 28 insertions(+), 23 deletions(-)

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..3b8cfb5b 100644
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -87,7 +87,8 @@ 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);
             }
@@ -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/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/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 @@
                                                                 <thead style="background-color: cadetblue">
                                                                     <th>Status</th>
                                                                     <th>Comments</th>
-                                                                    <th>Certificate Name</th>
+                                                                    <th>Type</th>
+                                                                    <th>Mark Card Number</th>
                                                                     <th>Date</th>
                                                                     <th>Updated By</th>
                                                                 </thead>
                                                                 <tbody ng-repeat="s in prevStatusListForStudentCourse">
                                                                     <td>{{s.ListName}}</td>
                                                                     <td>{{s.Comments}}</td>
-                                                                    <td>{{s.CertificateName}}</td>
+                                                                    <td>{{s.CertificationType}}</td>
+                                                                    <td>{{s.CertificationNo}}</td>
                                                                     <td>{{s.CDate}}</td>
                                                                     <td>{{s.Firstname}}</td>
                                                                 </tbody>
@@ -219,7 +221,7 @@
                                                     Update Status
                                                 </legend>
                                                 <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}">
+                                                    <!--<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">
                                                Certificate Type <span class="symbol required"></span>
                                                 </label>
@@ -231,19 +233,8 @@
                                                 </select>
                                                         <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>
-                                               Certificate Number
-                                                    
-                                            </label>
-                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Certificate Number" class="form-control" ng-model="myStatusModel.certificateNumber"
-                                                        />
-                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Status is Required </span>
-                                                    </div>
-                                                </div>
-                                                <div class="row">
-                                                    <div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
+                                                    </div>-->
+                                                          <div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
                                                         <label for="form-field-select-2">
                                                Sem/Year <span class="symbol required"></span>
                                                 </label>
@@ -256,7 +247,19 @@
                                                         <span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
 
                                                     </div>
-                                                    <div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
+                                                        <label>
+                                               Mark Card Number
+                                                    
+                                            </label>
+                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Mark Card Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Number is Required </span>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                              
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
                                                         <label for="form-field-select-2">
                                                Status <span class="symbol required"></span>
                                                 </label>
@@ -279,7 +282,7 @@
                                                     <span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
                                                 </div>-->
                                                     <div data-ng-controller="DatepickerDemoCtrl">
-                                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
+                                                        <div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
                                                             <label>
                                                 Date <span
                                                     class="symbol required"></span>

From 13fd695964662fcd1f73d5661857cf6fefa09579 Mon Sep 17 00:00:00 2001
From: resicovenba <venbatechnologies@gmail.com>
Date: Fri, 29 Dec 2017 11:02:22 +0530
Subject: [PATCH 2/2] documents status updated, certificate changed to Mark
 Card :kdk

---
 .../application/models/StatusUpdation_model.php    |  8 ++++----
 Apollo/assets/i18n/en.json                         |  4 ++--
 Apollo/assets/js/config.router.js                  |  8 ++++----
 .../views/status-update/application_status.html    | 14 +++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)

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 @@
                                                                 <thead style="background-color: cadetblue">
                                                                     <th>Status</th>
                                                                     <th>Comments</th>
-                                                                    <th>Application Name</th>
+                                                                    <th>Document Name</th>
                                                                     <th>Date</th>
                                                                     <th>Updated By</th>
                                                                 </thead>
@@ -223,25 +223,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">
-                                               Application Type <span class="symbol required"></span>
+                                               Document 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 Application Type</option>
+                                                <option value="" disabled selected>Select Document 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">Certificate Type is Required</span>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
 
                                                     </div>
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
                                                         <label>
-                                               Application Number
+                                               Document Number
                                                     
                                             </label>
-                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Application Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        <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">Status is Required </span>
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
                                                     </div>
                                                 </div>
                                                 <div class="row">