From ac185fb42f50250dd2e31c4177562da203036ce2 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 13 Feb 2019 18:51:42 +0530
Subject: [PATCH] issue 1597

---
 Apollo/assets/js/controllers/loginCtrl.js     | 21 ++++++++++---------
 Apollo/assets/views/changelogin_password.html |  8 +++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js
index 6c578ce8..4ba573ee 100755
--- a/Apollo/assets/js/controllers/loginCtrl.js
+++ b/Apollo/assets/js/controllers/loginCtrl.js
@@ -375,21 +375,22 @@ $scope.EmpLogin=function(myModel)
                 $http(req).then(function (response) {
 
                     console.log(response.data)
-                    if (response.data.changePassStatus == true) 
+                    
+
+                    if(response.data.updateStatus == true)
                     {
-                         swal(" Success", message, "success");
+                      swal("Success",response.data.message, "success");
+                    }
+                        // swal(" Success", message, "success");
                         form.$setPristine(true);
                         $scope.myModel = {
                             curr: "",
-                            password1: "",
-                            password2: ""
+                            newpassword: "",
+                            empid: ""
                         };
-                    }
-
-                    else
-                    {
-                          swal("Error",response.data.message, "error");
-                    }
+                    
+                          swal("Success",response.data.message, "success");
+                    //}
 
 
                 },
diff --git a/Apollo/assets/views/changelogin_password.html b/Apollo/assets/views/changelogin_password.html
index 219baa84..6b6e87a6 100644
--- a/Apollo/assets/views/changelogin_password.html
+++ b/Apollo/assets/views/changelogin_password.html
@@ -1,7 +1,7 @@
 <section id="page-title">
     <div class="row">
-        <div class="col-sm-8">
-            <h1 class="mainTitle" style="color:red;">Your Password Expired!! Please Change Password</h1>
+        <div class="col-sm-12">
+           <center> <h1 class="mainTitle" style="color:red;">Your Password is Expired!! Please Change Password</h1></center>
         </div>
         <!-- <div ncy-breadcrumb></div>-->
     </div>
@@ -25,9 +25,9 @@
                                         <div class="row">
 
                                             <div class="form-group">
-                                                <label class="control-label">EMP ID/Phone Number <span class="symbol required"></span></label>
+                                                <label class="control-label">EMP ID <span class="symbol required"></span></label>
 
-                                                <input type="text" placeholder="Enter EMPID/Phone number" class="form-control" name="empid" ng-model="myPwdModel.empid"
+                                                <input type="text" placeholder="Enter EMPID" class="form-control" name="empid" ng-model="myPwdModel.empid"
                                                     required/>
 
                                             </div>