AccompanyingCourse: uniformity of styles

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

@@ -27,17 +27,19 @@
             ]) }}
             </div>
 
-            <ul class="record_actions">
+            <div>
-               <li>
+               <ul class="record_actions">
-                  <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
+                  <li>
-               </li>
+                     <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
-               <li v-if="initialComment !== null">
+                  </li>
-                  <a class="btn btn-delete"
+                  <li v-if="initialComment !== null">
-                     @click="removeComment">
+                     <a class="btn btn-delete"
-                     {{ $t('action.delete') }}
+                        @click="removeComment">
-                  </a>
+                        {{ $t('action.delete') }}
-               </li>
+                     </a>
-            </ul>
+                  </li>
+               </ul>
+            </div>
 
          </form>
       </div>

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

@@ -3,30 +3,34 @@
       <h2><a name="section-20"></a>
          {{ $t('courselocation.title') }}
       </h2>
-      <div class="my-4">
 
-         <!-- {# include vue_address component #} -->
+      <!-- {# include vue_address component #} -->
-         <div v-for="error in displayErrors" class="alert alert-danger my-2">
+      <div v-for="error in displayErrors" class="alert alert-danger my-2">
-            {{ error }}
+         {{ error }}
-         </div>
+      </div>
 
-         <div v-if="hasNoLocation" class="chill-no-data-statement">
+      <div v-if="hasNoLocation">
+         <label class="chill-no-data-statement">
             {{ $t('courselocation.no_address') }}
-         </div>
+         </label>
+      </div>
 
-         <show-address
+      <div v-if="isPersonLocation">
-            v-if="accompanyingCourse.location"
+         <label class="col-form-label">
-            :address="accompanyingCourse.location">
-         </show-address>
-
-         <div v-if="isPersonLocation" class="alert alert-success">
             {{ $t('courselocation.person_locator', [ accompanyingCourse.personLocation.text ]) }}
-         </div>
+         </label>
+      </div>
 
-         <div v-if="isTemporaryAddress" class="alert alert-warning">
+      <show-address
-            <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
+         v-if="accompanyingCourse.location"
-         </div>
+         :address="accompanyingCourse.location">
+      </show-address>
 
+      <div v-if="isTemporaryAddress" class="alert alert-warning">
+         <p>{{ $t('courselocation.temporary_address_must_be_changed') }}</p>
+      </div>
+
+      <div>
          <ul class="record_actions">
             <li>
                <add-address
@@ -47,8 +51,8 @@
                </button>
             </li>
          </ul>
-
       </div>
+
    </div>
 </template>
 

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

@@ -2,7 +2,7 @@
    <div class="vue-component">
       <h2><a name="section-30"></a>{{ $t('origin.title') }}</h2>
 
-      <div class="my-4">
+      <div class="mb-4">
          <label for="selectOrigin">
             {{ $t('origin.label') }}
          </label>

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

@@ -2,9 +2,12 @@
 <div class="vue-component">
    <h2><a name="section-10"></a>{{ $t('persons_associated.title')}}</h2>
 
-   <div>
+   <div v-if="participations.length > 0">
       <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
    </div>
+   <div v-else>
+      <label class="chill-no-data-statement">{{ $tc('persons_associated.counter', counter) }}</label>
+   </div>
 
    <table class="table table-bordered table-striped border-dark align-middle" v-if="participations.length > 0">
       <thead>

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

@@ -2,7 +2,7 @@
 <div class="vue-component">
    <h2><a name="section-60"></a>{{ $t('referrer.title') }}</h2>
 
-   <div class="my-4">
+   <div>
       <label class="col-form-label" for="selectReferrer">
          {{ $t('referrer.label') }}
       </label>
@@ -18,7 +18,9 @@
          v-bind:options="options"
          @select="updateReferrer">
       </VueMultiselect>
+   </div>
 
+   <div>
       <ul class="record_actions">
          <li>
             <button
@@ -30,8 +32,8 @@
             </button>
          </li>
       </ul>
-
    </div>
+
 </div>
 </template>
 

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

@@ -6,7 +6,7 @@
    <div v-if="accompanyingCourse.requestor" class="flex-table">
 
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" /><!--  :value="value" -->
+         <input type="checkbox" v-model="isAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
 
@@ -67,7 +67,7 @@
       </ul>
    </div>
    <div v-else>
-      <label>{{ $t('requestor.counter') }}</label>
+      <label class="chill-no-data-statement">{{ $t('requestor.counter') }}</label>
    </div>
 
    <div>

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

@@ -3,9 +3,12 @@
 
    <h2><a name="section-70"></a>{{ $t('resources.title')}}</h2>
 
-   <div>
+   <div v-if="resources.length > 0">
       <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
    </div>
+   <div v-else>
+      <label class="chill-no-data-statement">{{ $tc('resources.counter', counter) }}</label>
+   </div>
 
    <table class="table table-bordered table-striped border-dark align-middle" v-if="resources.length > 0">
       <thead>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js

@@ -34,7 +34,7 @@ const appMessages = {
       },
       persons_associated: {
          title: "Usagers concernés",
-         counter: "Il n'y a pas encore d'usager | 1 usager | {count} usagers",
+         counter: "Il n'y a pas encore d'usagers | 1 usager | {count} usagers",
          firstname: "Prénom",
          lastname: "Nom",
          name: "Nom",
@@ -75,7 +75,7 @@ const appMessages = {
          sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
          ok: "Désigner comme adresse du parcours",
          person_locator: "Parcours localisé auprès de {0}",
-         no_address: "Aucune adresse associée au parcours."
+         no_address: "Il n'y a pas d'adresse associée au parcours"
       },
       referrer: {
          title: "Référent du parcours",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -37,8 +37,8 @@ let initPromise = getAccompanyingCourse(id)
             validationKeys(state, getters) {
                let keys = [];
                if (!getters.isParticipationValid) { keys.push('participation'); }
-               if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
                if (!getters.isLocationValid) { keys.push('location'); }
+               if (!getters.isSocialIssueValid) { keys.push('socialIssue'); }
                //console.log('getter keys', keys);
                return keys;
             },