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

manage validFrom date, wip (patchAddress return 500)

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-08 21:56:48 +02:00
parent 21957846b0
commit f6a02e157d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@
v-bind:options="this.options" v-bind:options="this.options"
v-bind:default="this.default" v-bind:default="this.default"
v-bind:entity="this.entity" v-bind:entity="this.entity"
v-bind:valid="this.valid"
v-bind:flag="this.flag" v-bind:flag="this.flag"
ref="showAddress"> ref="showAddress">
</show-address> </show-address>
@ -54,6 +55,7 @@
v-bind:options="this.options" v-bind:options="this.options"
v-bind:default="this.default" v-bind:default="this.default"
v-bind:entity="this.entity" v-bind:entity="this.entity"
v-bind:valid="this.valid"
v-bind:flag="this.flag" v-bind:flag="this.flag"
ref="showAddress" ref="showAddress"
v-bind:insideModal="false" @openEditPane="openEditPane" v-bind:insideModal="false" @openEditPane="openEditPane"
@ -181,7 +183,7 @@ export default {
}, },
}, },
valid: { valid: {
from: null, from: new Date(),
to: null to: null
}, },
errorMsg: [] errorMsg: []
@ -506,7 +508,7 @@ export default {
addressId: this.entity.address.address_id, addressId: this.entity.address.address_id,
body: { body: {
validFrom: { validFrom: {
datetime: `${this.$refs.showAddress.validFrom}T00:00:00+0100` datetime: this.valid.from.toISOString().split('T')[0]
} }
}, },
backUrl: this.context.backUrl backUrl: this.context.backUrl

15
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue
View File

@ -100,6 +100,7 @@
</template> </template>
<script> <script>
import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
export default { export default {
name: 'ShowAddress', name: 'ShowAddress',
@ -109,10 +110,11 @@ export default {
'default', 'default',
'flag', 'flag',
'entity', 'entity',
'valid',
'errorMsg', 'errorMsg',
'insideModal' 'insideModal'
], ],
emits: ['openEditPane', 'submitAddress', 'validFrom'], emits: ['openEditPane', 'submitAddress'], //?
computed: { computed: {
address() { address() {
return this.entity.address; return this.entity.address;
@ -129,8 +131,15 @@ export default {
getSubmited() { getSubmited() {
return this.entity.address; return this.entity.address;
}, },
validFrom() { validFrom: {
return new Date().toISOString().split('T')[0]; set(value) {
this.valid.from = ISOToDate(value);
//new Date().toISOString().split('T')[0];
},
get() {
return dateToISO(this.valid.from);
}
}, },
getValidFromDateText() { getValidFromDateText() {
return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom'; return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';