diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig new file mode 100644 index 000000000..4601adab1 --- /dev/null +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_view.html.twig @@ -0,0 +1,59 @@ +

{{ "Aside activity"|trans }}

+ +
+ +
{{ 'Type'|trans }}
+
{{ entity.type.title | localize_translatable_string }}
+ +
{{ 'Created by'|trans }}
+
{{ entity.createdBy }}
+ +
{{ 'Created for'|trans }}
+
{{ entity.agent }}
+ +

{{ 'Activity data'|trans }}

+ +
{{ 'Date'|trans }}
+
{{ entity.date|format_date('long') }}
+ +
{{ 'Duration'|trans }}
+
{{ entity.duration|date('H:i') }}
+ +
{{ 'Remark'|trans }}
+ {%- if entity.note is empty -%} +
+ {{ 'No comments'|trans }} +
+ {%- else -%} +
+
+
+

{{ entity.note }}

+
+
+
+ {%- endif -%} +
+ + diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig index 4553e1c6f..6df3d6958 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig @@ -1,15 +1,13 @@ -{% extends '@ChillMain/layout.html.twig' %} +{% extends "@ChillMain/layout.html.twig" %} -{% set activeRouteKey = '' %} +{% set activeRouteKey = 'chill_aside_activity_list' %} -{% block title %} -{% include('@ChillMain/CRUD/_view_title.html.twig') %} -{% endblock %} +{% block title 'Show the aside activity'|trans %} -{% block content %} -{% embed '@ChillMain/CRUD/_view_content.html.twig' %} - {% block crud_content_header %} -

{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}

- {% endblock crud_content_header %} -{% endembed %} -{% endblock %} \ No newline at end of file +{% block content -%} +
+ + {% include 'ChillAsideActivityBundle:asideActivity:_view.html.twig' %} + +
+{% endblock content %} diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index 945db8655..086ca3dc2 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml @@ -16,9 +16,7 @@ Delete: Supprimer Update: Mettre à jour Update activity: Modifier l'activité Aside activity data: Données de l'activité annexe -No reason associated: Aucun sujet There aren't any aside activities.: Aucune activité annexe enregistrée. -type_name: type de l'activité Type: Type Invisible: Invisible Optional: Optionnel @@ -157,6 +155,8 @@ days: jours #list My aside activities: Mes activités annexes Date: Date +By: Par +For: Pour Created by: Créé par Created for: Créé pour