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

activity: add user current location as default for a new activity

Browse Source
This commit is contained in:
nobohan 2021-11-17 15:21:53 +01:00
parent cd4de2e244
commit 63e5220084
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
View File

@ -55,16 +55,17 @@ export default {
}
},
mounted() {
this.getLocationsList();
getLocations().then(response => new Promise(resolve => {
console.log('getLocations', response);
this.locations = response.results;
if (window.default_location_id) {
let location = this.locations.filter(l => l.id === window.default_location_id);
this.$store.dispatch('updateLocation', location);
}
resolve();
}))
},
methods: {
getLocationsList() {
getLocations().then(response => new Promise(resolve => {
console.log('getLocations', response);
this.locations = response.results;
resolve();
}))
},
customLabel(value) {
return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
}

1
src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
View File

@ -22,6 +22,7 @@
'{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
});
window.activity = {{ activity_json|json_encode|raw }};
window.default_location_id = {{ default_location_id }};
</script>
{{ encore_entry_script_tags('vue_activity') }}
{% endblock %}

2
src/Bundle/ChillMainBundle/Form/UserCurrentLocationType.php
View File

@ -29,7 +29,7 @@ class UserCurrentLocationType extends AbstractType
'class' => Location::class,
'choice_label' => function (Location $entity) {
return $entity->getName() ?
$entity->getName() :
$entity->getLocationType()->getTitle()['fr'] . ' ' . $entity->getName() :
//$this->translatableStringHelper->localize($entity->getLocationType()->getTitle()); //TODO does not work
$entity->getLocationType()->getTitle()['fr'];
},