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

changed bugs, added password change

Browse Source
This commit is contained in:
resicovenba 2017-11-24 12:19:04 +05:30
parent d12ce07730
commit b431d01507
14 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/controllers/Login_Controller.php
View File

@ -63,10 +63,10 @@ class Login_Controller extends REST_Controller {
$oldPassword = $this->post('oldPassword'); $oldPassword = $this->post('oldPassword');
$newPassword = $this->post('newPassword'); $newPassword = $this->post('newPassword');
$userId = $this->post('UserId'); $userId = $this->post('UserId');
echo $oldPassword; // echo $oldPassword;
echo $newPassword; // echo $newPassword;
echo $userId; // echo $userId;
exit(); // exit();
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
$updateOn = $date; $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) $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)

1
Apollo/assets/js/config.router.js
View File

@ -33,6 +33,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
.state('login', { .state('login', {
url: '/login', url: '/login',
template: '<div ui-view class="fade-in-right-big smooth"></div>', template: '<div ui-view class="fade-in-right-big smooth"></div>',
resolve: loadSequence('modernizr', 'moment', 'angularMoment', 'uiSwitch', 'perfect-scrollbar-plugin', 'toaster', 'ngAside', 'vAccordion', 'sweet-alert', 'chartjs', 'tc.chartjs', 'oitozero.ngSweetAlert', 'chatCtrl'),
abstract: true abstract: true
}).state('login.signin', { }).state('login.signin', {
url: '/signin', url: '/signin',

15
Apollo/assets/js/controllers/changePasswordCtrl.js
View File

@ -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) { 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 = { $scope.myModel = {
curr: "", curr: "",
password1: "", password: "",
password2: "" password2: ""
}; };
@ -41,30 +41,31 @@ app.controller('changePasswordCtrl', ["$scope", "$filter", "ngTableParams", "API
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
params: { data: {
oldPassword: md5.createHash($scope.myModel.curr || ''), oldPassword: md5.createHash($scope.myModel.curr || ''),
newPassword: md5.createHash($scope.myModel.password1 || '') , newPassword: md5.createHash($scope.myModel.password || '') ,
reqUserID: localDetails.localUserID, UserId: localDetails.localUserID,
} }
}; };
$http(req).then(function (response) { $http(req).then(function (response) {
if (response.data.status == true) { if (response.data.changePassStatus == true) {
// SweetAlert.swal("Hello!", "Password changed Succesfully"); // SweetAlert.swal("Hello!", "Password changed Succesfully");
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
swal("Success!", response.data.message, "success");
form.$setPristine(true);
$scope.myModel = { $scope.myModel = {
curr: "", curr: "",
password1: "", password1: "",
password2: "" password2: ""
}; };
} else { } else {
SweetAlert.swal("password Not Changed", "Please check the current password", "error"); swal("Warning!", response.data.message, "warning");
// $state.go($state.current, {}, { reload: true }); // $state.go($state.current, {}, { reload: true });
} }
}, function (error) { }, function (error) {
//error function //error function
}); });
} }
}, },
reset: function () { reset: function () {
} }

6
Apollo/assets/js/controllers/employeeCtrl.js
View File

