Merge pull request 'added update password' (#44) from paulcortezl5 into main

Reviewed-on: #44

app/Config/Routes.php

@@ -94,6 +94,7 @@ $routes->get('adminuser/edituserpermission/(:num)', 'AdministratorController::ed
 $routes->post('adminuser/saveusergroup', 'AdministratorController::saveEditedUserGroup');
 $routes->get('adminuser/fromemplist', 'AdministratorController::newUserFromEmployeeList');
 $routes->get('adminuser/newuserfromemplist/(:any)', 'AdministratorController::createUserFromEmployeeList/$1');
+$routes->post('adminuser/updateuserpass', 'AdministratorController::updateUserPass');
 
 
 // Timekeeper Routes`

app/Controllers/AdministratorController.php

@@ -58,7 +58,12 @@ class AdministratorController extends BaseController
                 $iconDelete = '<form action="adminuser/deleteuser" method="POST" class="d-inline-block" data-toggle="tooltip" title="Delete User"><input type="hidden" name="id" value="' . $user->id . '"/><a type="submit" onclick="return DeleteUserByID()" class="ml-3"><i class="fas fa-trash"></i></a></form>';
                 $iconUserGroup = '<a href="adminuser/editusergroup/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Group"><i class="fas fa-users"></i></a>';
                 $iconUserPermission = '<a href="adminuser/edituserpermission/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Permission"><i class="fas fa-lock"></i></a>';
-                $htmlTable->addRow($user->employee_id, $user->username, $user->email, $user->display_name, $user->active ? "Yes" : "No", "$iconView $iconEdit $iconUserGroup $iconUserPermission $iconDelete");
+                $iconChangePass = '<a href="#" class="ml-3" ' . 
+                            'data-id="' . $user->id . 
+                            '" data-displayname="' . $user->display_name . 
+                            '" data-username="' . $user->username .  
+                            '" onclick="GetUserByIdForPassEdit(this)" data-toggle="tooltip" title="Change Password"><i class="fas fa-key"></i></a>';
+                $htmlTable->addRow($user->employee_id, $user->username, $user->email, $user->display_name, $user->active ? "Yes" : "No", "$iconView $iconEdit $iconUserGroup $iconUserPermission $iconChangePass $iconDelete");
             }
             $data['tblUsers'] =  $htmlTable->generate();
         }
@@ -85,18 +90,22 @@ class AdministratorController extends BaseController
             'employee_id' => $this->request->getPost('employee_id'),
             'display_name' => $this->request->getPost('display_name'),
         ]);
-        $users->save($user);
-
-        // To get the complete user object with ID, we need to get from the database
-        $user = $users->findById($users->getInsertID());
+        
+        if($users->save($user))
+        {
+            // To get the complete user object with ID, we need to get from the database
+            $user = $users->findById($users->getInsertID());
 
-        // Add to default group
-        $users->addToDefaultGroup($user);
+            // Add to default group
+            $users->addToDefaultGroup($user);
 
-        // Activate user
-        $user->activate();
+            // Activate user
+            $user->activate();
 
-        return redirect()->to('/adminuser')->with('message', "{$user->display_name} user added.");
+            return redirect()->to('/adminuser')->with('message', "{$user->display_name} user added.");
+        }
+        else
+            return redirect()->back()->with('error', 'User creation failed.');
     }
 
     public function editUserGroupView($id)
@@ -160,6 +169,23 @@ class AdministratorController extends BaseController
         return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
     }
 
+    public function updateUserPass()
+    {
+        // Get the User Provider (UserModel by default)
+        $users = auth()->getProvider();
+
+        $id = $this->request->getPost('id');
+        $password = $this->request->getPost('password');
+
+        $user = $users->findById($id);
+        $user->fill([
+            'password' => $password
+        ]);
+        $users->save($user);
+
+        return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
+    }
+
     public function deleteUser()
     {
         $user = auth()->getProvider()->findById($this->request->getPost('id'));
@@ -181,7 +207,10 @@ class AdministratorController extends BaseController
 
     public function createUserFromEmployeeList($employeeid)
     {
+        $users = auth()->getProvider();
+
         $employee = (new EmployeeModel())->where(['company_issued_id' => $employeeid, 'deleted_at' => NULL])->first();
+        
         $user = new User([
             'username' => $employee->company_issued_id,
             'email'    => $employee->email_address,
@@ -189,7 +218,6 @@ class AdministratorController extends BaseController
             'employee_id' => $employee->company_issued_id,
             'display_name' => $employee->first_name." ".$employee->last_name,
         ]);
-        $users = auth()->getProvider();
         
         if($users->save($user))
         {

app/Views/admin/usermaintenance.php

@@ -179,6 +179,51 @@
   </div>
 </div>
 
+<div class="modal fade" id="mdlUpdateUserPass">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form action="<?= url_to('adminuser/updateuserpass') ?>" method="post">
+        <div class="modal-header bg-warning">
+          <h4 class="modal-title" >Information of <span id="lblUpdatePassUserTitle"></span></h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <div class="row">
+            <div class="col-12">
+              <p class="lead">Detailed User Information</p>
+              <div class="row">
+                <div class="col-4">
+                  <p><strong>User ID</strong></p>
+                  <p id="lblUpdatePassUserID"></p>
+                  <input type="hidden" id="hdnUpdatePassUserID" name="id">
+                </div>
+                <div class="col-8">
+                  <p><strong>Username</strong></p>
+                  <p id="lblUpdatePassUserUsername"></p>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <div class="form-group">
+                    <label for="txtEditPassword">Password</label>
+                    <input class="form-control" type="password" id="txtEditPassword" name="password">
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+          <button type="submit" class="btn btn-primary">Save changes</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
 <div class="row">
   <div class="col-12">
     <div class="card">
@@ -298,6 +343,17 @@ function GetUserByIdForEdit(user)
   $('#mdlEditUser').modal('show');
 }
 
+function GetUserByIdForPassEdit(user) 
+{
+  $("#lblUpdatePassUserTitle").text($(user).data('displayname'));
+  $("#lblUpdatePassUserID").text($(user).data('id'));
+
+  $("#lblUpdatePassUserUsername").text($(user).data('username'));
+  $("#hdnUpdatePassUserID").val($(user).data('id'));
+  
+  $('#mdlUpdateUserPass').modal('show');
+}
+
 function DeleteUserByID()
 {
   return confirm("Are you sure you want to delete this user?");