wait #7878 @3:00

diff --git a/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Date.php b/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Date.php
index 12bf30e58967b3e8dcb889bfb675a3038d188ab4..ce21f11194817208b739b1aa958c4d068f0d8700 100644 (file)
--- a/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Date.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Date.php
@@ -34,13 +34,13 @@ class Date extends Field
         }
 
         // Finally, enqueue the trigger
-        wp_enqueue_script('cube-flatpickr');
+        //wp_enqueue_script('cube-flatpickr');
 
         $res  = '<div data-flatpickr="'. esc_attr(json_encode($flatpickr)) .'" class="flex">';
-        $res .= '<input type="date" placeholder="'. $settings['placeholder'] .'" name="'. $this->get_name() .'" data-input '. $settings['validation'] .'>';
+        $res .= '<input type="date" data-mask="00/00/0000" placeholder="'. $settings['placeholder'] .'" name="'. $this->get_name() .'" data-input '. $settings['validation'] .'>';
 
         if ($settings['show_icon']) {
-            $res .= '<img src="' . asset('images/calendar.svg') . '" class="ml-2 mr-6 cursor-pointer" data-toggle>';
+            //$res .= '<img src="' . asset('images/calendar.svg') . '" class="ml-2 mr-6 cursor-pointer" data-toggle>';
         }
 
         $res .= '</div>';

diff --git a/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Text.php b/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Text.php
index b2052b5588540da1f21911cabf029ddf7f1845e0..8844c24bd74127b9e6a9a173931939bfd477db19 100644 (file)
--- a/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Text.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Builder/Fields/Text.php
@@ -13,6 +13,9 @@ class Text extends Field
         if(strstr($name,'link')) {
             $type = "url";
         }
+        if($settings['data-mask']) {
+            $attr .= ' data-mask='.$settings['data-mask'];
+        }
         return '<input type="'.$type.'" name="'. $this->get_name() .'" placeholder="'. $settings['placeholder'] .'" '. $settings['validation'] . ' '.$attr.'>';
     }
 }

diff --git a/wp-content/mu-plugins/cube/src/Forms/Builder/Form.php b/wp-content/mu-plugins/cube/src/Forms/Builder/Form.php
index c992d52514cf93bafbdd7f837d584004a35e71c9..fd715e4096ce7f7b8faff0f09d836a5a4960c5f6 100644 (file)
--- a/wp-content/mu-plugins/cube/src/Forms/Builder/Form.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Builder/Form.php
@@ -31,6 +31,7 @@ class Form extends Base
             'field_before' => '',
             'field_after' => '',
             'validation' => '',
+            'data-mask' => ''
         ];
 
         return array_merge($default_settings, $settings);

diff --git a/wp-content/mu-plugins/cube/src/Forms/Consultation.php b/wp-content/mu-plugins/cube/src/Forms/Consultation.php
index f09d3ddf3fe177985b4ade34935291174d2127db..e764fcc48fa769a678fca84adc82f5cdff4fd5c9 100644 (file)
--- a/wp-content/mu-plugins/cube/src/Forms/Consultation.php
+++ b/wp-content/mu-plugins/cube/src/Forms/Consultation.php
@@ -50,21 +50,24 @@ class Consultation extends Base
                     'Dr Caroline HIRSH' => 'dr.hirsch@ccv-montpellier.fr',
                 ]),
             Text::field('last-name', __('Nom', 'ccv')),
+            Text::field('birthday-last-name', __('Nom de naissance', 'ccv')),
             Text::field('first-name', __('Prénom', 'ccv')),
             Radio::field('sex', __('Sexe :', 'ccv'))
                 ->options([
                     _x('M', 'Sexe (M)', 'ccv'),
                     _x('F', 'Sexe (F)', 'ccv'),
                 ]),
-            Date::field('birthdate', __('Date de naissance', 'ccv')),
+            Text::field('birthdate', __('Date de naissance :', 'ccv')),
             Text::field('size', __('Taille :', 'ccv')),
             Text::field('weight', __('Poids :', 'ccv')),
             Text::field('profession', __('Profession', 'ccv')),
             Text::field('postcode', __('Code postal', 'ccv')),
+            Text::field('address', __('Adresse', 'ccv')),
             Text::field('city', __('Ville', 'ccv')),
             Text::field('country', __('Pays', 'ccv')),
             Text::field('phone', __('Tel', 'ccv')),
             Email::field('email', __('Email', 'ccv')),
+            Text::field('general_doctor', __('Médecin traitant', 'ccv')),
 
             // Social cover
             Radio::field('social-cover', __('Couverture sociale :', 'ccv'))
