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

NEW ROLE TRAINEE

Browse Source
This commit is contained in:
velz 2018-06-07 18:55:01 +05:30
parent a014dfa70f
commit debfe38adf
7 changed files with 238 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ defined('SUPER_ADMIN') OR define('SUPER_ADMIN','R004');
defined('ADMIN') OR define('ADMIN','R003');
defined('EMPLOYEE') OR define('EMPLOYEE','R002');
defined('STUDENT') OR define('STUDENT','R001');
defined('TRAINEE') OR define('TRAINEE','R005');
//status code
defined('OPEN') OR define('OPEN','S001');
defined('CLOSE') OR define('CLOSE','S002');

2
Apollo/api/application/models/Login_model.php
View File

@ -74,7 +74,7 @@ class Login_model extends CI_Model
$result['loginStatus'] = false;
$result['message'] = "Your login is de-activated.";
}
} else if ($loginDetails->ListCode == ADMIN || $loginDetails->ListCode == EMPLOYEE) {
} else if ($loginDetails->ListCode == ADMIN || $loginDetails->ListCode == EMPLOYEE || $loginDetails->ListCode == TRAINEE) {
//print_r($loginDetails);exit();
$this->db->select('t1.MobileNumber, t3.ListCode, t1.ID, t3.BranchCode, t3.FinanceModuleAccess');
$this->db->from('' . LOGIN . ' as t1');

2
Apollo/api/application/models/Student_model.php
View File

@ -232,7 +232,7 @@ class Student_model extends CI_Model {
$results['studentList'] = false;
}
}
} else if ($loginUserType == EMPLOYEE) {
} else if ($loginUserType == EMPLOYEE || $loginUserType == TRAINEE) {
// list for staff
if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
$this->db->select("S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName, C.CourseName");

7
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -91,6 +91,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* created by kms
* */
$scope.init = function () {
$scope.isTrainee = false;
var localUserType = JSON.parse(localStorage.getItem('localObj')).localType;
if(localUserType === 'R005')
{
$scope.isTrainee = true;
}
var getUniv = {
method: 'POST',
url: apiPoint.url + 'getUniversityCourseForFees/',

2
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -57,7 +57,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
sixteenYearsInMS = 1000 * 60 * 60 * 24 * 365 * 16,
sixteenYearsBeforeNow = new Date(nowInMS - sixteenYearsInMS);
if (localDetail != null) {
if (localDetails.localType === 'R003' || localDetails.localType === 'R002') {
if (localDetails.localType === 'R003' || localDetails.localType === 'R002' || localDetails.localType === 'R005') {
// $scope.currentDate = new Date(sixteenYearsBeforeNow);
$scope.currentDate = new Date();
$scope.getStudentList();

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

@ -991,6 +991,231 @@
</ul>
<!-- start: Trainee -->
<ul class="main-navigation-menu" ng-if="getLoginDash == 'trainee'">
<li ui-sref-active="active">
<a ui-sref="app.dashboard">
<div class="item-content">
<div class="item-media">
<i class="ti-home"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.dashboard.MAIN"> Dashboard </span>
</div>
</div>
</a>
</li>
<li ng-class="{'active open':$state.includes('app.student')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-user"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.student.MAIN"> STUDENT </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.student.studentDetails" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span>
</a>
</li>
<li>
<a href="javascript:;">
<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL" ng-click="checkStaff()">
Study Material
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES" ng-click="checkStaff()">
Fess
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET" ng-click="checkStaff()">
Answer Booklet
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()">
Certification
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
Application
</a>
</li>
</ul>
</li>
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.call')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-headphone-alt"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.tracking.MAIN"> CAll TRACKING </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.call.tracking" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.tracking.details"> ADD/VIEW DETAILS </span>
</a>
</li>
<!--<li ui-sref-active="active">
<a ui-sref="app.call.lead" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.tracking.lead"> LEAD DETAILS </span>
</a>
</li>-->
<li ui-sref-active="active">
<a ui-sref="app.call.close" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.tracking.close"> CLOSE DETAILS </span>
</a>
</li>
<!--<li ui-sref-active="active">
<a ui-sref="app.call.pending" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.tracking.pending"> PENDING DETAILS </span>
</a>
</li>-->
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">
<a ui-sref="app.call.tracking" ng-click="checkStaff()">
<div class="item-content">
<div class="item-media">
<i class="ti-headphone-alt"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.tracking.MAIN">CALL TRACKING </span>
</div>
</div>
</a>
</li>-->
<!--<li ng-class="{'active open':$state.includes('app.daybook')}">
<a ui-sref="app.daybook">
<div class="item-content">
<div class="item-media">
<i class="ti-check-box"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.MAIN">DAY BOOK </span><span>{{is_active_DayBookAprlAccess}}</span>
</div>
</div>
</a>
</li>-->
<li ng-class="{'active open':$state.includes('app.daybook')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-money"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.daybook.DAYBOOK"> DAY BOOK</span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.daybook.details" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
</a>
</li>
<li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
<a ui-sref="app.daybook.approval" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
</a>
</li>
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.hallTicket')}" ng-if="is_active_DayBookAprlAccess == '1'">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-write"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.hallTicket.MAIN">HALLTICKET</span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.hallTicket.generateHallTicket" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.hallTicket.GENERATEHALLTICKET">GENERATE HALLTICKET</span>
</a>
</li>
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile" ng-click="checkStaff()">
<div class="item-content">
<div class="item-media">
<i class="ti-id-badge"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.profile.MAIN">MY PROFILE </span>
</div>
</div>
</a>
</li>
</ul>
<ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
<li ui-sref-active="active">
<a ui-sref="app.studentView">
<div class="item-content">
<div class="item-media">
<i class="ti-id-badge"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.profile.MAIN"> My View </span>
</div>
</div>
</a>
</li>
</ul>
<!-- end: Trainee -->
<!-- end: Staff -->
<!-- end: MAIN NAVIGATION MENU -->

4
Apollo/assets/views/status-update/fees_status.html
View File

@ -121,10 +121,10 @@
<td>{{user.CourseName}}</td>
<!-- <td>{{user.SessionName}}</td>-->
<td>
<input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click To Set Fees" id="setRow{{user.ID}}" value="Set Fees" ng-click="setFees(user)">
<input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click To Set Fees" id="setRow{{user.ID}}" value="Set Fees" ng-disabled="isTrainee" ng-click="setFees(user)">
</td>
<td>
<b></b> <input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click To Receive Fees" id="editRow{{user.ID}}" value="Receive Fees" ng-click="updateFees(user)">
<b></b> <input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click To Receive Fees" id="editRow{{user.ID}}" value="Receive Fees" ng-disabled="isTrainee" ng-click="updateFees(user)">
</td>