diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index fda40ea1a..40d8aa6cd 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -200,4 +200,10 @@ final class AsideActivity implements TrackUpdateInterface, TrackCreationInterfac
return $this;
}
+
+ // public function __toString()
+ // {
+ // // dump($this->type->getTitle());
+ // return $this->type->getTitle();
+ // }
}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
index 85df29a9c..fdbccb838 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig
@@ -1,9 +1,9 @@
{% block crud_content_header %}
-
{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}
+
{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}
{% endblock crud_content_header %}
-
{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}
+
{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}
{{ form_start(form) }}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
index de2d28c90..9c8a1ff59 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig
@@ -1,6 +1,6 @@
{% extends '@ChillMain/layout.html.twig' %}
-{% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
+{# {% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %} #}
{% block content %}
{% embed '@ChillAsideActivity/AsideActivity/_delete.html.twig' %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
index f474dcf1b..4017a7055 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig
@@ -1,6 +1,7 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
-{% block admin_content %}
+{% block content %}
+
{{ 'My aside activities' |trans }}
{% if entities|length == 0 %}
@@ -10,7 +11,7 @@
{% else %}
-
+
{# Sort activities according to date in descending order #}
{% for entity in entities|sort ((a, b) => b.date <=> a.date) %}
{% set t = entity.type %}
@@ -29,13 +30,13 @@
{% if entity.date %}
{{ entity.date|format_date('long') }}
{% endif %}
-
+{#
{{ entity.duration|date('H:i') }}
-
+
#}
@@ -49,25 +50,25 @@
- {%
+ {# {%
if entity.note is not empty
or entity.createdBy|length > 0
%}
{% if entity.note is not empty %}
{% endif %}
- {% endif %}
+ {% endif %} #}
- {# -
-
-
#}
+ -
+
+
{# TOOD
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
#}
@@ -103,5 +104,5 @@
-
+
{% endblock %}
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 5f1d2319a..4553e1c6f 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -1,16 +1,15 @@
-{% extends '@ChillPerson/Person/layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
-{% set person = entity.person %}
{% set activeRouteKey = '' %}
{% block title %}
-{% include('@ChillPerson/CRUD/_view_title.html.twig') %}
+{% include('@ChillMain/CRUD/_view_title.html.twig') %}
{% endblock %}
-{% block personcontent %}
-{% embed '@ChillPerson/CRUD/_view_content.html.twig' %}
+{% block content %}
+{% embed '@ChillMain/CRUD/_view_content.html.twig' %}
{% block crud_content_header %}
-
{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}
+
{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}
{% endblock crud_content_header %}
{% endembed %}
{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 3746f4dda..6ddc70e6d 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -1,8 +1,42 @@
+#general
+Show the aside activity: Voir l'activité annexe
+Edit the aside activity: Modifier l'activité annexe
+Aside activity: Activité annexe
+Duration time: Durée
+durationTime: durée
+user_username: nom de l'utilisateur
+Remark: Commentaire
+No comments: Aucun commentaire
+Add a new aside activity: Ajouter une nouvelle activité annexe
+Aside activity list: Liste des activités annexes
+present: présent
+not present: absent
+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
+Required: Obligatoire
+Persons: Personnes
+Users: Utilisateurs
+Emergency: Urgent
+by: 'Par '
+location: Lieu
+
# Crud
crud:
aside_activity:
+ title_view: Détail de l'activité annexe
title_new: Nouveau activité annexe
- title_edit: Edition d'un type d'activité
+ title_edit: Edition d'une activité annexe
+ title_delete: Supprimation d'une activité annexe
+ button_delete: Supprimer
+ confirm_message_delete: Êtes-vous sûr de vouloir supprimer cet activité annexe?
aside_activity_category:
title_new: Nouvelle catégorie d'activité annexe
title_edit: Edition d'une catégorie de type d'activité
@@ -34,3 +68,9 @@ Choose a category: Choisir un categorie
My aside activities: Mes activités annexes
Date: Date
Created by: Creér par
+
+
+#Aside activity delete
+Delete aside activity: Supprimer une activité annexe
+Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité annexe qui concerne "%name%" ?
+The activity has been successfully removed.: L'activité a été supprimée.
\ No newline at end of file