diff --git a/src/Entity/User.php b/src/Entity/User.php
index 3a5ee84..3e67c34 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -90,6 +90,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
return array_unique($roles);
}
+ public function getNomRole() : string {
+ return match ($this->getRoles()[0]) {
+ 'ROLE_ADMINISTRATEUR' => 'Administrateur',
+ 'ROLE_INSTRUCTEUR' => 'Instructeur',
+ default => 'Apprenti'
+ };
+ }
+
public function setRoles(array $roles): self
{
$this->roles = $roles;
diff --git a/templates/user/_delete_form.html.twig b/templates/user/_delete_form.html.twig
index 6d59fa6..c1f0617 100644
--- a/templates/user/_delete_form.html.twig
+++ b/templates/user/_delete_form.html.twig
@@ -1,4 +1,4 @@
-
diff --git a/templates/user/_form.html.twig b/templates/user/_form.html.twig
index bf20b98..d137888 100644
--- a/templates/user/_form.html.twig
+++ b/templates/user/_form.html.twig
@@ -1,4 +1,20 @@
{{ form_start(form) }}
- {{ form_widget(form) }}
-
+ {{ form_row(form.email) }}
+
+
+ {{ form_row(form.nom) }}
+
+
+ {{ form_row(form.prenom) }}
+
+
+
+{% if form.plainPassword is defined %}
+ {{ form_row(form.plainPassword) }}
+{% endif %}
+{{ form_row(form.roles) }}
+
+
+
+
{{ form_end(form) }}
diff --git a/templates/user/edit.html.twig b/templates/user/edit.html.twig
index 141d94a..5453edb 100644
--- a/templates/user/edit.html.twig
+++ b/templates/user/edit.html.twig
@@ -3,11 +3,20 @@
{% block title %}Edit User{% endblock %}
{% block body %}
- Edit User
+
+
- {{ include('user/_form.html.twig', {'button_label': 'Update'}) }}
+
+ {{ include('user/_form.html.twig', {'button_label': 'Mettre à jour'}) }}
+
-
back to list
+
+
{% endblock %}
diff --git a/templates/user/index.html.twig b/templates/user/index.html.twig
index e2e3f7f..505c627 100644
--- a/templates/user/index.html.twig
+++ b/templates/user/index.html.twig
@@ -3,39 +3,42 @@
{% block title %}User index{% endblock %}
{% block body %}
- User index
+
+
-
-
+
+
+
- Id |
- Email |
- Roles |
Nom |
Prenom |
- actions |
+ Email |
+ Roles |
+ Actions |
-
-
- {% for user in users %}
-
- {{ user.id }} |
- {{ user.email }} |
- {{ user.roles ? user.roles[0] : '' }} |
- {{ user.nom }} |
- {{ user.prenom }} |
-
- show
- edit
- |
-
- {% else %}
-
- no records found |
-
- {% endfor %}
-
-
+
+
+ {% for user in users %}
+
+ {{ user.nom }} |
+ {{ user.prenom }} |
+ {{ user.email }} |
+ {{ user.nomRole }} |
+ Voir |
+
+ {% else %}
+
+ no records found |
+
+ {% endfor %}
+
+
+
- Create new
+
+
{% endblock %}
diff --git a/templates/user/new.html.twig b/templates/user/new.html.twig
index 35e728d..f624369 100644
--- a/templates/user/new.html.twig
+++ b/templates/user/new.html.twig
@@ -3,9 +3,19 @@
{% block title %}New User{% endblock %}
{% block body %}
- Create new User
+
+
- {{ include('user/_form.html.twig') }}
-
back to list
+
+ {{ include('user/_form.html.twig') }}
+
+
+
+
{% endblock %}
diff --git a/templates/user/show.html.twig b/templates/user/show.html.twig
index ffc5b61..ecefb36 100644
--- a/templates/user/show.html.twig
+++ b/templates/user/show.html.twig
@@ -3,36 +3,45 @@
{% block title %}User{% endblock %}
{% block body %}
- User
+
+
-
-
-
- Id |
- {{ user.id }} |
-
-
- Email |
- {{ user.email }} |
-
-
- Roles |
- {{ user.roles ? user.roles[0] : '' }} |
-
-
- Nom |
- {{ user.nom }} |
-
-
- Prenom |
- {{ user.prenom }} |
-
-
-
+
+
+
+
+ Id |
+ {{ user.id }} |
+
+
+ Email |
+ {{ user.email }} |
+
+
+ Roles |
+ {{ user.roles ? user.roles[0] : '' }} |
+
+
+ Nom |
+ {{ user.nom }} |
+
+
+ Prenom |
+ {{ user.prenom }} |
+
+
+
+
-
back to list
+
+
{% endblock %}