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

session control changes , and mobile number duplicate entry protect : kdk

Browse Source
This commit is contained in:
resicovenba 2018-02-06 10:25:47 +05:30
parent 43a6ad5a77
commit 3bde0dcc8c
7 changed files with 300 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Apollo/api/application/models/Employee_model.php
View File

@ -452,6 +452,22 @@ class Employee_model extends CI_Model
public function update_employee($empArr, $updateFor, $imageName, $imageSource, $imageSize) public function update_employee($empArr, $updateFor, $imageName, $imageSource, $imageSize)
{ {
if( $imageSource == '') { // update Employee without image if( $imageSource == '') { // update Employee without image
$this->db->select('*');
$this->db->from(STAFF);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if ($this->db->get()->first_row()) {
$result['updateEmpStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
}else {
$this->db->select('*');
$this->db->from(LOGIN);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if($this->db->get()->first_row()) {
$result['updateEmpStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else {
$this->db->where('StaffID', $updateFor); $this->db->where('StaffID', $updateFor);
$this->db->update(STAFF, $empArr); $this->db->update(STAFF, $empArr);
if ($this->db->affected_rows() == '1') { if ($this->db->affected_rows() == '1') {
@ -472,7 +488,31 @@ class Employee_model extends CI_Model
$result['updateEmpStatus'] = false; $result['updateEmpStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
}
}
} else { // update employee with image } else { // update employee with image
$this->db->select('*');
$this->db->from(STAFF);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if ($this->db->get()->first_row()) {
$result['updateEmpStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
}else {
$this->db->select('*');
$this->db->from(LOGIN);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if($this->db->get()->first_row()) {
$result['updateEmpStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else {
$target = "../images/employee/"; $target = "../images/employee/";
$getUploadStatus = $this->upload_image($imageSource, $imageSize, $target); $getUploadStatus = $this->upload_image($imageSource, $imageSize, $target);
$imageNameDb = $getUploadStatus['status'] == true ? $getUploadStatus['imageName'] : $getUploadStatus['imageName'] = 'default.jpeg'; $imageNameDb = $getUploadStatus['status'] == true ? $getUploadStatus['imageName'] : $getUploadStatus['imageName'] = 'default.jpeg';
@ -508,6 +548,8 @@ class Employee_model extends CI_Model
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
} }
}
}
return $result; return $result;
} }

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

@ -598,9 +598,30 @@ if($StuStatus == '' ){
// print_r($empArr); // print_r($empArr);
// print_r($updateFor); // print_r($updateFor);
// exit(); // exit();
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StudentID', $updateFor);
if ($this->db->get()->first_row()) {
$result['updateStuStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else {
$this->db->select('*');
$this->db->from(LOGIN);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if($this->db->get()->first_row()) {
$result['updateStuStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else {
$this->db->where('StudentID', $updateFor); $this->db->where('StudentID', $updateFor);
$this->db->update(STUDENTS, $empArr); $this->db->update(STUDENTS, $empArr);
if ($this->db->affected_rows() == '1') { if ($this->db->affected_rows() == '1') {
$mobile = $empArr['MobileNumber']; $mobile = $empArr['MobileNumber'];
$email = $empArr['EmailID']; $email = $empArr['EmailID'];
$active = $empArr['IsActive']; $active = $empArr['IsActive'];
@ -618,6 +639,26 @@ if($StuStatus == '' ){
$result['updateStuStatus'] = false; $result['updateStuStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
}
}
} else {
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StudentID', $updateFor);
if ($this->db->get()->first_row()) {
$result['updateStuStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else {
$this->db->select('*');
$this->db->from(LOGIN);
$this->db->where('MobileNumber', $empArr['MobileNumber']);
$this->db->where_not_in('StaffID', $updateFor);
if($this->db->get()->first_row()) {
$result['updateStuStatus'] = false;
$result['message'] = "This Mobile Number Already Exist";
} else { } else {
$target = "../images/student/"; $target = "../images/student/";
$getUploadStatus = $this->upload_image($imageSource, $size, $target); $getUploadStatus = $this->upload_image($imageSource, $size, $target);
@ -654,6 +695,8 @@ if($StuStatus == '' ){
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
} }
}
}
return $result; return $result;
} }

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

@ -568,7 +568,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
} }
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.updateEmpStatus = true) { if (response.data.updateEmpStatus == true) {
swal("", "Updated Successfully.", "success"); swal("", "Updated Successfully.", "success");
$scope.getEmployeeList(); $scope.getEmployeeList();
$scope.editId = -1; $scope.editId = -1;

82
Apollo/assets/js/controllers/sessionCtrl.js
View File

@ -3,7 +3,7 @@
* controllers used for the session * controllers used for the session
*/ */
app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', '$window', function ($scope, $localStorage, $state, ipCookie, $window) { app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie', '$window', '$location', function ($scope, $localStorage, $state, ipCookie, $window, $location) {
/** /**
* checking the session settings and logout for the function * checking the session settings and logout for the function
*/ */
@ -37,6 +37,86 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie',
$state.go('login.signin'); $state.go('login.signin');
} }
// check login user as Super Admin
$scope.checkSuperAdmin = function () {
var inlocalDetails = JSON.parse(localStorage.getItem('localObj'));
var inlocalDetailss = ipCookie('cookiechk');
if (inlocalDetails != null) {
if (inlocalDetails.localType == 'R004' && inlocalDetailss.localType == 'R004') {
} else {
if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
ipCookie.remove('cookiechk');
$window.localStorage.clear();
$state.go('login.signin');
} else {
$location.url('/dashboard').replace();
$window.location.reload();
$state.go('app.dashboard');
}
// alert(inlocalDetails.localType);
// $state.go('login.signin');
// $state.go($state.current, {}, { reload: true });
}
} else {
$state.go('login.signin');
}
}
// check login user as Admin
$scope.checkAdmin = function () {
var inlocalDetails = JSON.parse(localStorage.getItem('localObj'));
var inlocalDetailss = ipCookie('cookiechk');
if (inlocalDetails != null) {
if (inlocalDetails.localType == 'R003' && inlocalDetailss.localType == 'R003') {
} else {
if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
ipCookie.remove('cookiechk');
$window.localStorage.clear();
$state.go('login.signin');
} else {
$location.url('/dashboard').replace();
$window.location.reload();
$state.go('app.dashboard');
}
// alert(inlocalDetails.localType);
// $state.go('login.signin');
// $state.go($state.current, {}, { reload: true });
}
} else {
$state.go('login.signin');
}
}
// check login user as Staff
$scope.checkStaff = function () {
var inlocalDetails = JSON.parse(localStorage.getItem('localObj'));
var inlocalDetailss = ipCookie('cookiechk');
if (inlocalDetails != null) {
if (inlocalDetails.localType == 'R002' && inlocalDetailss.localType == 'R002') {
} else {
if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
ipCookie.remove('cookiechk');
$window.localStorage.clear();
$state.go('login.signin');
} else {
$location.url('/dashboard').replace();
$window.location.reload();
$state.go('app.dashboard');
}
// alert(inlocalDetails.localType);
// $state.go('login.signin');
// $state.go($state.current, {}, { reload: true });
}
} else {
$state.go('login.signin');
}
}
}]); }]);
app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", "$state", 'ipCookie', '$window', function ($scope, $http, apiPoint, $localStorage, $state, ipCookie, $window) { app.controller('topnavCtrl', ["$scope", "$http", "API_POINTS", "$localStorage", "$state", 'ipCookie', '$window', function ($scope, $http, apiPoint, $localStorage, $state, ipCookie, $window) {

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

