Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'issue576_address_show_more_if_no_address' into 'master'

Browse Source 
addAddress: can add extra info even if noAddress

See merge request Chill-Projet/chill-bundles!423
This commit is contained in:
Julien Fastré 2022-05-13 13:06:51 +00:00
commit 9970212075
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -11,13 +11,17 @@ and this project adheres to
## Unreleased ## Unreleased
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557) * [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
## Test releases ## Test releases
### 2022-05-06
* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
### 2021-04-29 ### 2021-04-29
* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527) * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)

10
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<h4 class="h3">{{ $t('fill_an_address') }}</h4> <h4 class="h3">{{ $t('fill_an_address') }}</h4>
<div class="row my-3"> <div class="row my-3">
<div class="col-lg-6"> <div class="col-lg-6" v-if="!isNoAddress">
<div class="form-floating my-1"> <div class="form-floating my-1">
<input class="form-control" <input class="form-control"
type="text" type="text"
@ -35,8 +35,8 @@
<label for="flat">{{ $t('flat') }}</label> <label for="flat">{{ $t('flat') }}</label>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
<div class="form-floating my-1"> <div class="form-floating my-1" v-if="!isNoAddress">
<input class="form-control" <input class="form-control"
type="text" type="text"
name="buildingName" name="buildingName"
@ -54,7 +54,7 @@
v-model="extra"/> v-model="extra"/>
<label for="extra">{{ $t('extra') }}</label> <label for="extra">{{ $t('extra') }}</label>
</div> </div>
<div class="form-floating my-1"> <div class="form-floating my-1" v-if="!isNoAddress">
<input class="form-control" <input class="form-control"
type="text" type="text"
name="distribution" name="distribution"
@ -70,7 +70,7 @@
<script> <script>
export default { export default {
name: "AddressMore", name: "AddressMore",
props: ['entity'], props: ['entity', 'isNoAddress'],
computed: { computed: {
floor: { floor: {
set(value) { set(value) {

5
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
View File

@ -75,8 +75,9 @@
</div> </div>
</div> </div>
<address-more v-if="!isNoAddress" <address-more
v-bind:entity="entity"> v-bind:entity="entity"
v-bind:isNoAddress="isNoAddress">
</address-more> </address-more>
<action-buttons v-if="insideModal === false" <action-buttons v-if="insideModal === false"

10
src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
View File

@ -29,6 +29,11 @@
</p> </p>
<p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p> <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
{% endif %} {% endif %}
{% if address.extra is not empty %}
<span>
{{ address.extra }}
</span>
{% endif %}
<span class="noaddress"> <span class="noaddress">
{{ 'address.consider homeless'|trans }} {{ 'address.consider homeless'|trans }}
</span> </span>
@ -89,6 +94,11 @@
<p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p> <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
</div> </div>
{% endif %} {% endif %}
{% if address.extra is not empty %}
<div>
{{ address.extra }}
</div>
{% endif %}
<div class="noaddress"> <div class="noaddress">
{{ 'address.consider homeless'|trans }} {{ 'address.consider homeless'|trans }}
</div> </div>