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

issue no:1597

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-15 14:36:44 +05:30
parent 99b0642956
commit ca3d3099da
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,11 +149,13 @@ class Login_model extends CI_Model
$this->db->where('Password',$password); $this->db->where('Password',$password);
$this->db->where('IsActive','1'); $this->db->where('IsActive','1');
$details = $this->db->get()->first_row(); $details = $this->db->get()->first_row();
// print_r($this->db->last_query());die();
// print_r($details);die(); //print_r($details);die();
$time = date('Y-m-d'); $time = date('Y-m-d');
$dateTime = $time; $dateTime = $time;
if(!empty($details))
{
$password_date = new DateTime($details->Password_Date); $password_date = new DateTime($details->Password_Date);
$today_date = new DateTime($dateTime); $today_date = new DateTime($dateTime);
@ -173,8 +175,8 @@ class Login_model extends CI_Model
if(!empty($details)) // if(!empty($details))
{ // {
if($days_between>'+30') if($days_between>'+30')
{ {

34
Apollo/assets/js/controllers/loginCtrl.js
View File

@ -15,11 +15,18 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
'passwordemp':'' 'passwordemp':''
}; };
$scope.myPwdModel= {
curr: "",
newpassword: "",
empid:""
};
$scope.typeInput = 'password'; $scope.typeInput = 'password';
$scope.place = 'password'; $scope.place = 'password';
$scope.icon = 'fa fa-lock'; $scope.icon = 'fa fa-lock';
$scope.show = false; $scope.show = false;
$scope.info = false; $scope.info = false;
$scope.change_empid='';
$scope.loginbutton = true; $scope.loginbutton = true;
@ -30,7 +37,7 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
$scope.Login=function(myModel) $scope.Login=function(myModel)
{ {
//console.log(myModel);return false;
// alert($scope.Empcheck); // alert($scope.Empcheck);
@ -130,9 +137,12 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
} }
else if((response.data.loginStatus == false) &&(response.data.passwordStatus==false)) else if((response.data.loginStatus == false) &&(response.data.passwordStatus==false))
{ {
console.log('else if') //console.log('else if')
$scope.change_empid=myModel.userMobile;
$scope.myPwdModel.empid=$scope.change_empid;
$rootScope.Emp = $scope.change_empid;
$state.go('login.Login_pwdchange'); $state.go('login.Login_pwdchange');
} }
@ -336,11 +346,19 @@ $scope.EmpLogin=function(myModel)
} }
$scope.myPwdModel = { // $scope.myPwdModel= {
curr: "", // curr: "",
newpassword: "", // newpassword: "",
empid:"" // empid:""
}; // };
$scope.initlogchange = function (){
//console.log($rootScope.Emp);
// console.log($scope.myPwdModel.empid)
$scope.myPwdModel.empid=$rootScope.Emp
}
$scope.ChangePassword = function (Form,myPwdModel) $scope.ChangePassword = function (Form,myPwdModel)

4
Apollo/assets/views/changelogin_password.html
View File

@ -8,7 +8,7 @@
</section> </section>
<div ng-controller="loginCtrl" class="container-fluid container-fullw bg-white"> <div ng-controller="loginCtrl" class="container-fluid container-fullw bg-white" data-ng-init="initlogchange()">
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div> <div>
@ -27,7 +27,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">EMP ID <span class="symbol required"></span></label> <label class="control-label">EMP ID <span class="symbol required"></span></label>
<input type="text" placeholder="Enter EMPID" class="form-control" name="empid" ng-model="myPwdModel.empid" <input type="text" placeholder="Enter EMPID" class="form-control" name="empid" ng-model="myPwdModel.empid" ng-disabled="true"
required/> required/>
</div> </div>