Merge remote-tracking branch 'origin/calendar/synchro-msgraph' into calendar/finalization

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss

@@ -1,6 +1,3 @@
-// import bootstrap variables
-@import 'bootstrap/scss/variables';
-
 // Variables
 //
 // Variables should follow the `$component-state-property-size` formula for

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -1,5 +1,5 @@
 <template>
-    <ul :class="listClasses" v-if="picked.length">
+    <ul :class="listClasses" v-if="picked.length && displayPicked">
         <li v-for="p in picked" @click="removeEntity(p)" :key="p.type+p.id">
             <span class="chill_denomination">{{ p.text }}</span>
         </li>
@@ -44,6 +44,11 @@ export default {
         removableIfSet: {
             type: Boolean,
             default: true,
+        },
+        displayPicked: {
+          // display picked entities.
+          type: Boolean,
+          default: true,
         }
     },
     emits: ['addNewEntity', 'removeEntity'],

src/Bundle/ChillMainBundle/Resources/public/vuejs/i18n/datetimeFormats.js

@@ -17,6 +17,11 @@ export default {
       hour: "numeric",
       minute: "numeric",
       hour12: false
+    },
+    hoursOnly: {
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
     }
   }
 };

src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig

@@ -10,6 +10,28 @@
               </div>
             {% endif %}
         </div>
+        {% if form.dateRanges is defined %}
+            {% if form.dateRanges|length > 0 %}
+                {% for dateRangeName, _o in form.dateRanges %}
+                    <div class="row gx-2">
+                        <div class="col-md-5">
+                            {{ form_label(form.dateRanges[dateRangeName])}}
+                        </div>
+                        <div class="col-md-6">
+                            <div class="input-group mb-3">
+                                <span class="input-group-text">{{ 'chill_calendar.From'|trans }}</span>
+                                {{ form_widget(form.dateRanges[dateRangeName]['from']) }}
+                                <span class="input-group-text">{{ 'chill_calendar.To'|trans }}</span>
+                                {{ form_widget(form.dateRanges[dateRangeName]['to']) }}
+                            </div>
+                        </div>
+                        <div class="col-md-1">
+                            <button type="submit" class="btn btn-misc"><i class="fa fa-filter"></i></button>
+                        </div>
+                    </div>
+                {% endfor %}
+            {% endif %}
+        {% endif %}
         {% if form.checkboxes is defined %}
             {% if form.checkboxes|length > 0 %}
                 {% for checkbox_name, options in form.checkboxes %}