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

src/Bundle/ChillMainBundle/Controller/LocationController.php

@@ -28,7 +28,7 @@ class LocationController extends CRUDController
 
     protected function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->where('e.availableForUsers = true'); //TODO not working
+        $query->where('e.availableForUsers = "TRUE"');
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

src/Bundle/ChillMainBundle/Export/ExportInterface.php

@@ -83,9 +83,9 @@ interface ExportInterface extends ExportElementInterface
      *
      * @param string $key The column key, as added in the query
      * @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
-     * @param mixed $data The data from the export's form (as defined in `buildForm`
+     * @param mixed $data The data from the export's form (as defined in `buildForm`)
      *
-     * @return Closure where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+     * @return pure-callable(null|string|int|float|'_header' $value):string|int|\DateTimeInterface where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
      */
     public function getLabels($key, array $values, $data);
 

src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php

@@ -35,6 +35,10 @@ class DateTimeHelper
                 return '';
             }
 
+            if ($value instanceof \DateTimeInterface) {
+                return $value;
+            }
+
             // warning: won't work with DateTimeImmutable as we reset time a few lines later
             $date = DateTime::createFromFormat('Y-m-d', $value);
             $hasTime = false;

src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

@@ -118,7 +118,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
@@ -138,7 +138,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * Return true if the phonenumber is a landline or voip phone.  Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
@@ -159,7 +159,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      * REturn true if the phonenumber is a mobile phone. Return always true
      * if the validation is not configured.
      *
-     * @param string $phonenumber
+     * @param string|PhoneNumber $phonenumber
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
@@ -182,6 +182,10 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             return null;
         }
 
+        if ($phonenumber instanceof PhoneNumber) {
+            $phonenumber = (string) $phonenumber;
+        }
+
         // filter only number
         $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue

@@ -98,11 +98,6 @@ export default {
          }
       },
    },
-   mounted() {
-      if (typeof this.value.point !== 'undefined') {
-         this.updateMapCenter(this.value.point);
-      }
-   },
    methods: {
       transName(value) {
          return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`

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

@@ -11,6 +11,7 @@
     {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }}
     {{ encore_entry_script_tags('page_workflow_show') }}
     {{ encore_entry_script_tags('mod_wopi_link') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
@@ -19,6 +20,7 @@
     {{ encore_entry_link_tags('mod_entity_workflow_subscribe') }}
     {{ encore_entry_link_tags('page_workflow_show') }}
     {{ encore_entry_link_tags('mod_wopi_link') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -229,6 +229,7 @@ Create a new circle: Créer un nouveau cercle
 
 #admin section for location
 Location: Localisation
+pick location: Localisation
 Location type list: Liste des types de localisation
 Create a new location type: Créer un nouveau type de localisation
 Available for users: Disponible aux utilisateurs