@ -52,6 +52,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
// load when html page load // load when html page load
$scope.init = function () { $scope.init = function () {
if (localDetail != null) { if (localDetail != null) {
$scope.currentDate = new Date();
// $scope.currentPage = 1; // $scope.currentPage = 1;
$scope.getEmployeeList(); $scope.getEmployeeList();
$scope.getRoleList(); $scope.getRoleList();
@ -427,9 +428,8 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
var checkDOB = $filter('date')(new Date(p.DOB), formate); var checkDOB = $filter('date')(new Date(p.DOB), formate);
var checkDOJ = $filter('date')(new Date(p.DOJ), formate); var checkDOJ = $filter('date')(new Date(p.DOJ), formate);
p.IsActive = p.IsActive === true ? 1 : 0; p.IsActive = p.IsActive === true ? 1 : 0;
p.DOB = checkDOB == "NaN-NaN-0NaN" ? p.DOB : $filter('date')(new Date(p.DOB), 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);
p.DOJ = checkDOJ === "NaN-NaN-0NaN" ? p.DOJ : $filter('date')(new Date(p.DOJ), formate);
var req = { var req = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateEmpExistDetail/', url: apiPoint.url + 'updateEmpExistDetail/',

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

@ -4,7 +4,7 @@
* Simple table with sorting and filtering on AngularJS * 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 * login details capture
* by : kdk * by : kdk
@ -66,7 +66,8 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
localStorage.setItem('localObj', JSON.stringify($scope.localStore)); localStorage.setItem('localObj', JSON.stringify($scope.localStore));
$state.go('app.dashboard'); $state.go('app.dashboard');
} else { } else {
alert(response.data.message); // alert(response.data.message);
swal("Warning!", response.data.message, "warning");
$scope.show = true; $scope.show = true;
$(".alert").delay(200).addClass("in").fadeOut(3500); $(".alert").delay(200).addClass("in").fadeOut(3500);
} }

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

@ -58,7 +58,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in activityInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:5"> <tbody dir-paginate="p in activityInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.ListCode}}</td> <td>{{p.ListCode}}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
@ -77,7 +77,7 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</div> </div>
</div> </div>

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

@ -86,7 +86,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:5"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.BranchCode}}</td> <td>{{p.BranchCode}}</td>
<td>{{p.BranchName}}</td> <td>{{p.BranchName}}</td>
@ -110,7 +110,7 @@
</table> </table>
</fieldset> </fieldset>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</div> </div>

8
Apollo/assets/views/callTrackingDetails.html
View File

@ -130,7 +130,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:5"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tr> <tr>
<td><a href="#" class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td> <td><a href="#" class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>
@ -140,9 +140,9 @@
<td>{{p.CourseName }}</td> <td>{{p.CourseName }}</td>
<td>{{p.ListName}}</td> <td>{{p.ListName}}</td>
<td>{{p.Firstname}}</td> <td>{{p.Firstname}}</td>
<td ng-if="p.StatusCode=='S001'"><a href="#" class="text-orange" ng-click="setEditId(p);"><b class="fa fa-hover fa-phone " aria-hidden="true"></b> <td ng-if="p.StatusCode=='S001'"><a href="#" class="text-orange" ng-click="setEditId(p);" title="Open"><b class="fa fa-hover fa-phone " aria-hidden="true"></b>
</a></td> </a></td>
<td ng-if="p.StatusCode!='S001'"><a href="#" class="text-green" ng-click="setEditId(p);"><b class="fa fa-hover fa-phone " style="display: inline-block; <td ng-if="p.StatusCode!='S001'"><a href="#" class="text-green" ng-click="setEditId(p);" title="Close"><b class="fa fa-hover fa-phone " style="display: inline-block;
border-radius: 60px; border-radius: 60px;
box-shadow: 0px 0px 2px green; box-shadow: 0px 0px 2px green;
padding: 0.5em 0.6em;" aria-hidden="true"></b> padding: 0.5em 0.6em;" aria-hidden="true"></b>
@ -152,7 +152,7 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</fieldset> </fieldset>

2
Apollo/assets/views/changePassword.html
View File

@ -41,7 +41,7 @@
<label class="control-label"> <label class="control-label">
Current Password <span class="symbol required"></span> Current Password <span class="symbol required"></span>
</label> </label>
<input type="password" placeholder="Enter a Password" class="form-control" name="passwords" ng-model="myModel.curr" ng-min-length="8" <input type="password" placeholder="Enter a Current Password" class="form-control" name="passwords" ng-model="myModel.curr" ng-min-length="8"
required/> required/>
<span class="error text-small block" ng-if="Form.passwords.$dirty && Form.passwords.$error.required">Password is required.</span> <span class="error text-small block" ng-if="Form.passwords.$dirty && Form.passwords.$error.required">Password is required.</span>
<span class="error text-small block" ng-if="Form.password.$error.minlength">Enter at least 8 characters</span> <span class="error text-small block" ng-if="Form.password.$error.minlength">Enter at least 8 characters</span>

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

@ -75,7 +75,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:5"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.CourseID}}</td> <td>{{p.CourseID}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
@ -100,7 +100,7 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</fieldset> </fieldset>
</div> </div>

8
Apollo/assets/views/editEmployeeDetails.html
View File

@ -249,7 +249,7 @@
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB" <input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB"
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" placeholder="Select Date of Birth" close-text="Close" required="required"
ng-change="getMaxEndDate(myModel.startDate)" /> ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate"/>
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span> <span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
@ -261,7 +261,7 @@
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}">
<label class="block"> <label class="block">
Gender Gender <span class="symbol required"></span>
</label> </label>
<div class="clip-radio radio-primary"> <div class="clip-radio radio-primary">
<input type="radio" id="female" name="gender" value="female" ng-model="p.Gender" required> <input type="radio" id="female" name="gender" value="female" ng-model="p.Gender" required>
@ -325,10 +325,10 @@
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
<label> <label>
Permenent Address Permanent Address
</label> </label>
<textarea placeholder="Enter Permenent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea> <textarea placeholder="Enter Permenent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permenent Address is required</span> <span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
<label> <label>

