diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index a1429607..7d14d55e 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -358,9 +358,14 @@ class Login_model extends CI_Model $mail = $this->mailsend($EmailID,$otp,$name); + $result['checkstudent'] = true; + $result['loginemployee'] = false; + $result['checkemp'] = false; }else{ $result['checkstudent'] = false; + $result['loginemployee'] = false; + $result['checkemp'] = false; } @@ -441,6 +446,9 @@ class Login_model extends CI_Model }else { $result['loginStatus'] = false; + $result['checkemp'] = false; + $result['loginemployee'] = false; + $result['message'] = "Your login is de-activated."; } } @@ -448,6 +456,7 @@ class Login_model extends CI_Model else { $result['loginStatus'] = false; $result['loginemployee'] = false; + $result['checkemp'] = false; $result['message'] = "Your login is de-activated."; } @@ -460,12 +469,16 @@ class Login_model extends CI_Model else{ $result['loginstudent'] = false; + $result['loginemployee'] = false; + $result['checkemp'] = false; } } else { $result['checkstudent'] = false; + $result['loginemployee'] = false; + $result['checkemp'] = false; $result['message'] = "Your login is de-activated or don't have login."; } //print_r($result);die; diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js index df45ba94..4cb16f18 100755 --- a/Apollo/assets/js/controllers/loginCtrl.js +++ b/Apollo/assets/js/controllers/loginCtrl.js @@ -186,8 +186,8 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc else if(response.data.checkemp== true) { - console.log('in'); - + // console.log('in'); + $scope.Empcheck = true; $scope.typeInput = 'text'; $scope.place = 'OTP';