merge branch FixAddressBeneficiary into dev

config.yaml

@@ -32,6 +32,7 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:

web/layouts/beneficiaries/update.html

@@ -162,9 +162,13 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
-                    {{ $fieldName := "address" }}
+                        {{ $fieldName := "address" }} 
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
+                        {{if .ViewState.Data.address}}
-                    <!-- will dolater : tags, groups, ... -->
+                        {{$default := .ViewState.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        {{end}}
 
                 </div>
             </div>

web/layouts/vehicles_management/fleet-update.html

@@ -117,12 +117,11 @@
                     {{else}}
                     {{ template "address_autocomplete" dict "FieldName" $fieldName}}
                     {{end}}
-
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques</label>
                         <div class="mt-1">
                             <textarea rows="4" name="informations" id="informations" value="{{.ViewState.vehicle.Data.informations}}"
-                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">{{ if .ViewState.vehicle.Data.informations}}{{.ViewState.vehicle.Data.informations}}{{end}}</textarea>
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">{{ if .ViewState.vehicle.Data.informations}} {{.ViewState.vehicle.Data.informations}} {{end}}</textarea>
                         </div>
                     </div>
                 </div>
@@ -157,7 +156,9 @@
          </div>
      </div>
      <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+        <!-- class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600 -->
          <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}" class="rounded-2xl mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
+         <!-- <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button> -->
      </div>
      </div>
  </div>