13
Apollo/assets/views/employeeDetails.html
View File

@ -96,7 +96,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:5"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.StaffID}}</td> <td>{{p.StaffID}}</td>
<td>{{p.Firstname}}</td> <td>{{p.Firstname}}</td>
@ -118,7 +118,7 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</div> </div>
@ -265,7 +265,8 @@
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateofbirth" <input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateofbirth"
is-open="startOpen" ng-init="startOpen = true" name="dateofbirth" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = true" name="dateofbirth" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" placeholder="Select Date of Birth" close-text="Close" required="required"
ng-change="getMaxEndDate(myModel.startDate)" /> ng-change="getMaxEndDate(myModel.startDate)" max-date="currentDate" />
<span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span> <span class="error text-small block" ng-if="Form.dateofbirth.$dirty && Form.dateofbirth.$invalid" ng-hide="Form.dateofbirth.$error.maxlength">Date of Birth is required.</span>
<span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span> <span class="error text-small block" ng-if="Form.dateofbirth.$error.maxlength">Enter a Valid Date of Birth</span>
@ -276,7 +277,7 @@
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.gender.$invalid , 'has-success':Form.gender.$valid}">
<label class="block"> <label class="block">
Gender Gender <span class="symbol required"></span>
</label> </label>
<div class="clip-radio radio-primary"> <div class="clip-radio radio-primary">
<input type="radio" tabindex="10" id="female" name="gender" value="female" ng-model="myModel.gender" required> <input type="radio" tabindex="10" id="female" name="gender" value="female" ng-model="myModel.gender" required>
@ -340,10 +341,10 @@
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.address1.$dirty && Form.address1.$invalid}">
<label> <label>
Permenent Address Permanent Address
</label> </label>
<textarea placeholder="Enter Permenent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="myModel.address1"></textarea> <textarea placeholder="Enter Permenent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="myModel.address1"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permenent Address is required</span> <span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div> </div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
<label> <label>

4
Apollo/assets/views/partials/top-navbar.html
View File

@ -167,11 +167,11 @@
My Messages (3) My Messages (3)
</a> </a>
</li>--> </li>-->
<!--<li> <li>
<a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD"> <a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD">
Change Password Change Password
</a> </a>
</li>--> </li>
<li> <li>
<a ng-click="logOut()" translate="topbar.user.LOGOUT"> <a ng-click="logOut()" translate="topbar.user.LOGOUT">
Log Out Log Out

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

@ -60,7 +60,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:5"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td>{{p.UniversityID}}</td> <td>{{p.UniversityID}}</td>
<td>{{p.UniversityShortName}}</td> <td>{{p.UniversityShortName}}</td>
@ -77,7 +77,7 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="5" direction-links="true" boundary-links="true"> <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>
</div> </div>