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

master screen check

Browse Source
This commit is contained in:
resicovenba 2017-11-24 11:04:52 +05:30
parent b1d830713f
commit d12ce07730
11 changed files with 264 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/config/routes.php
View File

@ -91,6 +91,8 @@ $route['addActivityDetails'] = 'University_Controller/addActivityDetails';
$route['getActivityDetails'] = 'University_Controller/getActivityDetails';
$route['updateActivityStatus'] = 'University_Controller/updateActivityStatus';
$route['changePassword'] = 'Login_Controller/changePassword';

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

@ -56,8 +56,35 @@ class Login_Controller extends REST_Controller {
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
// change old password
public function changePassword_post() {
$oldPassword = $this->post('oldPassword');
$newPassword = $this->post('newPassword');
$userId = $this->post('UserId');
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)
if ($changePassword)
{
$changePassword['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($changePassword, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No record were found',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
}

24
Apollo/api/application/models/Login_model.php
View File

@ -73,10 +73,28 @@ class Login_model extends CI_Model
} else {
return $this->db->get('eventos')->result();
}*/
return $result;
}
public function change_Password( $userId, $newPassword, $oldPassword, $updateOn) {
$this->db->select('Password');
$this->db->from(LOGIN);
$this->db->where('ID', $userId);
$loginDetails = $this->db->get()->first_row();
if ($loginDetails->Password == $oldPassword) {
$sql = "UPDATE ".LOGIN." SET Password='$newPassword', UpdatedBy='$userId', UpdatedOn='$updateOn' WHERE ID='$userId'";
if($this->db->query($sql) == '1'){
$result['changePassStatus'] = true;
$result['message'] = "Your Password Successfully changed !!";
} else {
$result['changePassStatus'] = false;
$result['message'] = "Please try Again !!";
}
} else {
$result['changePassStatus'] = false;
$result['message'] = "Your Current Password miss match, Please try Again !!";
}
return $result;
}
}

3
Apollo/assets/i18n/en.json
View File

@ -18,7 +18,8 @@
"CALENDAR": "My Calendar",
"MESSAGES": "My Messages",
"LOCKSCREEN": "Lock Screen",
"LOGOUT": "Log Out"
"LOGOUT": "Log Out",
"CHANGEPASSWORD": "Change Password"
}
},
"offsidebar": {

2
Apollo/assets/js/config.constant.js
View File

@ -62,6 +62,8 @@ app.constant('JS_REQUIRES', {
*/
'loginCtrl': 'assets/js/controllers/loginCtrl.js',
'changePasswordCtrl': 'assets/js/controllers/changePasswordCtrl.js',
/***
* Session
*/

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

@ -63,6 +63,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'Dashboard'
}
}).state('app.changePassword', {
url: "/changePassword",
templateUrl: "assets/views/changePassword.html",
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'ngTable', 'changePasswordCtrl'),
title: "Change Password",
ncyBreadcrumb: {
label: 'Change Password'
}
}).state('app.master', {
url: '/master',
template: '<div ui-view class="fade-in-up"></div>',

73
Apollo/assets/js/controllers/changePasswordCtrl.js Normal file
View File

@ -0,0 +1,73 @@
'use strict';
/*** controller for Wizard Form example***/
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: "",
password2: ""
};
$scope.currentStep = 1;
// get local cliend details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
// Initial Value
$scope.form = {
submit: function (form, myModel) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
} else {
var req = {
method: 'POST',
url: apiPoint.url + 'changePassword/',
headers: {
'Content-Type': 'application/json'
},
params: {
oldPassword: md5.createHash($scope.myModel.curr || ''),
newPassword: md5.createHash($scope.myModel.password1 || '') ,
reqUserID: localDetails.localUserID,
}
};
$http(req).then(function (response) {
if (response.data.status == true) {
// SweetAlert.swal("Hello!", "Password changed Succesfully");
// $state.go($state.current, {}, { reload: true });
$scope.myModel = {
curr: "",
password1: "",
password2: ""
};
} else {
SweetAlert.swal("password Not Changed", "Please check the current password", "error");
// $state.go($state.current, {}, { reload: true });
}
}, function (error) {
//error function
});
}
},
reset: function () {
}
};
}]);

96
Apollo/assets/views/changePassword.html Normal file
View File

