Update users list

crf-devs · May 9, 2020 · 272011e · 272011e
1 parent d51af71
commit 272011e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git a/templates/organization/commissionable_asset/_list.html.twig b/templates/organization/commissionable_asset/_list.html.twig
@@ -2,12 +2,12 @@
     <table class="table table-stripped mt-3">
         <thead class="thead-light">
         <tr>
+            <th>{{ 'organization.label' | trans }}</th>
             <th>{{ 'common.type' | trans }}</th>
             <th>{{ 'organization.asset.identificationNumber' | trans }}</th>
             {% if showLinks is not defined or showLinks %}
                 <th>{{ 'common.availabilities' | trans }}</th>
             {% endif %}
-            <th>{{ 'organization.label' | trans }}</th>
             {% if showLinks is not defined or showLinks %}
                 <th></th>
             {% endif %}
@@ -16,6 +16,8 @@
         <tbody>
         {% for asset in assets %}
             <tr>
+                <td>{{ asset.organization.name }}</td>
+
                 <td>{{ asset.assetType.name }}</td>
                 <td class="text-nowrap">
                     {{ asset.name }}
@@ -28,10 +30,9 @@
                     </td>
                 {% endif %}
 
-                <td>{{ asset.organization.name }}</td>
                 {% if showLinks is not defined or showLinks %}
                     <td>
-                        <button class="btn btn-outline-primary" data-toggle="ajax-modal" data-href="{{ path('app_organization_asset_show_modal', { 'asset': asset.id, 'organization': asset.organization.id }) }}" title="{{ 'action.show' | trans }}">
+                        <button class="btn btn-outline-primary text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_asset_show_modal', { 'asset': asset.id, 'organization': asset.organization.id }) }}" title="{{ 'action.show' | trans }}">
                             <span class="fa fa-copy"></span> {{ 'action.show' | trans }}
                         </button>
                     </td>

diff --git a/templates/organization/mission/_list.html.twig b/templates/organization/mission/_list.html.twig
@@ -58,7 +58,7 @@
                     {% endif %}
 
                     {% if modalLinks is not defined or modalLinks %}
-                        <button type="button" class="btn btn-outline-primary" data-toggle="ajax-modal" data-href="{{ path('app_organization_mission_modal', {id: mission.id}) }}">
+                        <button type="button" class="btn btn-outline-primary text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_mission_modal', {id: mission.id}) }}">
                             <span class="fa fa-copy"></span> {{ 'action.show' | trans }}
                         </button>
                     {% endif %}

diff --git a/templates/organization/mission/_list_full.html.twig b/templates/organization/mission/_list_full.html.twig
@@ -23,7 +23,7 @@
                 <td>
                     <span class="badge badge-secondary">{{ mission.type.name | default('') }}</span>
 
-                    <button type="button" class="btn btn-link p-0" data-toggle="ajax-modal" data-href="{{ path('app_organization_mission_modal', {id: mission.id}) }}">
+                    <button type="button" class="btn btn-link p-0 text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_mission_modal', {id: mission.id}) }}">
                         <span class="fa fa-copy"></span> {{ mission.name }}
                     </button>
                 </td>
@@ -45,7 +45,7 @@
                     <td colspan="3"></td>
                     <td>{{ user.organization.name }}</td>
                     <td>
-                        <button type="button" class="btn btn-link p-0" data-toggle="ajax-modal" data-href="{{ path('app_organization_user_show_modal', {userToShow: user.id, organization: user.organization.id}) }}">
+                        <button type="button" class="btn btn-link p-0 text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_user_show_modal', {userToShow: user.id, organization: user.organization.id}) }}">
                             <span class="fa fa-copy"></span> {{ user.fullName }}
                         </button>
                     </td>
@@ -66,7 +66,7 @@
                     <td colspan="3"></td>
                     <td>{{ asset.organization.name }}</td>
                     <td>
-                        <button type="button" class="btn btn-link p-0" data-toggle="ajax-modal" data-href="{{ path('app_organization_asset_show_modal', {asset: asset.id, organization: asset.organization.id}) }}">
+                        <button type="button" class="btn btn-link p-0 text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_asset_show_modal', {asset: asset.id, organization: asset.organization.id}) }}">
                             <span class="fa fa-copy"></span> {{ asset }}
                         </button>
                     </td>

