Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

[bugfix][activity form] check the presence of location / social issues /

Browse Source 
persons fields
This commit is contained in:
Julien Fastré 2021-11-29 21:57:29 +01:00
parent 4854f40648
commit 55b9242690
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
View File

@ -1,18 +1,18 @@
<template> <template>
<span class="inline-choice"> <span class="inline-choice">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" <input class="form-check-input"
type="checkbox" type="checkbox"
v-model="selected" v-model="selected"
name="issue" name="issue"
v-bind:id="issue.id" v-bind:id="issue.id"
v-bind:value="issue" v-bind:value="issue"
/> />
<label class="form-check-label" v-bind:for="issue.id"> <label class="form-check-label" v-bind:for="issue.id">
{{ issue.text }} <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
</label> </label>
</div> </div>
</span> </span>
</template> </template>
@ -34,3 +34,15 @@ export default {
} }
} }
</script> </script>
<style lang="scss" scoped>
@import 'ChillMainAssets/module/bootstrap/shared';
@import 'ChillPersonAssets/chill/scss/mixins';
@import 'ChillMainAssets/chill/scss/chill_variables';
span.badge {
@include badge_social($social-issue-color);
font-size: 95%;
margin-bottom: 5px;
margin-right: 1em;
}
</style>

9
src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
View File

@ -29,7 +29,7 @@
{{ form_row(form.socialActions) }} {{ form_row(form.socialActions) }}
{% endif %} {% endif %}
{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%} {%- if form.socialIssues is defined or form.socialIssues is defined -%}
<div id="social-issues-acc"></div> <div id="social-issues-acc"></div>
{% endif %} {% endif %}
@ -37,7 +37,8 @@
{{ form_row(form.reasons) }} {{ form_row(form.reasons) }}
{% endif %} {% endif %}
{%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%} {%- if form.persons is defined or form.thirdParties is defined or form.users is defined -%}
<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2> <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
{%- if form.persons is defined -%} {%- if form.persons is defined -%}
@ -49,7 +50,9 @@
{%- if form.users is defined -%} {%- if form.users is defined -%}
{{ form_widget(form.users) }} {{ form_widget(form.users) }}
{% endif %} {% endif %}
<div id="add-persons"></div>
<div id="add-persons"></div>
{% endif %} {% endif %}
<h2 class="chill-red">{{ 'Activity data'|trans }}</h2> <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>