Merge remote-tracking branch 'origin/master' into integrate_regroupment_entity

src/Bundle/ChillMainBundle/Resources/public/types.ts

@@ -35,6 +35,7 @@ export interface User {
   id: number;
   username: string;
   text: string;
+  text_without_absence: string;
   email: string;
   user_job: Job;
   label: string;

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue

@@ -1,8 +1,7 @@
 <template>
 <span class="chill-entity entity-user">
     {{ user.label }}
-    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span>
-    <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span>
+    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span> <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span> <span v-if="user.isAbsent" class="badge bg-danger rounded-pill" :title="Absent">A</span>
 </span>
 </template>
 

src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig

@@ -6,4 +6,7 @@
     {%- if opts['main_scope'] and user.mainScope is not null %}
     <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
     {%- endif -%}
+    {%- if opts['absence'] and user.isAbsent %}
+        <span class="badge bg-danger rounded-pill" title="{{ 'absence.Absent'|trans|escape('html_attr') }}">{{ 'absence.A'|trans }}</span>
+    {%- endif -%}
 </span>

src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig

@@ -1,15 +1,15 @@
 <div class="col-10 mt-5">
-    
     {# vue component #}
     <div id="homepage_widget"></div>
-    
+
     {% include '@ChillMain/Homepage/fast_actions.html.twig' %}
 </div>
 
+
 {% block css %}
     {{ encore_entry_link_tags('page_homepage_widget') }}
 {% endblock %}
 
 {% block js %}
     {{ encore_entry_script_tags('page_homepage_widget') }}
-{% endblock %}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Menu/absence.html.twig

@@ -0,0 +1,43 @@
+{% extends '@ChillMain/Admin/layout.html.twig' %}
+
+{% block title %}
+    {{ 'absence.My absence'|trans }}
+{% endblock title %}
+
+{% block content %}
+
+    <div class="col-md-10">
+        <h2>{{ 'absence.My absence'|trans }}</h2>
+
+        {% if user.absenceStart is not null %}
+            <div>
+                <p>{{ 'absence.You are listed as absent, as of'|trans }} {{ user.absenceStart|format_date('long') }}</p>
+                <ul class="record_actions sticky-form-buttons">
+                    <li>
+                        <a href="{{ path('chill_main_user_absence_unset') }}"
+                           class="btn btn-delete">{{ 'absence.Unset absence'|trans }}</a>
+                    </li>
+                </ul>
+            </div>
+        {% else %}
+            <div>
+                <p class="chill-no-data-statement">{{ 'absence.No absence listed'|trans }}</p>
+            </div>
+            <div>
+                {{ form_start(form) }}
+                {{ form_row(form.absenceStart) }}
+
+                <ul class="record_actions sticky-form-buttons">
+                    <li>
+                        <button class="btn btn-save" type="submit">
+                            {{ 'Save'|trans }}
+                        </button>
+                    </li>
+                </ul>
+
+                {{ form_end(form) }}
+            </div>
+        {% endif %}
+    </div>
+
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig

@@ -2,20 +2,21 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
-    
+
         {% block index_header %}
             <h1>{{"Users"|trans}}</h1>
         {% endblock %}
-    
+
         {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
-    
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Active'|trans }}</th>
+            <th>{{ 'absence.Is absent'|trans }}</th>
             <th>{{ 'Username'|trans }}</th>
             <th>{{ 'Datas'|trans }}</th>
             <th>{{ 'Actions'|trans }}</th>
         {% endblock %}
-    
+
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -26,6 +27,13 @@
                             <i class="fa fa-square-o"></i>
                         {% endif %}
                     </td>
+                    <td>
+                        {% if entity.isAbsent %}
+                            <i class="fa fa-check-square-o"></i>
+                        {% else %}
+                            <i class="fa fa-square-o"></i>
+                        {% endif %}
+                    </td>
                     <td>
                         {#
                         {% if entity.civility is not null %}
@@ -64,13 +72,13 @@
                             <li>
                                 <a class="btn btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
                             </li>
-        
+
                             {% if allow_change_password is same as(true) %}
                                 <li>
                                     <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
                                 </li>
                             {% endif %}
-        
+
                             {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                                 <li>
                                     <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
@@ -81,9 +89,9 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    
+
         {% block pagination %}{{ chill_pagination(paginator) }}{% endblock %}
-    
+
         {% block list_actions %}
             <ul class="record_actions sticky-form-buttons">
                 <li class='cancel'>
@@ -94,6 +102,6 @@
                 </li>
             </ul>
         {% endblock list_actions %}
-    
+
     {% endembed %}
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -69,18 +69,26 @@
 
                 {% block content %}
                     <div class="col-8 main_search">
+                        {% if app.user.isAbsent %}
+                            <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
+                                <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
+                                <span class="ms-auto">
+                                    <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
+                                </span>
+                            </div>
+                        {% endif %}
                         <h2>{{ 'Search'|trans }}</h2>
 
                         <form action="{{ path('chill_main_search') }}" method="get">
                             <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
-                            <center>
+                            <div class="text-center">
                                 <button type="submit" class="btn btn-lg btn-warning mt-3">
                                     <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
                                 </button>
                                 <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
                                     <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
                                 </a>
-                            </center>
+                            </div>
                         </form>
                     </div>