Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

set correct layout to accompanying period crud

Browse Source
This commit is contained in:
Julien Fastré 2015-10-12 21:31:01 +02:00
parent 4e00af3e48
commit 772499ce89
5 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Entity/AccompanyingPeriod.php
View File

@ -200,7 +200,7 @@ class AccompanyingPeriod
if (! $this->isClosingAfterOpening()) { if (! $this->isClosingAfterOpening()) {
$context->addViolationAt('dateClosing', $context->addViolationAt('dateClosing',
'validation.AccompanyingPeriod.constraint.dateOfClosing_before_dateOfOpening', 'The date of closing is before the date of opening',
array(), null); array(), null);
} }
} }

6
Resources/translations/messages.fr.yml
View File

@ -62,7 +62,7 @@ Reset: 'Remise à zéro'
'Person accompanying period - %name%': 'Historique du dossier - %name%' 'Person accompanying period - %name%': 'Historique du dossier - %name%'
'Opening date': 'Date d''ouverture' 'Opening date': 'Date d''ouverture'
'Closing date': 'Date de fermeture' 'Closing date': 'Date de fermeture'
'Still open': 'Toujours en cours' 'Period opened': 'Période ouverte'
'Close accompanying period': 'Clôre le dossier' 'Close accompanying period': 'Clôre le dossier'
'Open accompanying period': 'Ouvrir le dossier' 'Open accompanying period': 'Ouvrir le dossier'
'Create accompanying period': 'Nouvelle ouverture-fermeture à une autre date' 'Create accompanying period': 'Nouvelle ouverture-fermeture à une autre date'
@ -78,3 +78,7 @@ Accompanying period list: Périodes d'accompagnement
CHILL_PERSON_SEE: Voir les personnes CHILL_PERSON_SEE: Voir les personnes
CHILL_PERSON_UPDATE: Modifier les personnes CHILL_PERSON_UPDATE: Modifier les personnes
CHILL_PERSON_CREATE: Ajouter des personnes CHILL_PERSON_CREATE: Ajouter des personnes
#period
Period closed!: Période clôturée!
Pediod closing form is not valide: Le formulaire de fermeture n'est pas valide

1
Resources/translations/validators.fr.yml
View File

@ -10,3 +10,4 @@
'Opening date can not be null': 'La date d''ouverure ne peut être nulle' 'Opening date can not be null': 'La date d''ouverure ne peut être nulle'
'Closing date is not valid': 'La date de fermeture n''est pas valide' 'Closing date is not valid': 'La date de fermeture n''est pas valide'
'Closing date can not be null': 'La date de fermeture ne peut être nulle' 'Closing date can not be null': 'La date de fermeture ne peut être nulle'
The date of closing is before the date of opening: La période de fermeture est après la période d'ouverture

5
Resources/views/AccompanyingPeriod/form.html.twig
View File

@ -24,8 +24,9 @@
{{ form_rest(form) }} {{ form_rest(form) }}
<div class="medium btn danger icon-right entypo icon-lock"> <div class="">
<button type="submit">{{ 'Submit'|trans }}</button> <button type="submit" class="sc-button bt-update">{{ 'Submit'|trans }}</button>
<a href="{{ path('chill_person_accompanying_period_list', { 'person_id' : person.id } ) }}" class="sc-button bt-reset">{{ 'Back to the list'|trans }}</a>
</div> </div>
{{ form_end(form) }} {{ form_end(form) }}

41
Resources/views/AccompanyingPeriod/list.html.twig
View File

@ -21,7 +21,7 @@
<td>{{ accompanying_period.openingDate|localizeddate('long', 'none', app.request.locale) }}</td> <td>{{ accompanying_period.openingDate|localizeddate('long', 'none', app.request.locale) }}</td>
<td>{% spaceless %} <td>{% spaceless %}
{% if accompanying_period.isOpen %} {% if accompanying_period.isOpen %}
{{ 'Still open'|trans }} {{ 'Period opened'|trans }}
{% else %} {% else %}
{{ accompanying_period.closingDate|localizeddate('long', 'none', app.request.locale) }} {{ accompanying_period.closingDate|localizeddate('long', 'none', app.request.locale) }}
{% endif %} {% endif %}
@ -31,7 +31,7 @@
</td> </td>
<td> <td>
<div class="small warning btn icon-right entypo icon-pencil"> <div class="small warning btn icon-right entypo icon-pencil">
<a href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}">{{ 'Edit'|trans }}</a> <a href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-update">{{ 'Edit'|trans }}</a>
</div> </div>
</td> </td>
</tr> </tr>
@ -40,32 +40,21 @@
</table> </table>
<div class="form_control"> <div class="form_control">
<div class="btn small warning icon-right entypo icon-plus"> <p>
<a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}"> <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="sc-button bt-create">
{{ 'Create accompanying period'|trans }} {{ 'Create accompanying period'|trans }}
</a> </a>
</div>
{% if person.isOpen == true %}
<div class="controls"> <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="sc-button bt-update">
<div class="btn medium danger icon-right entypo {% spaceless %} {{'Close accompanying period'|trans }}
{% if person.isOpen == true %} </a>
icon-lock {% else %}
{% else %} <a href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}" class="sc-button bt-create">
icon-lock-open {{'Open accompanying period'|trans }}
{% endif %}{% endspaceless %}"> </a>
{% spaceless %} {% endif %}
{% if person.isOpen == true %} </p>
<a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}">
{{'Close accompanying period'|trans }}
</a>
{% else %}
<a href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}">
{{'Open accompanying period'|trans }}
</a>
{% endif %}
{% endspaceless %}
</div>
</div>
</div> </div>
{% endblock personcontent %} {% endblock personcontent %}