diff --git a/templates/organization/planning/_availabilities_assets.html.twig b/templates/organization/planning/_availabilities_assets.html.twig
@@ -12,7 +12,7 @@
 
 {% block itemDataRowHeader %}
     <button type="button" class="btn btn-link p-0" data-toggle="ajax-modal" data-href="{{ path('app_organization_asset_show_modal', {asset: item.entity.id, organization: item.entity.organization.id}) }}">
-        <span class="fa fa-copy"></span> {{ item.entity }}
+        {{ item.entity }}
     </button>
 {% endblock itemDataRowHeader %}
 

diff --git a/templates/organization/planning/_availabilities_users.html.twig b/templates/organization/planning/_availabilities_users.html.twig
@@ -17,7 +17,7 @@
 
 {% block itemDataRowHeader %}
     <button type="button" class="btn btn-link p-0" data-toggle="ajax-modal" data-href="{{ path('app_organization_user_show_modal', {userToShow: item.entity.id, organization: item.entity.organization.id}) }}">
-        <span class="fa fa-copy"></span> {{ item.entity }}
+        {{ item.entity }}
     </button>
 
     {{ item.entity.skillSet | filterSkillsToDisplay | filterInludedSkills | map(skill => skill|skillBadge) | join | raw }}

diff --git a/templates/organization/user/_list.html.twig b/templates/organization/user/_list.html.twig
@@ -1,15 +1,18 @@
 <div class="table-responsive">
-    <table class="table table-striped mt-3">
+    <table class="table table-striped text-nowrap mt-3">
         <thead  class="thead-light">
         <tr>
-            <th>{{ 'user.identificationNumber' | trans }}</th>
+            {% if organization.isParent %}
+                <th>{{ 'organization.label' | trans }}</th>
+            {% endif %}
             <th>{{ 'user.firstName' | trans }}</th>
             <th>{{ 'user.lastName' | trans }}</th>
-            <th>{{ 'organization.user.skillset' | trans }}</th>
-            <th>{{ 'user.email' | trans }}</th>
-            {% if organization.parent is null %}
-                <th>{{ 'organization.label' | trans }}</th>
+            <th>{{ 'user.skills' | trans }}</th>
+            <th>{{ 'user.identificationNumber' | trans }}</th>
+            {% if showLinks is not defined or showLinks %}
+                <th>{{ 'user.email' | trans }}</th>
             {% endif %}
+            <th>{{ 'common.phoneNumberShort' | trans }}</th>
             {% if showLinks is not defined or showLinks %}
                 <th></th>
             {% endif %}
@@ -18,17 +21,24 @@
         <tbody>
         {% for user in users %}
             <tr>
-                <td><small>{{ user.identificationNumber }}</small></td>
+                {% if organization.isParent %}
+                    <td>{{ user.organization.name }}</td>
+                {% endif %}
                 <td>{{ user.firstName }}</td>
                 <td>{{ user.lastName }}</td>
                 <td>{{ user|userBadges }}</td>
-                <td><small>{{ user.emailAddress }}</small></td>
-                {% if organization.parent is null %}
-                    <td>{{ user.organization.name }}</td>
+                <td><small>{{ user.identificationNumber }}</small></td>
+                {% if showLinks is not defined or showLinks %}
+                    <td><small>{{ user.emailAddress }}</small></td>
                 {% endif %}
+                <td>
+                    <a href="tel:{{ user.phoneNumber|phone_number_format('E164') }}" class="small">
+                        {{ user.phoneNumber|phone_number_format('NATIONAL') }}
+                    </a>
+                </td>
                 {% if showLinks is not defined or showLinks %}
                     <td>
-                        <button class="btn btn-outline-primary" data-toggle="ajax-modal" data-href="{{ path('app_organization_user_show_modal', { 'userToShow': user.id, 'organization': user.organization.id }) }}">
+                        <button class="btn btn-outline-primary text-nowrap" data-toggle="ajax-modal" data-href="{{ path('app_organization_user_show_modal', { 'userToShow': user.id, 'organization': user.organization.id }) }}">
                             <span class="fa fa-copy"></span> {{ 'action.show' | trans }}
                         </button>
                     </td>