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 @@
-
-

Your Password Expired!! Please Change Password

+
+

Your Password is Expired!! Please Change Password

@@ -25,9 +25,9 @@
- + -