address refactoring: resolve lack of flexibility for many implementations (modal/not, overriding, options, etc. )

address creation/edition is unchanged
many variables are renamed to improve logic and readability

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

@@ -9,6 +9,7 @@
    <origin-demand></origin-demand>
    <requestor></requestor>
    <social-issue></social-issue>
+   <!--course-location></course-location-->
    <referrer></referrer>
    <resources></resources>
    <comment v-if="accompanyingCourse.step === 'DRAFT'"></comment>
@@ -24,7 +25,7 @@ import OriginDemand from './components/OriginDemand.vue';
 import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 import SocialIssue from './components/SocialIssue.vue';
-import CourseLocation from './components/CourseLocation.vue';
+//import CourseLocation from './components/CourseLocation.vue';
 import Referrer from './components/Referrer.vue';
 import Resources from './components/Resources.vue';
 import Comment from './components/Comment.vue';
@@ -39,7 +40,7 @@ export default {
       PersonsAssociated,
       Requestor,
       SocialIssue,
-      CourseLocation,
+      //CourseLocation,
       Referrer,
       Resources,
       Comment,

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

@@ -1,25 +1,24 @@
 <template>
-   <div class='household__address-move'>
-      <div class='household__address-move__create'>
-         <div>
-            <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
-            <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
-            <add-address
-               modalAddTitle="add_an_address_title"
-               modalEditTitle="edit_an_address_title"
-               @addNewAddress="addNewAddress">
-            </add-address>
-         </div>
-         <div>
-            <show-address
-               v-if="newAddress"
-               v-bind:address="newAddress">
-            </show-address>
-         </div>
-      </div>
-      <div v-if="!edit" class='household__address-move__valid'>
-         <h2>{{ $t('move_date') }}</h2>
+   <div class='chill-entity entity-address'>
 
+      <div class="my-3">
+         <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
+         <h2 v-else>{{ $t('edit_address') }}</h2>
+
+         <show-address
+            v-if="newAddress"
+            v-bind:address="newAddress">
+         </show-address>
+
+         <add-address
+            modalAddTitle="add_an_address_title"
+            modalEditTitle="edit_address"
+            @addNewAddress="addNewAddress">
+         </add-address>
+      </div>
+
+      <div v-if="!edit" class='address-valid'>
+         <h2>{{ $t('move_date') }}</h2>
          <div class="input-group mb-3">
             <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
             <input type="date" class="form-control form-control-lg" name="validFrom"
@@ -27,7 +26,6 @@
                v-model="validFrom"
                aria-describedby="validFrom" />
          </div>
-
          <div v-if="errors.length > 0">
             {{ errors }}
          </div>
@@ -38,26 +36,26 @@
             {{ $t('household_address_move_success') }}
          </div>
       </div>
+
       <div v-if="success && edit">
          {{ $t('household_address_edit_success') }}
       </div>
-      <div>
-         <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-               <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
-            </li>
-            <li v-if="!edit">
-               <button type="submit" class="btn btn-update" @click="addToHousehold">
-                  {{ $t('add_an_address_to_household') }}
-               </button>
-            </li>
-         </ul>
-      </div>
+
+      <ul class="record_actions sticky-form-buttons">
+         <li class="cancel">
+            <a :href="backUrl" class="btn btn-cancel">{{ $t('back_to_the_list') }}</a>
+         </li>
+         <li v-if="!edit">
+            <button type="submit" class="btn btn-update" @click="addToHousehold">
+               {{ $t('add_an_address_to_household') }}
+            </button>
+         </li>
+      </ul>
+
    </div>
 </template>
 
 <script>
-
 import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
 import ShowAddress from 'ChillMainAssets/vuejs/Address/components/ShowAddress.vue';
 
@@ -153,5 +151,10 @@ export default {
       }
    },
 };
-
 </script>
+
+<style lang="scss">
+div.entity-address {
+   border: 1px dashed grey;
+}
+</style>

src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig

@@ -18,15 +18,15 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %}
+{% block title 'Edit an address'|trans %}
 
 {% block personcontent %}
-<div class="address-new">
-            
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
+<div class="address-edit">
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+        <div id="address"></div>
+    {% endblock %}
 
 </div>
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -18,16 +18,16 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'New address for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'New address'|trans }}{% endblock %}
 
 {% block personcontent %}
 <div class="address-new">
 
-            {% block content %}
-                <h1>{{ block('title') }}</h1>
-                <div id="address"></div>
-            {% endblock %}
-            
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+        <div id="address"></div>
+    {% endblock %}
+
 </div>
 {% endblock %}
 

src/Bundle/ChillPersonBundle/chill.webpack.config.js

@@ -8,11 +8,11 @@ module.exports = function(encore, entries)
         ChillPersonAssets: __dirname + '/Resources/public'
     });
 
-    encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
-    encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
+    //encore.addEntry('vue_household_address', __dirname + '/Resources/public/vuejs/HouseholdAddress/index.js');
+    //encore.addEntry('vue_household_members_editor', __dirname + '/Resources/public/vuejs/HouseholdMembersEditor/index.js');
     encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
-    encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
-    encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
+    //encore.addEntry('vue_accourse_work_create', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js');
+    //encore.addEntry('vue_accourse_work_edit', __dirname + '/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js');
 
     encore.addEntry('page_household_edit_metadata', __dirname + '/Resources/public/page/household_edit_metadata/index.js');
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');

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

@@ -207,8 +207,10 @@ No address given: Pas d'adresse renseignée
 The address has been successfully updated: L'adresse a été mise à jour avec succès
 Update address for %name%: Mettre à jour une adresse pour %name%
 Modify address for %name%: Modifier une adresse pour %name%
+Edit an address: Modifier une adresse
 Addresses history for %name%: Historique des adresses de %name%
 Addresses history: Historique des adresses
+New address : Nouvelle adresse
 New address for %name% : Nouvelle adresse pour %name%
 The new address was created successfully: La nouvelle adresse a été créée
 Add an address: Ajouter une adresse