diff --git a/templates/back/_partials/table.html.twig b/templates/back/_partials/table.html.twig new file mode 100755 index 000000000..f60c08411 --- /dev/null +++ b/templates/back/_partials/table.html.twig @@ -0,0 +1,13 @@ +{% macro tableOpen(label) %} +
+
+
+ +{% endmacro %} + +{% macro tableEnd() %} +
+
+
+
+{% endmacro %} \ No newline at end of file diff --git a/templates/back/base_bo_table.html.twig b/templates/back/base_bo_table.html.twig new file mode 100755 index 000000000..08613c39c --- /dev/null +++ b/templates/back/base_bo_table.html.twig @@ -0,0 +1,31 @@ +{% extends 'back/base_bo.html.twig' %} + +{% block content %} + {% block contentTitle %}{% endblock %} + {% block contentFilters %}{% endblock %} + {% block contentDescription %}{% endblock %} + +
+
+
+
+ + + + {% block contentTableHead %}{% endblock %} + + + + {% block contentTableBody %}{% endblock %} + +
+
+
+
+ +
+ {% import '_partials/macros.html.twig' as macros %} + {{ macros.customPagination(pages, searchUser.page, 'back_user_index', searchUser.urlParams) }} +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/back/user/index.html.twig b/templates/back/user/index.html.twig index c939e7df7..4ad0d65e4 100755 --- a/templates/back/user/index.html.twig +++ b/templates/back/user/index.html.twig @@ -1,8 +1,8 @@ -{% extends 'back/base_bo.html.twig' %} +{% extends 'back/base_bo_table.html.twig' %} {% block title %}Liste des utilisateurs{% endblock %} -{% block content %} +{% block contentTitle %} {% include '_partials/_modal_user_edit.html.twig' with { 'currentPage': 'userList' } %}
{% include 'back/breadcrumb_bo.html.twig' with { @@ -24,6 +24,9 @@
+{% endblock %} + +{% block contentFilters %}
{% form_theme form 'form/dsfr_theme.html.twig' %} {{ form_start(form) }} @@ -60,7 +63,9 @@ {{ form_end(form) }}
+{% endblock %} +{% block contentDescription %}

{{users|length}} utilisateur{% if users|length > 1%}s{% endif %}

@@ -69,84 +74,69 @@ Exporter les résultats
+{% endblock %} -
-
-
-
- - - - {% if is_granted('ROLE_ADMIN') %} - - {% endif %} - - - - - - - - {% if platform.feature_permission_affectation %} - - {% endif %} - - - - - {% for user in users %} - - {% if is_granted('ROLE_ADMIN') %} - - {% endif %} - - - - - - - - {% if platform.feature_permission_affectation %} - - {% endif %} - - - {% endfor %} - -
TerritoireUtilisateurE-mailPartenaireType de partenaireStatut du compteDernière connexionRôleDroits d'affectationActions
- {% if user.territory %} - {{ user.territory.zip }} - {{ user.territory.name }} - {% endif %} - {{ user.prenom }} {{ user.nom }}{{ user.email }}{{ user.partner ? user.partner.nom }}{{ user.partner and user.partner.type ? user.partner.type.label : 'N/A' }} - {% if user.statut is same as constant('App\\Entity\\User::STATUS_INACTIVE') %} - Non activé - {% elseif user.statut is same as constant('App\\Entity\\User::STATUS_ACTIVE') %} - Activé - {% else %} - {{ user.statutLabel }} - {% endif %} - {{ user.lastLoginAt ? user.lastLoginAt|date('d/m/Y') : '-'}}{{ user.roleLabel() }}{{ user.isSuperAdmin() or user.isTerritoryAdmin() or user.hasPermissionAffectation() ? 'Oui' : 'Non' }} - - -
-
-
-
-
- {% import '_partials/macros.html.twig' as macros %} - {{ macros.customPagination(pages, searchUser.page, 'back_user_index', searchUser.urlParams) }} -
-
+{% set tableLabel = 'Liste des utilisateurs' %} +{% block contentTableHead %} + {% if is_granted('ROLE_ADMIN') %} + Territoire + {% endif %} + Utilisateur + E-mail + Partenaire + Type de partenaire + Statut du compte + Dernière connexion + Rôle + {% if platform.feature_permission_affectation %} + Droits d'affectation + {% endif %} + Actions +{% endblock %} +{% block contentTableBody %} + {% for user in users %} + + {% if is_granted('ROLE_ADMIN') %} + + {% if user.territory %} + {{ user.territory.zip }} - {{ user.territory.name }} + {% endif %} + + {% endif %} + {{ user.prenom }} {{ user.nom }} + {{ user.email }} + {{ user.partner ? user.partner.nom }} + {{ user.partner and user.partner.type ? user.partner.type.label : 'N/A' }} + + {% if user.statut is same as constant('App\\Entity\\User::STATUS_INACTIVE') %} + Non activé + {% elseif user.statut is same as constant('App\\Entity\\User::STATUS_ACTIVE') %} + Activé + {% else %} + {{ user.statutLabel }} + {% endif %} + + {{ user.lastLoginAt ? user.lastLoginAt|date('d/m/Y') : '-'}} + {{ user.roleLabel() }} + {% if platform.feature_permission_affectation %} + {{ user.isSuperAdmin() or user.isTerritoryAdmin() or user.hasPermissionAffectation() ? 'Oui' : 'Non' }} + {% endif %} + + + + + + {% endfor %} {% endblock %}