@ -29,51 +29,51 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.studentStatusUpdate"> <a ui-sref="app.master.studentStatusUpdate" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span> <span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.activity"> <a ui-sref="app.master.activity" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span> <span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.status"> <a ui-sref="app.master.status" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span> <span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.university"> <a ui-sref="app.master.university" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span> <span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.batch"> <a ui-sref="app.master.batch" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span> <span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.course"> <a ui-sref="app.master.course" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span> <span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.branch"> <a ui-sref="app.master.branch" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span> <span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.employee"> <a ui-sref="app.master.employee" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span> <span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.dayBookMaster"> <a ui-sref="app.master.dayBookMaster" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span> <span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
</a> </a>
</li> </li>
@ -98,7 +98,7 @@
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.announcement"> <a ui-sref="app.announcement" ng-click="checkSuperAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-announcement"></i> <i class="ti-announcement"></i>
@ -129,7 +129,7 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.studentDetailsSuperAdmin"> <a ui-sref="app.student.studentDetailsSuperAdmin" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTDETAILSADDEDIT"> STUDENT DETAILS </span> <span class="title" translate="sidebar.nav.student.STUDENTDETAILSADDEDIT"> STUDENT DETAILS </span>
</a> </a>
</li> </li>
@ -144,27 +144,27 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL"> <a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL" ng-click="checkSuperAdmin()">
Study Material Study Material
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES"> <a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES" ng-click="checkSuperAdmin()">
Fess Fess
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET"> <a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET" ng-click="checkSuperAdmin()">
Answer Booklet Answer Booklet
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION"> <a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkSuperAdmin()">
Certification Certification
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION"> <a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkSuperAdmin()">
Application Application
</a> </a>
</li> </li>
@ -201,22 +201,22 @@
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.tracking"> <a ui-sref="app.call.tracking" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.tracking.details"> ADD/VIEW DETAILS </span> <span class="title" translate="sidebar.nav.tracking.details"> ADD/VIEW DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.lead"> <a ui-sref="app.call.lead" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.tracking.lead"> LEAD DETAILS </span> <span class="title" translate="sidebar.nav.tracking.lead"> LEAD DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.close"> <a ui-sref="app.call.close" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.tracking.close"> CLOSE DETAILS </span> <span class="title" translate="sidebar.nav.tracking.close"> CLOSE DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.pending"> <a ui-sref="app.call.pending" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.tracking.pending"> PENDING DETAILS </span> <span class="title" translate="sidebar.nav.tracking.pending"> PENDING DETAILS </span>
</a> </a>
</li> </li>
@ -226,7 +226,7 @@
</ul> </ul>
</li> </li>
<li ng-class="{'active open':$state.includes('app.daybooksuperadmin')}"> <li ng-class="{'active open':$state.includes('app.daybooksuperadmin')}">
<a ui-sref="app.daybooksuperadmin"> <a ui-sref="app.daybooksuperadmin" ng-click="checkSuperAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-money"></i> <i class="ti-money"></i>
@ -251,12 +251,12 @@
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.broadCast.sendSMSPage"> <a ui-sref="app.broadCast.sendSMSPage" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.sendSMSPage.SENDSMS">SEND SMS</span> <span class="title" translate="sidebar.nav.sendSMSPage.SENDSMS">SEND SMS</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.broadCast.sendSMSDetails"> <a ui-sref="app.broadCast.sendSMSDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.sendSMSPage.SENDSMSDETAILS">SEND SMS</span> <span class="title" translate="sidebar.nav.sendSMSPage.SENDSMSDETAILS">SEND SMS</span>
</a> </a>
</li> </li>
@ -264,7 +264,7 @@
</li> </li>
<li ng-class="{'active open':$state.includes('app.myprofile')}"> <li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile"> <a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-id-badge"></i> <i class="ti-id-badge"></i>
@ -308,32 +308,32 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.studentStatusUpdate"> <a ui-sref="app.master.studentStatusUpdate" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span> <span class="title" translate="sidebar.nav.master.STUDENTSTATUS"> DEFAULT STUDENT ACTIVITY</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.activity"> <a ui-sref="app.master.activity" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span> <span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.status"> <a ui-sref="app.master.status" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span> <span class="title" translate="sidebar.nav.master.STATUS"> STATUS DETAILS</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.university"> <a ui-sref="app.master.university" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span> <span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.batch"> <a ui-sref="app.master.batch" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span> <span class="title" translate="sidebar.nav.master.BATCH"> BATCH DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.course"> <a ui-sref="app.master.course" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span> <span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
</a> </a>
</li> </li>
@ -345,7 +345,7 @@
</a> </a>
</li>--> </li>-->
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.employee"> <a ui-sref="app.master.employee" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span> <span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
</a> </a>
</li> </li>
@ -353,12 +353,12 @@
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.certificateType"> <a ui-sref="app.master.certificateType" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.CERTIFICATETYPE"> CERTIFICATETYPE</span> <span class="title" translate="sidebar.nav.master.CERTIFICATETYPE"> CERTIFICATETYPE</span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.master.dayBookMaster"> <a ui-sref="app.master.dayBookMaster" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span> <span class="title" translate="sidebar.nav.master.DAYBOOKMASTER"> DAY BOOK DETAILS </span>
</a> </a>
</li> </li>
@ -378,7 +378,7 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.studentDetails"> <a ui-sref="app.student.studentDetails" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span> <span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span>
</a> </a>
</li> </li>
@ -388,27 +388,27 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL"> <a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL" ng-click="checkAdmin()">
Study Material Study Material
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES"> <a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES" ng-click="checkAdmin()">
Fess Fess
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET"> <a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET" ng-click="checkAdmin()">
Answer Booklet Answer Booklet
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION"> <a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkAdmin()">
Certification Certification
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION"> <a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkAdmin()">
Application Application
</a> </a>
</li> </li>
@ -418,7 +418,7 @@
</ul> </ul>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.announcement"> <a ui-sref="app.announcement" ng-click="checkAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-announcement"></i> <i class="ti-announcement"></i>
@ -445,22 +445,22 @@
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.tracking"> <a ui-sref="app.call.tracking" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.tracking.details"> ADD/VIEW DETAILS </span> <span class="title" translate="sidebar.nav.tracking.details"> ADD/VIEW DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.lead"> <a ui-sref="app.call.lead" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.tracking.lead"> LEAD DETAILS </span> <span class="title" translate="sidebar.nav.tracking.lead"> LEAD DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.close"> <a ui-sref="app.call.close" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.tracking.close"> CLOSE DETAILS </span> <span class="title" translate="sidebar.nav.tracking.close"> CLOSE DETAILS </span>
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.call.pending"> <a ui-sref="app.call.pending" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.tracking.pending"> PENDING DETAILS </span> <span class="title" translate="sidebar.nav.tracking.pending"> PENDING DETAILS </span>
</a> </a>
</li> </li>
@ -488,7 +488,7 @@
</li>--> </li>-->
<li ng-class="{'active open':$state.includes('app.daybookadmin')}"> <li ng-class="{'active open':$state.includes('app.daybookadmin')}">
<a ui-sref="app.daybookadmin"> <a ui-sref="app.daybookadmin" ng-click="checkAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-money"></i> <i class="ti-money"></i>
@ -500,7 +500,7 @@
</a> </a>
</li> </li>
<li ng-class="{'active open':$state.includes('app.myprofile')}"> <li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile"> <a ui-sref="app.myprofile" ng-click="checkAdmin()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-id-badge"></i> <i class="ti-id-badge"></i>
@ -544,7 +544,7 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.studentDetails"> <a ui-sref="app.student.studentDetails" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span> <span class="title" translate="sidebar.nav.student.STUDENTDETAILS"> STUDENT DETAILS </span>
</a> </a>
</li> </li>
@ -554,27 +554,27 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL"> <a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL" ng-click="checkStaff()">
Study Material Study Material
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES"> <a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES" ng-click="checkStaff()">
Fess Fess
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET"> <a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET" ng-click="checkStaff()">
Answer Booklet Answer Booklet
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION"> <a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()">
Certification Certification
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION"> <a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
Application Application
</a> </a>
</li> </li>
@ -584,7 +584,7 @@
</ul> </ul>
</li> </li>
<li ng-class="{'active open':$state.includes('app.call')}"> <li ng-class="{'active open':$state.includes('app.call')}">
<a ui-sref="app.call.tracking"> <a ui-sref="app.call.tracking" ng-click="checkStaff()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-headphone-alt"></i> <i class="ti-headphone-alt"></i>
@ -622,12 +622,12 @@
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.daybook.details"> <a ui-sref="app.daybook.details" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.MAIN"> DAY BOOK</span>
</a> </a>
</li> </li>
<li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'"> <li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
<a ui-sref="app.daybook.approval"> <a ui-sref="app.daybook.approval" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.daybook.APPROVAL"> DAY BOOK</span> <span class="title" translate="sidebar.nav.daybook.APPROVAL"> DAY BOOK</span>
</a> </a>
</li> </li>
@ -635,7 +635,7 @@
</li> </li>
<li ng-class="{'active open':$state.includes('app.myprofile')}"> <li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile"> <a ui-sref="app.myprofile" ng-click="checkStaff()">
<div class="item-content"> <div class="item-content">
<div class="item-media"> <div class="item-media">
<i class="ti-id-badge"></i> <i class="ti-id-badge"></i>

