Merge branch 'issue419_AddPersons_clear_ul' into 'master'

Issue419  remove ul-li in AddPersons

See merge request Chill-Projet/chill-bundles!328

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to
 * date versioning for test releases
 
 ## Unreleased
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
 
 <!-- write down unreleased development here -->
 * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -19,14 +19,18 @@
          </ul>
       </div>
 
-      <add-persons
+      <ul class="record_actions">
-         buttonTitle="activity.add_persons"
+         <li class="add-persons">
-         modalTitle="activity.add_persons"
+            <add-persons
-         v-bind:key="addPersons.key"
+               buttonTitle="activity.add_persons"
-         v-bind:options="addPersonsOptions"
+               modalTitle="activity.add_persons"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons">
+               v-bind:options="addPersonsOptions"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons">
+            </add-persons>
+         </li>
+      </ul>
 
    </teleport>
 </template>

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

@@ -5,8 +5,8 @@
         </li>
     </ul>
     <ul class="record_actions">
-        <li>
+        <li class="add-persons">
-            <AddPersons
+            <add-persons
                 :options="addPersonsOptions"
                 :key="uniqid"
                 :buttonTitle="translatedListOfTypes"
@@ -14,7 +14,7 @@
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             >
-            </AddPersons>
+            </add-persons>
         </li>
     </ul>
 </template>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue

@@ -56,14 +56,18 @@
    </div>
 
    <div>
-      <add-persons
+      <ul class="record_actions">
-         buttonTitle="persons_associated.add_persons"
+         <li class="add-persons">
-         modalTitle="add_persons.title"
+            <add-persons
-         v-bind:key="addPersons.key"
+               buttonTitle="persons_associated.add_persons"
-         v-bind:options="addPersons.options"
+               modalTitle="add_persons.title"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons"> <!-- to cast child method -->
+               v-bind:options="addPersons.options"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
    <div v-if="!isParticipationValid" class="alert alert-warning to-confirm">

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -144,14 +144,18 @@
    </div>
 
    <div>
-      <add-persons v-if="accompanyingCourse.requestor === null"
+      <ul class="record_actions">
-         buttonTitle="requestor.add_requestor"
+         <li class="add-persons">
-         modalTitle="requestor.add_requestor"
+            <add-persons v-if="accompanyingCourse.requestor === null"
-         v-bind:key="addPersons.key"
+               buttonTitle="requestor.add_requestor"
-         v-bind:options="addPersons.options"
+               modalTitle="requestor.add_requestor"
-         @addNewPersons="addNewPersons"
+               v-bind:key="addPersons.key"
-         ref="addPersons"> <!-- to cast child method -->
+               v-bind:options="addPersons.options"
-      </add-persons>
+               @addNewPersons="addNewPersons"
+               ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue

@@ -29,14 +29,18 @@
    </div>
 
    <div>
-      <add-persons
+      <ul class="record_actions">
-      buttonTitle="resources.add_resources"
+         <li class="add-persons">
-      modalTitle="resources.add_resources"
+            <add-persons
-      v-bind:key="addPersons.key"
+            buttonTitle="resources.add_resources"
-      v-bind:options="addPersons.options"
+            modalTitle="resources.add_resources"
-      @addNewPersons="addNewPersons"
+            v-bind:key="addPersons.key"
-      ref="addPersons"> <!-- to cast child method -->
+            v-bind:options="addPersons.options"
-      </add-persons>
+            @addNewPersons="addNewPersons"
+            ref="addPersons"> <!-- to cast child method -->
+            </add-persons>
+         </li>
+      </ul>
    </div>
 
 </div>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -160,7 +160,7 @@
             </p>
 
             <ul class="record_actions">
-               <li>
+               <li class="add-persons">
                   <add-persons
                      ref="handlingThirdPartyPicker"
                      v-bind:key="handlingThirdPartyPicker.key"
@@ -222,7 +222,7 @@
          </div>
 
          <ul class="record_actions">
-            <li>
+            <li class="add-persons">
                <add-persons
                   ref="thirdPartyPicker"
                   v-bind:key="thirdPartyPicker.key"

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue

@@ -29,7 +29,7 @@
   </div>
 
   <ul class="record_actions">
-    <li>
+    <li class="add-persons">
       <add-persons
           buttonTitle="household_members_editor.concerned.add_persons"
           modalTitle="household_members_editor.concerned.search"

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue

@@ -61,7 +61,7 @@
     <li v-if="hasHousehold">
       <button @click="resetMode" class="btn btn-sm btn-misc">{{ $t('household_members_editor.household.reset_mode')}}</button>
     </li>
-    <li v-if="!hasHousehold">
+    <li v-if="!hasHousehold" class="add-persons">
       <add-persons
           modalTitle="Chercher un ménage existant"
           buttonTitle="Chercher un ménage existant"

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue

@@ -1,10 +1,7 @@
 <template>
-    <ul class="record_actions">
+   <a class="btn" :class="getClassButton" :title="$t(buttonTitle)" @click="openModal">
-      <li class="add-persons">
+      <span v-if="displayTextButton">{{ $t(buttonTitle) }}</span>
-        <a class="btn" :class="getClassButton" :title="$t(buttonTitle)"
+   </a>
-           @click="openModal"><span v-if="displayTextButton">{{ $t(buttonTitle) }}</span></a>
-      </li>
-    </ul>
 
   <teleport to="body">
       <modal v-if="modal.showModal"