From 1a7580879a9f0c14014c27a3ca9fd943c180f8fe Mon Sep 17 00:00:00 2001 From: "anthony.richard" Date: Mon, 20 Nov 2023 18:56:42 +0100 Subject: [PATCH] modif myaccountview --- Project/php/controller/AdminController.php | 12 ++++++------ Project/php/controller/UserController.php | 5 +++-- Project/php/model/AbsModel.php | 10 ---------- Project/php/model/MdlAdmin.php | 5 ----- Project/php/model/MdlStudent.php | 5 ----- Project/php/templates/modifyPasswordForm.twig | 3 +-- Project/php/templates/myAccountView.html | 2 +- 7 files changed, 11 insertions(+), 31 deletions(-) diff --git a/Project/php/controller/AdminController.php b/Project/php/controller/AdminController.php index 24882d8..b290ee1 100755 --- a/Project/php/controller/AdminController.php +++ b/Project/php/controller/AdminController.php @@ -13,7 +13,7 @@ class AdminController extends UserController global $user; $model = new MdlAdmin(); $users = $model->getAllUsers(); - echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function showAllAdmins(): void { @@ -21,7 +21,7 @@ class AdminController extends UserController global $user; $model = new MdlAdmin(); $users = $model->getAllAdmins(); - echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function showAllTeachers(): void { @@ -29,7 +29,7 @@ class AdminController extends UserController global $user; $model = new MdlAdmin(); $users = $model->getAllTeachers(); - echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function showAllStudents(): void { @@ -37,7 +37,7 @@ class AdminController extends UserController global $user; $model = new MdlAdmin(); $users = $model->getAllStudents(); - echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId()]); + echo $twig->render('usersView.html', ['users' => $users, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function removeUser(): void { @@ -58,7 +58,7 @@ class AdminController extends UserController $model = new MdlAdmin(); $groups = $model->getAllGroups(); $unassignedUsers = $model->getUnassignedUsers(); - echo $twig->render('manageGroupView.html', ['groups' => $groups, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId()]); + echo $twig->render('manageGroupView.html', ['groups' => $groups, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function showGroupDetails(): void { @@ -71,7 +71,7 @@ class AdminController extends UserController $users = $model->getUsersOfGroup($selectedGroup); $unassignedUsers = $model->getUnassignedUsers(); - echo $twig->render('manageGroupView.html', ['groups' => $groups, 'selectedGroup' => $selectedGroup, 'users' => $users, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId()]); + echo $twig->render('manageGroupView.html', ['groups' => $groups, 'selectedGroup' => $selectedGroup, 'users' => $users, 'unassignedUsers' => $unassignedUsers, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } catch (Exception $e) { throw new Exception("invalid group ID"); diff --git a/Project/php/controller/UserController.php b/Project/php/controller/UserController.php index a3d9b36..4932d72 100755 --- a/Project/php/controller/UserController.php +++ b/Project/php/controller/UserController.php @@ -7,6 +7,7 @@ use Exception; use gateway\TranslationGateway; use gateway\VocabularyListGateway; use model\MdlStudent; +use model\MdlUser; use model\VocabularyList; use model\Translation; @@ -25,7 +26,7 @@ class UserController extends VisitorController $currentPassword = Validation::val_password($_GET['currentPassword'] ?? null); $newPassword = Validation::val_password($_GET['newPassword'] ?? null); $confirmNewPassword = Validation::val_password($_GET['confirmNewPassword'] ?? null); - $mdl = new MdlStudent(); + $mdl = new MdlUser(); $user = $mdl->getUser($userID); if ($user->getPassword() != $currentPassword || $newPassword != $confirmNewPassword) @@ -44,7 +45,7 @@ class UserController extends VisitorController try { $userID = Validation::filter_int($_GET['user'] ?? null); $newNickname = Validation::filter_str_nospecialchar($_GET['newNickname'] ?? null); - $mdl = new MdlStudent(); + $mdl = new MdlUser(); $mdl->modifyNickname($userID, $newNickname); $_GET['user'] = $userID; $this->showAccountInfos(); diff --git a/Project/php/model/AbsModel.php b/Project/php/model/AbsModel.php index 5c5f604..3fec615 100755 --- a/Project/php/model/AbsModel.php +++ b/Project/php/model/AbsModel.php @@ -6,16 +6,6 @@ use gateway\UserGateway; abstract class AbsModel { - private string $role; - - /** - * @param string $role - */ - public function __construct(string $role) - { - $this->role = $role; - } - public function connection(string $login, string $password){ $gtw = new UserGateway(); $hash = $gtw->login($login) ?? null; diff --git a/Project/php/model/MdlAdmin.php b/Project/php/model/MdlAdmin.php index a78a7d4..d207f6f 100755 --- a/Project/php/model/MdlAdmin.php +++ b/Project/php/model/MdlAdmin.php @@ -7,11 +7,6 @@ use gateway\UserGateway; class MdlAdmin extends MdlUser { - public function __construct() - { - parent::__construct("admin"); - } - public function getAllUsers(): array { $gtw = new UserGateway(); return $gtw->findAll(); diff --git a/Project/php/model/MdlStudent.php b/Project/php/model/MdlStudent.php index 4333d12..e9a3cd8 100755 --- a/Project/php/model/MdlStudent.php +++ b/Project/php/model/MdlStudent.php @@ -9,11 +9,6 @@ use gateway\VocabularyListGateway; class MdlStudent extends MdlUser { - public function __construct() - { - parent::__construct("student"); - } - public function getAll():array{ $gtw = new VocabularyListGateway(); return $gtw->findAll(); diff --git a/Project/php/templates/modifyPasswordForm.twig b/Project/php/templates/modifyPasswordForm.twig index 817c662..bbe628d 100755 --- a/Project/php/templates/modifyPasswordForm.twig +++ b/Project/php/templates/modifyPasswordForm.twig @@ -1,5 +1,4 @@ -
- + diff --git a/Project/php/templates/myAccountView.html b/Project/php/templates/myAccountView.html index d20200b..f08e522 100755 --- a/Project/php/templates/myAccountView.html +++ b/Project/php/templates/myAccountView.html @@ -32,7 +32,7 @@ ID : {{user.id}} Nickname : {{user.nickname}} - +