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

student login restriction by super admin : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-06 16:58:51 +05:30
parent d5df8bff81
commit 7e0d5d730b
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/controllers/Student_Controller.php
View File

@ -435,6 +435,7 @@ class Student_Controller extends REST_Controller {
$req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments']; $req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments'];
$req['IsActive'] = $data['IsActive']; $req['IsActive'] = $data['IsActive'];
$req['LoginAccess'] = $data['LoginAccess'] == 1 ? "1" : "0";
$req['UpdatedBy'] = $updatedBy; $req['UpdatedBy'] = $updatedBy;
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
@ -496,7 +497,9 @@ class Student_Controller extends REST_Controller {
$req['Comments'] = $data['Comments']; $req['Comments'] = $data['Comments'];
$req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments']; $req['DeactiveComments'] = $data['IsActive'] == 1 ? '': $data['DeactiveComments'];
$req['IsActive'] = $data['IsActive'] == 1 ? "1" : "0"; $req['IsActive'] = $data['IsActive'] == 1 ? "1" : "0";
$req['LoginAccess'] = $data['LoginAccess'] == 1 ? "1" : "0";
$req['UpdatedBy'] = $updatedBy; $req['UpdatedBy'] = $updatedBy;
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');

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

@ -79,21 +79,26 @@ class Login_model extends CI_Model
} }
} }
else if($loginDetails->ListCode == STUDENT){ else if($loginDetails->ListCode == STUDENT){
$this->db->select('LO.MobileNumber, LO.ListCode, LO.ID,ST.BranchCode'); $this->db->select('LO.MobileNumber, LO.ListCode, LO.ID,ST.BranchCode, ST.LoginAccess');
$this->db->from('' . LOGIN . ' as LO'); $this->db->from('' . LOGIN . ' as LO');
$this->db->join('' . STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID'); $this->db->join('' . STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
$this->db->where('LO.MobileNumber', $mobile); $this->db->where('LO.MobileNumber', $mobile);
$this->db->where('ST.IsActive', 1); $this->db->where('ST.IsActive', 1);
$responseDetails = $this->db->get()->first_row(); $responseDetails = $this->db->get()->first_row();
if($responseDetails){ if($responseDetails){
if($responseDetails->LoginAccess == 1){
$result['loginStatus'] = true; $result['loginStatus'] = true;
$result['details'] = $responseDetails; $result['details'] = $responseDetails;
} else {
$result['loginStatus'] = false;
$result['message'] = "Your login is de-activated.";
}
} }
else{ else{
$result['loginStatus'] = false; $result['loginStatus'] = false;
$result['message'] = "Your login is de-activated."; $result['message'] = "Your login is de-activated.";
} }
} }
else{ else{
$result['loginStatus'] = false; $result['loginStatus'] = false;

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

@ -2888,6 +2888,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
var formate = "dd-MM-yyyy"; var formate = "dd-MM-yyyy";
var checkDOB = $filter('date')(new Date(p.DOB), formate); var checkDOB = $filter('date')(new Date(p.DOB), formate);
p.IsActive = p.IsActive === true ? 1 : 0; p.IsActive = p.IsActive === true ? 1 : 0;
p.LoginAccess = p.LoginAccess === true ? 1 : 0;
p.DOB = p.DOB == hidedob ? p.DOB : $filter('date')(new Date(p.DOB), formate); p.DOB = p.DOB == hidedob ? p.DOB : $filter('date')(new Date(p.DOB), formate);
if (idProof == undefined) { if (idProof == undefined) {

14
Apollo/assets/views/student/editStudentDetails.html
View File

@ -412,6 +412,20 @@
<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span> <span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>
</div> </div>
</div> </div>
<div class="row" ng-if="localUserType == 'R004'">
<div class="col-md-4 form-group">
<label>
Login Access Status
</label>
<div ng-if="p.LoginAccess==1">
<switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = true" class="green"></switch>
</div>
<div ng-if="p.LoginAccess==0">
<switch ng-model="p.LoginAccess" ng-init="p.LoginAccess = false" class="green"></switch>
</div>
<!--<span ng-if="myModel.finaceModuleAccess" class="success text-small block"></span>-->
</div>
</div>
<!--<pre>{{ p | json}}</pre>--> <!--<pre>{{ p | json}}</pre>-->
<input type="hidden" ng-init="hidden_DOB=p.DOB" ng-model="hidden_DOB"> <input type="hidden" ng-init="hidden_DOB=p.DOB" ng-model="hidden_DOB">
<div class="row"> <div class="row">