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: change fields order in form

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-05-27 13:27:40 +02:00
parent 0a5d20b16f
commit 52ee8c5a9a
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillActivityBundle/Form/ActivityType.php
View File

@ -115,6 +115,7 @@ class ActivityType extends AbstractType
$builder->add('attendee', EntityType::class, [ $builder->add('attendee', EntityType::class, [
'label' => $activityType->getLabel('attendee'), 'label' => $activityType->getLabel('attendee'),
'required' => $activityType->isRequired('attendee'), 'required' => $activityType->isRequired('attendee'),
'expanded' => true,
'class' => ActivityPresence::class, 'class' => ActivityPresence::class,
'choice_label' => function (ActivityPresence $activityPresence) { 'choice_label' => function (ActivityPresence $activityPresence) {
return $this->translatableStringHelper->localize($activityPresence->getName()); return $this->translatableStringHelper->localize($activityPresence->getName());

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

@ -3,6 +3,15 @@
{{ form_start(form) }} {{ form_start(form) }}
{{ form_errors(form) }} {{ form_errors(form) }}
{%- if form.emergency is defined -%}
{{ form_row(form.emergency) }}
{% endif %}
{%- if form.sentReceived is defined -%}
{{ form_row(form.sentReceived) }}
{% endif %}
{%- if form.user is defined -%} {%- if form.user is defined -%}
{{ form_row(form.user) }} {{ form_row(form.user) }}
{% endif %} {% endif %}
@ -11,26 +20,14 @@
{{ form_row(form.scope) }} {{ form_row(form.scope) }}
{% endif %} {% endif %}
<h2 class="chill-red">{{ 'Activity data'|trans }}</h2> type..
{%- if form.date is defined -%} {%- if form.reasons is defined -%}
{{ form_row(form.date) }}
{% endif %}
{%- if form.durationTime is defined -%}
{{ form_row(form.durationTime) }}
{% endif %}
{%- if form.travelTime is defined -%}
{{ form_row(form.travelTime) }}
{% endif %}
{%- if form.attendee is defined -%}
{{ form_row(form.attendee) }}
{% endif %}
{%- if form.comment is defined -%}
{{ form_row(form.comment) }}
{% endif %}
{%- if form.reasons is defined -%}
{{ form_row(form.reasons) }} {{ form_row(form.reasons) }}
{% endif %} {% endif %}
<h2 class="chill-red">Parties concernées</h2>
{%- if form.persons is defined -%} {%- if form.persons is defined -%}
{{ form_row(form.persons) }} {{ form_row(form.persons) }}
{% endif %} {% endif %}
@ -40,17 +37,38 @@
{%- if form.users is defined -%} {%- if form.users is defined -%}
{{ form_row(form.users) }} {{ form_row(form.users) }}
{% endif %} {% endif %}
{%- if form.emergency is defined -%}
{{ form_row(form.emergency) }} <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
{%- if form.date is defined -%}
{{ form_row(form.date) }}
{% endif %} {% endif %}
{%- if form.sentReceived is defined -%}
{{ form_row(form.sentReceived) }} .. location
{%- if form.durationTime is defined -%}
{{ form_row(form.durationTime) }}
{% endif %}
{%- if form.travelTime is defined -%}
{{ form_row(form.travelTime) }}
{% endif %}
{%- if form.comment is defined -%}
.. public and private
{{ form_row(form.comment) }}
{% endif %} {% endif %}
{%- if form.documents is defined -%} {%- if form.documents is defined -%}
{{ form_row(form.documents) }} {{ form_row(form.documents) }}
{% endif %} {% endif %}
{%- if form.attendee is defined -%}
{{ form_row(form.attendee) }}
{% endif %}
.. status
<div class="grid-12 centered sticky-form-buttons"> <div class="grid-12 centered sticky-form-buttons">
<button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button> <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
</div> </div>