Différencier les bucket vérrouillés de complets (#720)

* Booking: show check on bucket if full

* Planning: display if bucket is locked

Author: raphodn

app/Resources/views/booking/_partial/disabled_shift.html.twig

@@ -1,20 +1,24 @@
 {% set nbShifts = bucket.shifts | length %}
 {% set nbBookableShifts = shift_service.getBookableShifts(bucket) | length %}
-{% set nbBookedShifts = nbShifts - nbBookableShifts %}
+
 <div class="tooltipped" data-tooltip="{{ bucket.sortedShifts.first.job.name }} - {% if nbBookableShifts == 0 %}complet{% else %}inaccessible pour {{ beneficiary.firstname }}{% endif %}"
         data-offset="{{ (((bucket.start|date('G')-start)*60 + bucket.start|date('i'))/60) }}"
         data-length="{{ (100/(end-start+1)) }}"
-        style="padding: 0 1px;width:{{ (bucket.duration / 60) * (100/(end-start+1)) }}%;position: absolute;
-                left:{{ (((bucket.start|date('G')-start)*60 + bucket.start|date('i'))/60)*(100/(end-start+1)) }}%;
-                top: {{ line*10 }}px;">
+        style="padding: 0 1px;width:{{ (bucket.duration / 60) * (100/(end-start+1)) }}%;position: absolute;left:{{ (((bucket.start|date('G')-start)*60 + bucket.start|date('i'))/60)*(100/(end-start+1)) }}%;top: {{ line*10 }}px;">
     <div class="z-depth-1 grey lighten-3" style="height:40px;position: relative; cursor: not-allowed">
-
         <div class="shift-block grey-text text-lighten-1">
-            <i class="material-icons tiny">lock</i><span class="small hide-on-med-and-up" style="font-size: 10px">
-                    {% if bucket.start|date('i') == '00' %}{{ bucket.start|date('G\\h') }}{% else %}{{ bucket.start|date('G\\hi') }}{% endif %}
+            {% if bucket.first.locked %}
+                <i class="material-icons tiny">lock</i>
+            {% elseif nbBookableShifts == 0 %}
+                <i class="material-icons tiny">check</i>
+            {% endif %}
+            <span class="small hide-on-med-and-up" style="font-size: 10px">
+                {% if bucket.start|date('i') == '00' %}{{ bucket.start|date('G\\h') }}{% else %}{{ bucket.start|date('G\\hi') }}{% endif %}
                 {% if bucket.end|date('i') == '00' %}{{ bucket.end|date('G\\h') }}{% else %}{{ bucket.end|date('G\\hi') }}{% endif %}
-                </span>
-            <span class="hide-on-small-and-down">{{ bucket.start|date('G\\hi') }} - {{ bucket.end|date('G\\hi') }}</span>
+            </span>
+            <span class="hide-on-small-and-down">
+                {{ bucket.start|date('G\\hi') }} - {{ bucket.end|date('G\\hi') }}
+            </span>
         </div>
         <div class="shift-block">
             <div class="hide-on-med-and-down">

app/Resources/views/booking/_partial/list.html.twig

@@ -54,7 +54,7 @@
                                     {% if shift_service.isBucketBookable(bucket, beneficiary) or not beneficiary %}
                                         {% include "booking/_partial/shift.html.twig" with { beneficiary: beneficiary, user: app.user, bucket: bucket, start: hours|first, end: hours|last, line:l, cycle: current_cycle, display_names: display_names } %}
                                     {% else %}
-                                        {% include "booking/_partial/disabled_shift.html.twig" with { bucket: bucket,start: hours|first, end: hours|last, line:l, display_names: display_names  } %}
+                                        {% include "booking/_partial/disabled_shift.html.twig" with { bucket: bucket,start: hours|first, end: hours|last, line:l, display_names: display_names } %}
                                     {% endif %}
                                 {% endfor %}
                             </div>

app/Resources/views/booking/_partial/shift.html.twig

@@ -3,6 +3,7 @@
 {% set nbBookableShifts = shift_service.getBookableShiftsCount(bucket) %}
 {% set nbBookedShifts = nbShifts - nbBookableShifts %}
 {% set firstBookableShift = shift_service.firstBookable(bucket, beneficiary) %}
+
 <div class="shift-bucket"
      data-offset="{{ (((bucket.start|date('G')-start)*60 + bucket.start|date('i'))/60) }}" data-length="{{ (100/(end-start+1)) }}"
      style="width:{{ (bucket.duration / 60) * (100/(end-start+1)) }}%;left:{{ (((bucket.start|date('G')-start)*60 + bucket.start|date('i'))/60)*(100/(end-start+1)) }}%;top: {{ line*10 }}px;">
@@ -22,13 +23,15 @@
                     {% if bucket.start|date('i') == '00' %}{{ bucket.start|date('G\\h') }}{% else %}{{ bucket.start|date('G\\hi') }}{% endif %}
                     {% if bucket.end|date('i') == '00' %}{{ bucket.end|date('G\\h') }}{% else %}{{ bucket.end|date('G\\hi') }}{% endif %}
                 </span>
-                <span class="hide-on-small-and-down">{{ bucket.start|date('G\\hi') }} - {{ bucket.end|date('G\\hi') }}</span><br>
-                {% if (nbShifter == 0) %}
+                <span class="hide-on-small-and-down">{{ bucket.start|date('G\\hi') }} - {{ bucket.end|date('G\\hi') }}</span>
+                <br>
+                {% if bucket.first.locked %}
+                    <i class="material-icons tiny">lock</i><span class="hide-on-small-and-down">&nbsp;vérouillé</span>
+                {% elseif (nbShifter == 0) %}
                     <span class="red-text"><i class="material-icons tiny">warning</i><span class="hide-on-small-and-down">&nbsp;sous-effectif</span></span>
                 {% elseif (nbShifter < nbShifts/2) %}
                     <span class="orange-text"><i class="material-icons tiny">warning</i><span class="hide-on-small-and-down">&nbsp;sous-effectif</span></span>
-                {% endif %}
-                {% if nbBookableShifts == 0 %}
+                {% elseif nbBookableShifts == 0 %}
                     <span class="green-text"><i class="material-icons tiny">check</i>&nbsp;complet</span>
                 {% endif %}
             </div>