templates added and adapted for delete, list en view of aside activity

This commit is contained in:
Julie Lenaerts 2021-08-12 11:53:04 +02:00
parent 8829d234ec
commit a6001c195a
6 changed files with 68 additions and 22 deletions

View File

@ -200,4 +200,10 @@ final class AsideActivity implements TrackUpdateInterface, TrackCreationInterfac
return $this;
}
// public function __toString()
// {
// // dump($this->type->getTitle());
// return $this->type->getTitle();
// }
}

View File

@ -1,9 +1,9 @@
<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
{% block crud_content_header %}
<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</h1>
<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
{% endblock crud_content_header %}
<p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': entity|chill_entity_render_string }) }}</p>
<p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</p>
{{ form_start(form) }}

View File

@ -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' %}

View File

@ -1,6 +1,7 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends "@ChillMain/layout.html.twig" %}
{% block admin_content %}
{% block content %}
<div class="col-md-10 col-xxl asideactivity-list">
<h2>{{ 'My aside activities' |trans }}</h2>
{% if entities|length == 0 %}
@ -10,7 +11,7 @@
</p>
{% else %}
<div class="flex-table list-records">
<div class="flex-table my-4 list-records">
{# 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 %}
<p>{{ entity.date|format_date('long') }}</p>
{% endif %}
{#
<div class="duration">
<p>
<i class="fa fa-fw fa-hourglass-end"></i>
{{ entity.duration|date('H:i') }}
</p>
</div>
</div> #}
</div>
<div class="item-col">
@ -49,25 +50,25 @@
</div>
</div>
{%
{# {%
if entity.note is not empty
or entity.createdBy|length > 0
%}
<div class="item-row details">
{% if entity.note is not empty %}
<div class="item-col comment">
{{ entity.note|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
{{ entity.note|chill_markdown_to_html }}
</div>
{% endif %}
</div>
{% endif %}
{% endif %} #}
<div class="item-col">
<ul class="list-content">
<ul class="record_actions">
{# <li>
<a href="{{ path('chill_crud_aside_activity_show', { 'id': entity.id} ) }}" class="btn btn-show "></a>
</li> #}
<li>
<a href="{{ path('chill_crud_aside_activity_view', { 'id': entity.id} ) }}" class="btn btn-show "></a>
</li>
{# TOOD
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
#}
@ -103,5 +104,5 @@
</a>
</li>
</ul>
</div>
{% endblock %}

View File

@ -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 %}
<h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans({'%person%': person|chill_entity_render_string }) }}</h1>
<h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}</h1>
{% endblock crud_content_header %}
{% endembed %}
{% endblock %}

View File

@ -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.