From b7b116378a201a561c94995bc4f541f29b2a35ab Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 9 Feb 2019 18:35:09 +0530
Subject: [PATCH] login issue

---
 Apollo/assets/js/controllers/loginCtrl.js | 9 ++++++++-
 Apollo/assets/views/login_login.html      | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js
index e61fae6e..4b4fa081 100755
--- a/Apollo/assets/js/controllers/loginCtrl.js
+++ b/Apollo/assets/js/controllers/loginCtrl.js
@@ -20,6 +20,8 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
     $scope.icon = 'fa fa-lock';
     $scope.show = false;
     $scope.info = false;
+
+    $scope.loginbutton = true;
    
 
     $scope.responseData = '';
@@ -80,6 +82,7 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
                     if($scope.responseData == 'role check')
                     {
                              $scope.Empcheck = true; 
+                             $scope.loginbutton = false;
 
                               swal("Your OTP is sent !", response.data.message);
                     }
@@ -276,11 +279,15 @@ $scope.EmpLogin=function(myModel)
                     $scope.place = 'OTP';
                     $scope.icon = 'fa fa-key';
                     $scope.info = true;
+
+                    //swal("Your OTP is sent !", response.data.message);
             }
 
             else if(response.data.pwdcheck== true)
             {
-                console.log('in');
+                //console.log('in');
+
+                $scope.loginbutton = true;
                
               // $scope.Empcheck = true; 
                //$scope.typeInput = 'text';
diff --git a/Apollo/assets/views/login_login.html b/Apollo/assets/views/login_login.html
index 23ff72d4..20ddbce4 100755
--- a/Apollo/assets/views/login_login.html
+++ b/Apollo/assets/views/login_login.html
@@ -404,7 +404,7 @@
 				<div class="form-group" ng-class="{'has-error':Form.password.$dirty && Form.password.$invalid, 'has-success':Form.password.$valid}">
 
 			   <span class="input-icon">
-				   <input type="password" id="inputPassword3" placeholder="Password" class="form-control heighLight underline" name="password" ng-model="myModel.password"
+				   <input type="{{typeInput}}" id="inputPassword3" placeholder="{{place}}" class="form-control heighLight underline" name="password" ng-model="myModel.password"
 						  ng-minlength="6" required/>
 				   <i style="color: black;" class="{{icon}}"></i>
 			   <span class="error text-small block" ng-if="Form.password.$dirty && Form.password.$invalid"> {{place}} Required</span></span>
@@ -412,15 +412,17 @@
 
 				<div class="form-group">
 					<span ng-if="info == false"><a class="forgot" ui-sref="login.forgot" style="color: black;">I forgot my password </a></span>
+					<span ng-if="info != false" style="color: black;">OTP Sent to your number</span></br>
 					<span ng-if="info != false" style="color: black;">OTP Valid for 10 minutes only</span>
 					<!-- <button type="submit" class="btn btn-warning pull-right submitlogin">
 						Login <i class="fa fa-arrow-circle-right"></i>
 					</button> -->
 
-
+                    <div ng-if="loginbutton== true">
 					<button class="btn btn pull-right" ng-click="Login(myModel);" tabindex="8">
                         Login
                     </button>
+                    </div>
 				</div>