@@ -74,7 +77,7 @@ class Consultation extends Base
                     __('Régime de la CMU/ASC/PUMa/CSS', 'ccv'),
                     __('Accident du travail', 'ccv'),
                 ]),
-            Date::field('work-accident', __('Si accident du travail à quelle date ?', 'ccv'))->required(false),
+            Text::field('work-accident', __('Si accident du travail à quelle date ?', 'ccv'))->required(false),
 
             // Chirurgical solutions
             Radio::field('chirurgical-solutions', __('Êtes-vous à la recherche de solutions chirurgicales pour votre problème de dos ?', 'ccv'))
@@ -89,8 +92,8 @@ class Consultation extends Base
                     __('Lombaires', 'ccv'),
                     __('Scoliose', 'ccv'),
                 ]),
-            Date::field('date-first-symptoms', __('Date des premiers symptômes :', 'ccv')),
-            Date::field('date-pain-since', __('Douleurs permanentes depuis (le cas échéant) :', 'ccv'))->required(false),
+            Text::field('date-first-symptoms', __('Date des premiers symptômes :', 'ccv')),
+            Text::field('date-pain-since', __('Douleurs permanentes depuis (le cas échéant) :', 'ccv'))->required(false),
             Binary::field('pain-arms-legs', __('Avez-vous des douleurs dans les bras ou les jambes (sciatiques, cruralgies, névralgies) ?', 'ccv')),
             Checkbox::field('pain-arms-legs-detail', __('Si oui, cochez les membres concernés :', 'ccv'))
                 ->required(false)
@@ -113,9 +116,9 @@ class Consultation extends Base
                 ]),
 
             Binary::field('tingling-numbness', __('Avez-vous des fourmillements ou une sensation d’engourdissement dans un des membres ? ', 'ccv')),
-            Date::field('tingling-numbness-date', __('Si oui depuis quand ?', 'ccv'))->required(false),
+            Text::field('tingling-numbness-date', __('Si oui depuis quand ?', 'ccv'))->required(false),
             Binary::field('strength-loss', __('Avez-vous une perte de force importante dans un des membres ?', 'ccv')),
-            Date::field('strength-loss-date', __('Si oui depuis quand ?', 'ccv'))->required(false),
+            Text::field('strength-loss-date', __('Si oui depuis quand ?', 'ccv'))->required(false),
             Textarea::field('symptoms', __('Dites-nous en quelques mots ce qui vous invalide le plus dans vos symptômes :', 'ccv')),
             Textarea::field('surgeries', __('Indiquez ici vos précédentes chirurgies de la colonne et leurs dates (le cas échéant)', 'ccv'))->required(false),
 
@@ -139,7 +142,7 @@ class Consultation extends Base
                 ->options([
                     __('J\'ai bien noté que mon dossier ne pourra être étudié si je ne fournis pas une IRM de moins de 6 mois', 'ccv'),
                 ]),
-
+            Text::field('establishment', __('Dans quel établissement avez-vous passé votre IRM ?', 'ccv')),
             Text::field('link-1', __('Lien internet 1', 'ccv'))->required(false),
             Text::field('id-1', __('Identifiant', 'ccv'))->required(false),
             Password::field('pwd-1', __('Mot de passe', 'ccv'))->required(false),

diff --git a/wp-content/themes/CCV/resources/views/partials/content-form.blade.php b/wp-content/themes/CCV/resources/views/partials/content-form.blade.php
index 35396912d19cbb0e9420804d920cd7e5cb204857..5d0a1626b4fd12a36b4ad0b22cf4d302cc733552 100644 (file)
--- a/wp-content/themes/CCV/resources/views/partials/content-form.blade.php
+++ b/wp-content/themes/CCV/resources/views/partials/content-form.blade.php
@@ -15,7 +15,8 @@
             'placeholder' => $date_placeholder,
             'class' => 'flex items-center spaced-horizontal',
             'title_class' => 'mb-0',
-            'input_class' => 'date-field-compact',
+            'input_class' => 'date-field-compact flex items-center w-24',
+            'data-mask' => '00/00/0000',
             'flatpickr' => [
               'maxDate' => 'today'
             ]
@@ -28,7 +29,8 @@
             'placeholder' => $date_placeholder,
             'class' => 'flex items-center spaced-horizontal',
             'title_class' => 'mb-0',
-            'input_class' => 'date-field-compact',
+            'input_class' => 'date-field-compact flex items-center w-24',
+            'data-mask' => '00/00/0000',
             'flatpickr' => [
                 'maxDate' => 'today'
             ]
@@ -70,7 +72,8 @@
             'placeholder' => $date_placeholder,
             'class' => 'flex items-center spaced-horizontal',
             'title_class' => 'mb-0',
