modif myaccountview

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");

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();

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;

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();

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();

Project/php/templates/modifyPasswordForm.twig

@@ -1,5 +1,4 @@
-<form action="{{base}}/user/modifyPassword" method="GET">
+<form action="{{base}}/{{ userRole[0] }}/{{ userID }}/modifyPassword" method="GET">
-    <input type="hidden" name="user" value={{user.id}}>
     <input type="text" name="currentPassword" placeholder="current password" required>
     <input type="text" name="newPassword" placeholder="new password" required>
     <input type="text" name="confirmNewPassword" placeholder="confirm new password" required>

Project/php/templates/myAccountView.html

@@ -32,7 +32,7 @@
             <tr><td>ID : </td><td>{{user.id}}</td></tr>
             <tr><td>Nickname : </td><td>{{user.nickname}}</td>
                 <td>
-                    <form action="{{base}}/user/modifyNickname" method="GET">
+                    <form action="{{base}}/{{userRole[0]}}/{{userID}}/modifyNickname" method="GET">
                         <input type="hidden" name="user" value={{user.id}}>
                         <input name="newNickname" type="text" placeholder="new nickname" required>
                         <input type="submit" value="Modify your nickname">