10
Apollo/assets/views/student/student_details.html
View File

@ -156,7 +156,7 @@
<div style="margin: 8px;"> <div style="margin: 8px;">
<div style="width: 45px; display: initial;"> <div style="width: 45px; display: initial;">
<span style="font-size: 14px; <span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow">{{ results.length }} / {{ studentListLength }}</span> color: black;">Total Count:</span> <span class="listCoutShow">{{ studentListLength }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -206,9 +206,11 @@
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td> <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
<td><div id="containersPara">{{p.Comments}}</div></td> <td><div id="containersPara">{{p.Comments}}</div></td>
<td style="text-align: center;"> <td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details" <!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
ng-click="setEditId(p.StudentID);"> ng-click="setEditId(p.StudentID);">-->
<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);"> <i class="ti-user" tooltip="Personal Details" ng-click="setEditId(p.StudentID);"></i>
<!--<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);">-->
<i class="ti-write" tooltip="Course Details" ng-click="setEditCourseId(p.StudentID);"></i>
</td> </td>
</tr> </tr>
<tr ng-show="editId === p.StudentID" ng-if="editId === p.StudentID"> <tr ng-show="editId === p.StudentID" ng-if="editId === p.StudentID">

10
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -182,7 +182,7 @@
<div style="margin: 8px;"> <div style="margin: 8px;">
<div style="width: 45px; display: initial;"> <div style="width: 45px; display: initial;">
<span style="font-size: 14px; <span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow">{{ results.length }} / {{ studentListLength }}</span> color: black;">Total Count:</span> <span class="listCoutShow"> {{ studentListLength }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -229,9 +229,11 @@
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td> <span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
<td><div id="containersPara">{{p.Comments}}</div></td> <td><div id="containersPara">{{p.Comments}}</div></td>
<td style="text-align: center;"> <td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details" <!--<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
ng-click="setEditId(p.StudentID);"> ng-click="setEditId(p.StudentID);">-->
<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);"> <i class="ti-user" tooltip="Personal Details" ng-click="setEditId(p.StudentID);"></i>
<!--<input type=button class="btn btn-blue btn-xs" id="editCourseRowBtn{{p.StaffID}}" value="Course Details" ng-click="setEditCourseId(p.StudentID);">-->
<i class="ti-write" tooltip="Course Details" ng-click="setEditCourseId(p.StudentID);"></i>
</td> </td>
</tr> </tr>
<tr ng-show="editId === p.StudentID" ng-if="editId === p.StudentID"> <tr ng-show="editId === p.StudentID" ng-if="editId === p.StudentID">