diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php
index 7d08bb60..557b5b01 100755
--- a/Apollo/api/application/config/constants.php
+++ b/Apollo/api/application/config/constants.php
@@ -124,6 +124,7 @@ defined('STUDENTS_FEES_PAID') OR define('STUDENTS_FEES_PAID','T_Students_Fees_Pa
 defined('STUDY_MATERIAL_STATUS') OR define('STUDY_MATERIAL_STATUS','T_StudyMaterialStatus');
 defined('CERTIFICATION') OR define('CERTIFICATION','T_CertificationMaster');
 defined('DEFAULTACTIVITY') OR define('DEFAULTACTIVITY','T_StatusMaster');
+defined('CERTIFICATION_MASTER') OR define('CERTIFICATION_MASTER','T_CertificationMaster');
 
 
 
diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php
index 66ce2f43..76f62ad5 100755
--- a/Apollo/api/application/config/routes.php
+++ b/Apollo/api/application/config/routes.php
@@ -168,6 +168,11 @@ $route['getStatusListForUpdate'] = 'StatusUpdation_Controller/getStatusListForUp
 $route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo';
 
 
+/*get certificate Details*/  
+$route['getCertificateDetails'] = 'Certificate_Controller/getCertificateDetails';
+$route['addCertificateDetails'] = 'Certificate_Controller/addCertificateDetails';
+$route['updateCertificateDetails'] = 'Certificate_Controller/updateCertificateDetails';
+
 
 
 
diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php
index 39e73c1f..b723d5c2 100644
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -121,18 +121,18 @@ class StatusUpdation_model extends CI_Model
 
     // self function for getting the status for the LISTCODE
     public function get_ListCode_status($listCode) {
-            //  print_r ($listCode);exit();
+                //  print_r ($listCode);exit();
         $this->db->select('ListName');
         $this->db->from(PICK_LIST_DETAILS);
         $this->db->where('ListCode', $listCode);
-        $this->db->or_like('ListName', 'RECEIVED');
-        $this->db->or_like('ListName', 'ISSUED');
+        // $this->db->or_like('ListName', 'RECEIVED');
+        // $this->db->or_like('ListName', 'ISSUED');
         $statusDetails = $this->db->get()->first_row();
-        // echo count($statusDetails);exit();
-        if ( count($statusDetails) == 1) {
+        // echo $statusDetails->ListName;exit();
+        if ( $statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED') {
             return true;
         } else {
-            return false;
+            return false;   
         }
     }
 
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index bfdbd326..d9f9c1da 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -67,7 +67,8 @@
         "EMPLOYEE": "EMPLOYEE DETAILS",
         "ANNOUNCEMENT": "ANNOUNCEMENT DETAILS",
         "STATUS": "STATUS DETAILS",
-        "STUDENTSTATUS": "DEFAULT STUDENT ACTIVITY"
+        "STUDENTSTATUS": "DEFAULT STUDENT ACTIVITY",
+        "CERTIFICATETYPE": "CERTIFICATE TYPE"
       },
       "student": {
         "MAIN": "MANAGE STUDENTS",
diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js
index f1b972be..9f13773a 100755
--- a/Apollo/assets/js/config.constant.js
+++ b/Apollo/assets/js/config.constant.js
@@ -142,6 +142,10 @@ app.constant('JS_REQUIRES', {
         * student Certification status updation
         * */
         'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js',
+         /*
+        * Certificate Type 
+        * */
+        'certificateCtrl': 'assets/js/controllers/certificateCtrl.js',
 
 
         'studentStatusUpdateCtrl':'assets/js/controllers/studentStatusUpdateCtrl.js',
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index 8415a8e6..174b6654 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -165,7 +165,16 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
             ncyBreadcrumb: {
                 label: 'Status'
             },
-             }).state('app.master.activity', {
+             }).state('app.master.certificateType', {
+                url: '/certificates',
+                templateUrl: "assets/views/certificate/certificate.html",
+                resolve: loadSequence('ui.select','certificateCtrl','ngTable', 'ladda', 'angular-ladda'),
+                title: 'Certrificates',
+                ncyBreadcrumb: {
+                    label: 'Certificates'
+                },
+                // resolve: loadSequence('iconsCtrl')
+            }).state('app.master.activity', {
                 url: '/activity',
                 templateUrl: "assets/views/activity.html",
                 resolve: loadSequence('ui.select','activityCtrl','ngTable', 'ladda', 'angular-ladda'),
diff --git a/Apollo/assets/views/certificate/certificate.html b/Apollo/assets/views/certificate/certificate.html
index a3677cf2..feb6e03c 100644
--- a/Apollo/assets/views/certificate/certificate.html
+++ b/Apollo/assets/views/certificate/certificate.html
@@ -127,7 +127,7 @@
                     </td>
                 </tr>
                 <tr ng-show="editId === p.CertificationID" ng-if="editId === p.CertificationID">
-                                            <td colspan="12" ng-include src="'assets/views/editCertificationDetails.html'"></td>
+                                            <td colspan="12" ng-include src="'assets/views/certificate/editCertificationDetails.html'"></td>
                                         </tr>
 
             </tbody>
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index b81c4fec..89912d38 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -74,6 +74,7 @@
 					<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
 				</a>
 			</li>
+		
 
 
 		</ul>
@@ -190,6 +191,11 @@
 					<span class="title" translate="sidebar.nav.master.ANNOUNCEMENT"> Announcement DETAILS </span>
 				</a>
 			</li>
+				<li ui-sref-active="active" >
+				<a ui-sref="app.master.certificateType">
+					<span class="title" translate="sidebar.nav.master.CERTIFICATETYPE"> CERTIFICATETYPE</span>
+				</a>
+			</li>
 
 
 		</ul>