-            'input_class' => 'date-field-compact',
+            'input_class' => 'date-field-compact flex items-center w-24',
+            'data-mask' => '00/00/0000',
             'flatpickr' => [
                 'maxDate' => 'today'
             ]
@@ -84,7 +87,8 @@
             'placeholder' => $date_placeholder,
             'class' => 'flex items-center spaced-horizontal',
             'title_class' => 'mb-0',
-            'input_class' => 'date-field-compact',
+            'input_class' => 'date-field-compact flex items-center w-24',
+            'data-mask' => '00/00/0000',
             'flatpickr' => [
                 'maxDate' => 'today'
             ]
@@ -157,7 +161,7 @@
         <div id="purview_uploader" class="lity-hide spaced">
 
           <h3 class="text-lg font-body font-normal">
-            {{ __('Envoyez vos images au CCV Montpellier en vue d’une téléconsultation', 'ccv') }}
+            {{ __('Envoyez vos images au CCV MONTPELLIER pour un avis médical', 'ccv') }}
           </h3>
 
           <p>
@@ -200,6 +204,7 @@
         <div class="text-lg sm:text-base font-normal leading-tight mb-1">
           {{ __('Vous pouvez aussi nous envoyer vos images par courrier :', 'ccv') }}
         </div>
+
         <p class="mt-4 sm:text-sm">
           CCV MONTPELLIER<br>
           AVIS MEDICAL<br>
@@ -227,11 +232,17 @@
             {{ __('Vous avez reçu un lien pour consulter vos images en ligne ?', 'ccv') }}
           </div>
           <p class="mt-0 mb-0! pb-2 sm:text-sm">
-            {{ __('Collez votre lien ci-dessous ainsi que vos identifiant et mot de passe :', 'ccv') }}
+            {{ __('Collez votre lien ci-dessous ainsi que vos identifiant et mot de passe, en commençant par votre IRM :', 'ccv') }}
           </p>
         </div>
       </div>
       <div class="ml-4">
+        <div class="mt-1v mb-12">
+          {!! $form->field("establishment", [
+            'show_title' => true,
+            'placeholder' => false,
+            ])!!}
+        </div>
         <div class="form-cols-2 flex">
           @for($i = 1; $i < 5; $i++)
             <div class="mb-8 spaced-lg imagery-link-block">
@@ -258,8 +269,17 @@
 
     <div class="spaced-lg">
       {!! $form->field('last-name', ['show_title' => false, 'placeholder' => __('Nom', 'ccv')]) !!}
+      {!! $form->field('birthday-last-name', ['show_title' => false, 'placeholder' => __('Nom de naissance', 'ccv')]) !!}
       {!! $form->field('first-name', ['show_title' => false]) !!}
-      {!! $form->field('birthdate', ['show_icon' => false,'show_title' => false, 'placeholder' => __('Date de naissance', 'ccv') . ' '. $date_placeholder ]) !!}
+      {!! $form->field('birthdate', [
+        'show_icon' => false,
+        'show_title' => true,
+        'data-mask' => '00/00/0000',
+        'placeholder' => $date_placeholder,
+        'title_class' => 'font-light mb-0',
+        'input_class' => 'flex items-center w-24',
+       'class' => 'flex items-center spaced-horizontal',
+      ]) !!}
       {!! $form->field('sex', ['class' => 'flex items-center spaced-horizontal', 'title_class' => 'font-light mb-0']) !!}
       <div class="flex spaced-horizontal justify-between">
         {!! $form->field('size', [
@@ -288,8 +308,11 @@
         'class' => 'flex items-center spaced-horizontal',
         'placeholder' => $date_placeholder,
         'title_class' => 'font-light mb-0',
+        'data-mask' => '00/00/0000',
+        'input_class' => 'flex items-center w-24',
       ]) !!}
       {!! $form->field('postcode', ['show_title' => false, 'placeholder' => __('Code postal', 'ccv')]) !!}
+      {!! $form->field('address', ['show_title' => false, 'placeholder' => __('Adresse', 'ccv')]) !!}
       {!! $form->field('city', ['show_title' => false, 'placeholder' => __('Ville', 'ccv')]) !!}
       {!! $form->field('country', ['show_title' => false]) !!}
     </div>
@@ -297,6 +320,7 @@
     <div class="spaced-lg">
       {!! $form->field('phone', ['show_title' => false]) !!}
       {!! $form->field('email', ['show_title' => false]) !!}
+      {!! $form->field('general_doctor', ['show_title' => false, 'placeholder' => __('Médecin traitant', 'ccv')]) !!}
       <div class="chirurgical-solutions-block">
         {!! $form->field('chirurgical-solutions', [
           'input_class' => 'flex flex-col'