@ -0,0 +1,96 @@
<!--Modified by Jithesh on 13/10/2015 06:28pm-->
<!-- start: PAGE TITLE -->
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle">Change Password</h1>
</div>
<div ncy-breadcrumb></div>
</div>
</section>
<!-- end: PAGE TITLE -->
<!-- start: WIZARD DEMO -->
<div class="container-fluid container-fullw bg-white">
<div class="row">
<div class="col-md-8">
<!-- /// controller: 'WizardCtrl' - localtion: assets/js/controllers/addStudentInfoCtrl.js /// -->
<div ng-controller="changePasswordCtrl">
<!-- start: WIZARD FORM -->
<form name="Form" id="form" novalidate>
<div id="wizard" class="swMain">
<!-- start: WIZARD SEPS -->
<!-- end: WIZARD SEPS -->
<!-- start: WIZARD STEP 1 -->
<div id="step-1">
<div class="row">
<div class="col-md-5">
<div class="padding-30">
<!--<h2 class="StepTitle"><i class="ti-face-smile fa-2x text-primary block margin-bottom-10"></i> Change Password</h2>-->
</div>
</div>
<div class="col-md-7">
<fieldset>
<legend>
Change Password
</legend>
<div class="row">
<div class="form-group" ng-class="{'has-error':Form.passwords.$dirty && Form.passwords.$invalid, 'has-success':Form.passwords.$valid}">
<label class="control-label">
Current Password <span class="symbol required"></span>
</label>
<input type="password" placeholder="Enter a Password" class="form-control" name="passwords" ng-model="myModel.curr" ng-min-length="8"
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.password.$error.minlength">Enter at least 8 characters</span>
<!--<span class="success text-small block" ng-if="Form.passwords.$valid">Thank you!</span>-->
</div>
<div class="form-group" ng-class="{'has-error':Form.password1.$dirty && Form.password1.$invalid, 'has-success':Form.password1.$valid}">
<label class="control-label">
New Password <span class="symbol required"></span>
</label>
<input type="password" placeholder="Enter a Password" class="form-control" name="password1" ng-model="myModel.password" ng-minlength="8"
required/>
<span class="error text-small block" ng-if="Form.password1.$dirty && Form.password1.$error.required">Password is required.</span>
<span class="error text-small block" ng-if="Form.password1.$error.minlength">Enter at least 8 characters</span>
<span style="color:#000" class="success text-small block" ng-if="Form.password1.$valid">Ok!</span>
</div>
<div class="form-group" ng-class="{'has-error':Form.password2.$dirty && Form.password2.$error.compareTo || Form.password2.$dirty && Form.password2.$invalid, 'has-success':Form.password2.$valid}">
<label class="control-label">
Repeat Password <span class="symbol required"></span>
</label>
<input type="password" placeholder="Confirm Password" class="form-control" name="password2" ng-model="myModel.password2"
compare-to="myModel.password" ng-minlength="8" required/>
<span class="error text-small block" ng-if="Form.password2.$dirty && Form.password2.$error.required">Repeat password is required!</span>
<span class="error text-small block" ng-if="Form.password2.$dirty && Form.password2.$error.compareTo">Passwords do not match!</span>
<span style="color:#000" class="success text-small block" ng-if="Form.password2.$valid">Passwords match!</span>
</div>
</div>
<div class="form-group">
<button class="btn btn-primary btn-wide pull-right" ng-click="form.submit(Form,myModel)">
Change Password
</button>
</div>
</fieldset>
</div>
</div>
</div>
<!-- end: WIZARD STEP 1 -->
<!-- end: WIZARD STEP 3 -->
</div>
</form>
<!-- end: WIZARD FORM -->
</div>
</div>
</div>
</div>
<!-- start: WIZARD DEMO -->

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

@ -20,7 +20,7 @@
<div class="panel-body">
<span class="fa-stack fa-2x"> <i class="fa fa-square fa-stack-2x text-primary"></i> <i class="fa fa-smile-o fa-stack-1x fa-inverse"></i> </span>
<h2 class="StepTitle">Something awesome is coming soon</h2>
<p class="text-small">We are building something very cool stay turned and be patient. your patience will be well paid</p>
<p class="text-small">We are building something very cool stay tuned and be patient. your patience will be well paid</p>
<div id="countdown" style="font-size: 48px;color: #000;line-height: 1.1em;" align="center"></div>
</div>
</div>

47
Apollo/assets/views/partials/nav.html
View File

@ -1,15 +1,15 @@
<!-- start: MAIN NAVIGATION MENU -->
<!-- start: Super Admin -->
<ul class="main-navigation-menu" ng-if="getLoginDash == 'superAdmin'">
<li ui-sref-active="active">
<a ui-sref="app.dashboard">
<div class="item-content">
<div class="item-media">
<i class="ti-home"></i>
</div>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.dashboard.MAIN"> Dashboard </span>
</div>
@ -28,6 +28,21 @@
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.master.university">
<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.course">
<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.activity">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.branch">
<span class="title" translate="sidebar.nav.master.BRANCH"> BRANCH DETAILS </span>
@ -38,16 +53,8 @@
<span class="title" translate="sidebar.nav.master.EMPLOYEE"> EMPLOYEE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.activity">
<span class="title" translate="sidebar.nav.master.ACTIVITY"> ACTIVITY DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.master.university">
<span class="title" translate="sidebar.nav.master.UNIVERSITY"> UNIVERSITY DETAILS </span>
</a>
</li>
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.tracking')}">
@ -57,11 +64,11 @@
<i class="ti-layers-alt"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.tracking.MAIN">CALL TRACKING </span>
<span class="title" translate="sidebar.nav.tracking.MAIN">CALL TRACKING </span>
</div>
</div>
</a>
</li>
</ul>
@ -71,7 +78,7 @@
<div class="item-content">
<div class="item-media">
<i class="ti-home"></i>
</div>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.dashboard.MAIN"> Dashboard </span>
</div>
@ -114,16 +121,16 @@
<i class="ti-layers-alt"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.tracking.MAIN">CALL TRACKING </span>
<span class="title" translate="sidebar.nav.tracking.MAIN">CALL TRACKING </span>
</div>
</div>
</a>
</li>
</ul>
<!-- end: MAIN NAVIGATION MENU -->
<!-- start: CORE FEATURES -->
<!-- end: CORE FEATURES -->
<!-- start: DOCUMENTATION BUTTON -->
<!--<div class="wrapper">

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

@ -166,10 +166,10 @@
<a ui-sref="app.pages.messages" translate="topbar.user.MESSAGES">
My Messages (3)
</a>
</li>
<li>
<a ui-sref="login.lockscreen" translate="topbar.user.LOCKSCREEN">
Lock Screen
</li>-->
<!--<li>
<a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD">
Change Password
</a>
</li>-->
<li>