mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 05:44:24 +00:00
accourse: add warning alert box in each bloc with minimum confirm conditions
This commit is contained in:
parent
4de106ec30
commit
349a0e69f1
@ -87,8 +87,8 @@ export default {
|
|||||||
}
|
}
|
||||||
padding: 0em 0em;
|
padding: 0em 0em;
|
||||||
margin: 1em 0;
|
margin: 1em 0;
|
||||||
border: 1px dotted tint-color($chill-accourse-context, 10%);
|
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
border: 1px dotted tint-color($chill-accourse-context, 10%);
|
||||||
border-left: 1px dotted tint-color($chill-accourse-context, 10%);
|
border-left: 1px dotted tint-color($chill-accourse-context, 10%);
|
||||||
border-right: 1px dotted tint-color($chill-accourse-context, 10%);
|
border-right: 1px dotted tint-color($chill-accourse-context, 10%);
|
||||||
dd {
|
dd {
|
||||||
@ -96,10 +96,15 @@ export default {
|
|||||||
}
|
}
|
||||||
& > div {
|
& > div {
|
||||||
margin: 1em 3em 0;
|
margin: 1em 3em 0;
|
||||||
|
|
||||||
&.flex-table,
|
&.flex-table,
|
||||||
&.flex-bloc {
|
&.flex-bloc {
|
||||||
margin: 1em 0 0;
|
margin: 1em 0 0;
|
||||||
}
|
}
|
||||||
|
&.alert.to-confirm {
|
||||||
|
margin: 1em 0 0;
|
||||||
|
padding: 1em 3em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
div.flex-table {
|
div.flex-table {
|
||||||
|
@ -91,7 +91,7 @@ export default {
|
|||||||
},
|
},
|
||||||
scopes: {
|
scopes: {
|
||||||
msg: 'confirm.set_a_scope',
|
msg: 'confirm.set_a_scope',
|
||||||
anchor: '#section-65'
|
anchor: '#section-60'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,11 +55,15 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!isLocationValid" class="alert alert-warning to-confirm">
|
||||||
|
{{ $t('courselocation.not_valid') }}
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState } from "vuex";
|
import {mapGetters, mapState} from "vuex";
|
||||||
import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
|
import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress.vue';
|
||||||
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
|
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
|
||||||
|
|
||||||
@ -102,6 +106,9 @@ export default {
|
|||||||
accompanyingCourse: state => state.accompanyingCourse,
|
accompanyingCourse: state => state.accompanyingCourse,
|
||||||
context: state => state.addressContext
|
context: state => state.addressContext
|
||||||
}),
|
}),
|
||||||
|
...mapGetters([
|
||||||
|
'isLocationValid'
|
||||||
|
]),
|
||||||
isTemporaryAddress() {
|
isTemporaryAddress() {
|
||||||
return this.accompanyingCourse.locationStatus === 'address';
|
return this.accompanyingCourse.locationStatus === 'address';
|
||||||
},
|
},
|
||||||
|
@ -58,11 +58,14 @@
|
|||||||
</add-persons>
|
</add-persons>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!isParticipationValid" class="alert alert-warning to-confirm">
|
||||||
|
{{ $t('persons_associated.participation_not_valid') }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState } from 'vuex';
|
import {mapGetters, mapState} from 'vuex';
|
||||||
import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue"
|
import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue"
|
||||||
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
|
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'
|
||||||
|
|
||||||
@ -89,6 +92,9 @@ export default {
|
|||||||
courseId: state => state.accompanyingCourse.id,
|
courseId: state => state.accompanyingCourse.id,
|
||||||
participations: state => state.accompanyingCourse.participations
|
participations: state => state.accompanyingCourse.participations
|
||||||
}),
|
}),
|
||||||
|
...mapGetters([
|
||||||
|
'isParticipationValid'
|
||||||
|
]),
|
||||||
currentParticipations() {
|
currentParticipations() {
|
||||||
return this.participations.filter(p => p.endDate === null)
|
return this.participations.filter(p => p.endDate === null)
|
||||||
},
|
},
|
||||||
@ -126,7 +132,7 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
div#accompanying-course {
|
div#accompanying-course {
|
||||||
div.vue-component {
|
div.vue-component {
|
||||||
& > div.alert {
|
& > div.alert.no-household {
|
||||||
margin: 0 0 -1em;
|
margin: 0 0 -1em;
|
||||||
}
|
}
|
||||||
div.no-household {
|
div.no-household {
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!isScopeValid" class="alert alert-warning separator">
|
<div v-if="!isScopeValid" class="alert alert-warning to-confirm">
|
||||||
{{ $t('scopes.add_at_least_one') }}
|
{{ $t('scopes.add_at_least_one') }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -21,13 +21,17 @@
|
|||||||
</VueMultiselect>
|
</VueMultiselect>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!isSocialIssueValid" class="alert alert-warning to-confirm">
|
||||||
|
{{ $t('social_issue.not_valid') }}
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import VueMultiselect from 'vue-multiselect';
|
import VueMultiselect from 'vue-multiselect';
|
||||||
import { getSocialIssues } from '../api';
|
import { getSocialIssues } from '../api';
|
||||||
import { mapState } from 'vuex';
|
import {mapGetters, mapState} from 'vuex';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "SocialIssue",
|
name: "SocialIssue",
|
||||||
@ -41,6 +45,9 @@ export default {
|
|||||||
...mapState({
|
...mapState({
|
||||||
value: state => state.accompanyingCourse.socialIssues,
|
value: state => state.accompanyingCourse.socialIssues,
|
||||||
}),
|
}),
|
||||||
|
...mapGetters([
|
||||||
|
'isSocialIssueValid'
|
||||||
|
])
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getOptions();
|
this.getOptions();
|
||||||
|
@ -50,6 +50,7 @@ const appMessages = {
|
|||||||
show_household: "Voir le ménage",
|
show_household: "Voir le ménage",
|
||||||
person_without_household_warning: "Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.",
|
person_without_household_warning: "Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.",
|
||||||
update_household: "Modifier l'appartenance",
|
update_household: "Modifier l'appartenance",
|
||||||
|
participation_not_valid: "Sélectionnez ou créez au minimum 1 usager",
|
||||||
},
|
},
|
||||||
requestor: {
|
requestor: {
|
||||||
title: "Demandeur",
|
title: "Demandeur",
|
||||||
@ -72,6 +73,7 @@ const appMessages = {
|
|||||||
social_issue: {
|
social_issue: {
|
||||||
title: "Problématiques sociales",
|
title: "Problématiques sociales",
|
||||||
label: "Choisir les problématiques sociales",
|
label: "Choisir les problématiques sociales",
|
||||||
|
not_valid: "Sélectionnez au minimum une problématique sociale",
|
||||||
},
|
},
|
||||||
courselocation: {
|
courselocation: {
|
||||||
title: "Localisation du parcours",
|
title: "Localisation du parcours",
|
||||||
@ -84,6 +86,7 @@ const appMessages = {
|
|||||||
sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
|
sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?",
|
||||||
ok: "Désigner comme adresse du parcours",
|
ok: "Désigner comme adresse du parcours",
|
||||||
person_locator: "Parcours localisé auprès de {0}",
|
person_locator: "Parcours localisé auprès de {0}",
|
||||||
|
not_valid: "Indiquez au minimum une localisation temporaire du parcours",
|
||||||
no_address: "Il n'y a pas d'adresse associée au parcours"
|
no_address: "Il n'y a pas d'adresse associée au parcours"
|
||||||
},
|
},
|
||||||
scopes: {
|
scopes: {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user