diff --git a/Apollo/api/application/controllers/Login_Controller.php b/Apollo/api/application/controllers/Login_Controller.php index c635007f..463cd751 100644 --- a/Apollo/api/application/controllers/Login_Controller.php +++ b/Apollo/api/application/controllers/Login_Controller.php @@ -63,10 +63,10 @@ class Login_Controller extends REST_Controller { $oldPassword = $this->post('oldPassword'); $newPassword = $this->post('newPassword'); $userId = $this->post('UserId'); - echo $oldPassword; - echo $newPassword; - echo $userId; - exit(); + // echo $oldPassword; + // echo $newPassword; + // echo $userId; + // exit(); $date = date('Y-m-d H:i:s'); $updateOn = $date; $changePassword = $this->login_model->change_Password( $userId, $newPassword, $oldPassword, $updateOn);// Check if the users data store contains users (in case the database result returns NULL) diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 6d2a9537..c5a8ae7b 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -33,6 +33,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com .state('login', { url: '/login', template: '
', + resolve: loadSequence('modernizr', 'moment', 'angularMoment', 'uiSwitch', 'perfect-scrollbar-plugin', 'toaster', 'ngAside', 'vAccordion', 'sweet-alert', 'chartjs', 'tc.chartjs', 'oitozero.ngSweetAlert', 'chatCtrl'), abstract: true }).state('login.signin', { url: '/signin', diff --git a/Apollo/assets/js/controllers/changePasswordCtrl.js b/Apollo/assets/js/controllers/changePasswordCtrl.js index 8eead5c8..59f3dbd0 100644 --- a/Apollo/assets/js/controllers/changePasswordCtrl.js +++ b/Apollo/assets/js/controllers/changePasswordCtrl.js @@ -3,7 +3,7 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) { $scope.myModel = { curr: "", - password1: "", + password: "", password2: "" }; @@ -41,30 +41,31 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API headers: { 'Content-Type': 'application/json' }, - params: { + data: { oldPassword: md5.createHash($scope.myModel.curr || ''), - newPassword: md5.createHash($scope.myModel.password1 || '') , - reqUserID: localDetails.localUserID, + newPassword: md5.createHash($scope.myModel.password || '') , + UserId: localDetails.localUserID, } }; $http(req).then(function (response) { - if (response.data.status == true) { + if (response.data.changePassStatus == true) { // SweetAlert.swal("Hello!", "Password changed Succesfully"); // $state.go($state.current, {}, { reload: true }); + swal("Success!", response.data.message, "success"); + form.$setPristine(true); $scope.myModel = { curr: "", password1: "", password2: "" }; } else { - SweetAlert.swal("password Not Changed", "Please check the current password", "error"); + swal("Warning!", response.data.message, "warning"); // $state.go($state.current, {}, { reload: true }); } }, function (error) { //error function }); } - }, reset: function () { } diff --git a/Apollo/assets/js/controllers/employeeCtrl.js b/Apollo/assets/js/controllers/employeeCtrl.js index aaa2fcf7..6a2ffb1a 100644 --- a/Apollo/assets/js/controllers/employeeCtrl.js +++ b/Apollo/assets/js/controllers/employeeCtrl.js @@ -52,6 +52,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ // load when html page load $scope.init = function () { if (localDetail != null) { + $scope.currentDate = new Date(); // $scope.currentPage = 1; $scope.getEmployeeList(); $scope.getRoleList(); @@ -427,9 +428,8 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$ var checkDOB = $filter('date')(new Date(p.DOB), formate); var checkDOJ = $filter('date')(new Date(p.DOJ), formate); p.IsActive = p.IsActive === true ? 1 : 0; - - p.DOB = checkDOB === "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate); - p.DOJ = checkDOJ === "NaN-NaN-0NaN" ? p.DOJ : $filter('date')(new Date(p.DOJ), formate); + p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), formate); + p.DOJ = checkDOJ == "NaN-NaN-0NaN" ? p.DOJ : $filter('date')(new Date(p.DOJ), formate); var req = { method: 'POST', url: apiPoint.url + 'updateEmpExistDetail/', diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js index aeacc183..dbb4ec66 100644 --- a/Apollo/assets/js/controllers/loginCtrl.js +++ b/Apollo/assets/js/controllers/loginCtrl.js @@ -4,7 +4,7 @@ * Simple table with sorting and filtering on AngularJS */ -app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', function ($scope, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie) { +app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', "SweetAlert", function ($scope, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, SweetAlert) { /** * login details capture * by : kdk @@ -66,7 +66,8 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc localStorage.setItem('localObj', JSON.stringify($scope.localStore)); $state.go('app.dashboard'); } else { - alert(response.data.message); + // alert(response.data.message); + swal("Warning!", response.data.message, "warning"); $scope.show = true; $(".alert").delay(200).addClass("in").fadeOut(3500); } diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html index a2359a54..42dfd4fc 100644 --- a/Apollo/assets/views/activity.html +++ b/Apollo/assets/views/activity.html @@ -58,7 +58,7 @@ - + {{p.ListCode}} {{p.ListName}} @@ -77,7 +77,7 @@ - + \ No newline at end of file diff --git a/Apollo/assets/views/branchDetails.html b/Apollo/assets/views/branchDetails.html index 53c93703..3f5704f2 100644 --- a/Apollo/assets/views/branchDetails.html +++ b/Apollo/assets/views/branchDetails.html @@ -86,7 +86,7 @@ - + {{p.BranchCode}} {{p.BranchName}} @@ -110,7 +110,7 @@ - + diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 4da9aa3a..4ecf2f8b 100644 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -130,7 +130,7 @@ - + {{p.TrackingID}} {{p.followupDetails }} @@ -140,9 +140,9 @@ {{p.CourseName }} {{p.ListName}} {{p.Firstname}} - + - @@ -152,7 +152,7 @@ - + diff --git a/Apollo/assets/views/changePassword.html b/Apollo/assets/views/changePassword.html index 34f07e97..857debd3 100644 --- a/Apollo/assets/views/changePassword.html +++ b/Apollo/assets/views/changePassword.html @@ -41,7 +41,7 @@ - Password is required. Enter at least 8 characters diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 42aef691..95fb91b8 100644 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -75,7 +75,7 @@ - + {{p.CourseID}} {{p.CourseName}} @@ -100,7 +100,7 @@ - + diff --git a/Apollo/assets/views/editEmployeeDetails.html b/Apollo/assets/views/editEmployeeDetails.html index c386ba75..4fc76479 100644 --- a/Apollo/assets/views/editEmployeeDetails.html +++ b/Apollo/assets/views/editEmployeeDetails.html @@ -249,7 +249,7 @@ + ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate"/> Date of Birth is required. @@ -261,7 +261,7 @@
@@ -325,10 +325,10 @@
- Permenent Address is required + Permanent Address is required
@@ -265,7 +265,8 @@ + ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate" /> + Date of Birth is required. Enter a Valid Date of Birth @@ -276,7 +277,7 @@
@@ -340,10 +341,10 @@
- Permenent Address is required + Permanent Address is required
--> - +
  • Log Out diff --git a/Apollo/assets/views/university.html b/Apollo/assets/views/university.html index a0ddc1e6..d5209543 100644 --- a/Apollo/assets/views/university.html +++ b/Apollo/assets/views/university.html @@ -60,7 +60,7 @@ - + {{p.UniversityID}} {{p.UniversityShortName}} @@ -77,7 +77,7 @@ - +