Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upate certificate type

Browse Source
This commit is contained in:
resicovenba 2017-12-22 14:16:30 +05:30
parent e630965655
commit 48794a0434
8 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/constants.php
View File

@ -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');

5
Apollo/api/application/config/routes.php
View File

@ -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';

12
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -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;
}
}

3
Apollo/assets/i18n/en.json
View File

@ -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",

4
Apollo/assets/js/config.constant.js
View File

@ -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',

11
Apollo/assets/js/config.router.js
View File

@ -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'),

2
Apollo/assets/views/certificate/certificate.html
View File

@ -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>

6
Apollo/assets/views/partials/nav.html
View File

@ -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>