diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index f46e80cd2..81ebddc05 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -73,7 +73,7 @@ {% endif %} {% if t.commentVisible %} -
{{ 'Comment'|trans }}
+
{{ 'activity.comment'|trans }}
{%- if entity.comment.empty -%}
{{ 'No comment associated'|trans }}
{%- else -%} @@ -120,17 +120,17 @@ {{ 'Edit'|trans }} - + {# TODO {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %} #} - +
  • {{ 'Delete'|trans }}
  • - + {# {% endif %} #} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index ebcb04f11..6b54172c7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -19,6 +19,7 @@ $chill-theme-buttons: ( "view": $chill-blue, "misc": $gray-300, "cancel": $gray-300, + "choose": $gray-300 ); @each $button, $color in $chill-theme-buttons { @@ -68,6 +69,7 @@ $chill-theme-buttons: ( // &.btn-action::before, &.btn-delete::before, &.btn-remove::before, + &.btn-choose::before, &.btn-cancel::before { font: normal normal normal 14px/1 ForkAwesome; margin-right: 0.5em; @@ -91,6 +93,7 @@ $chill-theme-buttons: ( &.btn-delete::before { content: "\f1f8"; } // fa-trash &.btn-remove::before { content: "\f00d"; } // fa-times &.btn-cancel::before { content: "\f060"; } // fa-arrow-left + &.btn-choose::before { content: "\f00c"; } // fa-check // f046 fa-check-square-o } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index 97fd495ab..6f27b5fbf 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -4,6 +4,8 @@ -
    + +
    s.trim()); + if (substr.length === 1) { + substr = address.split(' '); + } + let decimal = []; + substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) }); + if (decimal[0] === true) { + return { + number: substr.shift(), + street: substr.join(' ') + } + } + else if (decimal[decimal.length - 1] === true) { + return { + number: substr.pop(), + street: substr.join(' ') + } + } + return { + number: '', + street: substr.join(' ') + } + }, addAddress() { this.entity.selected.writeNew.address = true; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue index d0e196361..5bad8ed83 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue @@ -4,6 +4,8 @@
    -
    +
    s.trim()); + if (substr.length === 1) { + substr = city.split(' '); + } + console.log('substr', substr); + let decimal = []; + substr.forEach((s, i) => { decimal[i] = /^\d+$/.test(s) }); + if (decimal[0] === true) { + return { + code: substr.shift(), + name: substr.join(' ') + } + } + else if (decimal[decimal.length - 1] === true) { + return { + code: substr.pop(), + name: substr.join(' ') + } + } + return { + code: '', + name: substr.join(' ') + } + }, addPostcode() { this.entity.selected.writeNew.postcode = true; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue index 017e6fd24..7bbad3db5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue @@ -134,7 +134,9 @@ export default { methods: { focusOnAddress() { const addressSelector = document.getElementById('addressSelector'); - addressSelector.focus(); + if (addressSelector !== null) { + addressSelector.focus(); + } }, updateMapCenter(point) { //console.log('point', point); diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue index 14ca059c0..738c1ab08 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue @@ -48,7 +48,7 @@ + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue index e153373a1..99f92aaf1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue @@ -3,7 +3,7 @@
    - + {{ $t('household_members_editor.holder') }} @@ -73,14 +73,14 @@ div.participation-details { + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index 4a53f0bb5..bc0757574 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -1,14 +1,14 @@ - - - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue index 1a9fffb45..9fd1fbb64 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue @@ -1,7 +1,7 @@ - - diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig index 5b0ada868..488dc3df9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig @@ -1,7 +1,7 @@ {% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %} {% block title %} - {{ 'Accompanying Course Details'|trans }} + {{ 'Accompanying Course History'|trans }} {% endblock %} {% block content %} @@ -15,8 +15,8 @@ Il faudrait peut-être modifier son adresse comme ceci: `/fr/parcours/{id}/timeline`

    - {# start test flex-table - + {# start test flex-table +
    {% for p in accompanyingCourse.participations %}
    @@ -52,16 +52,16 @@
  • - +
    - Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua. + Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua.
    - Rhoncus est pellentesque elit eu ultrices vitae auctor. + Rhoncus est pellentesque elit eu ultrices vitae auctor.
    - Facilisis gravida neque convallis a cras semper auctor neque. + Facilisis gravida neque convallis a cras semper auctor neque.
    {% endfor %} @@ -70,5 +70,5 @@ {# end test flex-table #} {# ==> insert accompanyingCourse vue component #} -
    +
    {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig index cdea2dee2..a65867fb9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/members_editor.html.twig @@ -4,7 +4,7 @@ {% block title 'household.Edit household members'|trans %} {% block content %} -
    +

    {{ block('title') }}

    diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig index 9718308ed..7056f25a3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig @@ -64,10 +64,10 @@ {{ form_start(form) }} - {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }} - {{ form_row(form.lastName, { 'label' : 'Last name'|trans }) }} + {{ form_row(form.firstName, { 'label' : 'First name'|trans }) }} + {% if form.altNames is defined %} {{ form_widget(form.altNames) }} {% endif %} @@ -76,12 +76,28 @@ {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }} +
    + {# TODO remove this field (vendee) #} + {{ form_row(form.center, { 'label' : 'Center'|trans }) }} +
    +
      -
    • - {{ form_widget(form.editPerson, { 'attr': { 'class': 'btn btn-create' }}) }} -
    • -
    • - {{ form_widget(form.createPeriod, { 'attr': { 'class': 'btn btn-create' }}) }} +
    diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 54c1f3818..8b6b6db58 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -119,7 +119,8 @@ address_country_code: Code pays 'Alreay existing person': 'Dossiers déjà encodés' 'Add the person': 'Ajouter la personne' -'Add the person and create an accompanying period': "Ajouter la personne et créer une période d'accompagnement" +'Add the person and create an accompanying period': "Créer la personne ET créer une période d'accompagnement" +'Add the person and create an household': "Créer la personne ET créer un ménage" Show person: Voir le dossier de la personne 'Confirm the creation': 'Confirmer la création' 'You will create this person': 'Vous allez créer le dossier suivant' @@ -372,7 +373,7 @@ Confirmed: en file active # Accompanying Course Accompanying Course: Parcours d'accompagnement -Accompanying Course Details: Détails du parcours +Accompanying Course History: Historique du parcours Resume Accompanying Course: Résumé du parcours Show Accompanying Course: Voir le parcours Edit Accompanying Course: Modifier le parcours diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue index 8db40f9ec..1564b54a0 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue @@ -57,7 +57,7 @@