Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Feature: [saved export] Switch between list of export and saved export thanks to nav at the list's top

Browse Source
This commit is contained in:
Julien Fastré 2022-11-08 19:59:43 +01:00
parent 43791badd5
commit be38251a13
4 changed files with 78 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig Normal file
View File

@ -0,0 +1,12 @@
<ul class="nav nav-pills justify-content-center">
<li class="nav-item">
<a href="{{ chill_path_forward_return_path('chill_main_export_index') }}" class="nav-link {% if current == 'common' %}active{% endif %}">
{{ 'Exports list'|trans }}
</a>
</li>
<li class="nav-item">
<a href="{{ chill_path_forward_return_path('chill_main_export_saved_list_my') }}" class="nav-link {% if current == 'my' %}active{% endif %}">
{{ 'saved_export.My saved exports'|trans }}
</a>
</li>
</ul>

42
src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
View File

@ -22,9 +22,11 @@
{% block content %} {% block content %}
{{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'common'}) }}
<div class="col-md-10"> <div class="col-md-10">
<h1>{{ 'Exports list'|trans }}</h1>
<div class="container mt-4"> <div class="container mt-4">
{% for group, exports in grouped_exports %}{% if group != '_' %} {% for group, exports in grouped_exports %}{% if group != '_' %}
@ -32,13 +34,17 @@
<div class="row grouped"> <div class="row grouped">
{% for export_alias, export in exports %} {% for export_alias, export in exports %}
<div class="col-6 col-md-4 mb-3"> <div class="col-6 col-md-4 mb-3">
<h2>{{ export.title|trans }}</h2> <div class="card">
<p>{{ export.description|trans }}</p> <div class="card-body">
<p> <h2 class="card-title">{{ export.title|trans }}</h2>
<a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}"> <p class="card-text">{{ export.description|trans }}</p>
{{ 'Create an export'|trans }} <p>
</a> <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
</p> {{ 'Create an export'|trans }}
</a>
</p>
</div>
</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
@ -52,13 +58,17 @@
{% for export_alias,export in grouped_exports['_'] %} {% for export_alias,export in grouped_exports['_'] %}
<div class="col-6 col-md-4 mb-3"> <div class="col-6 col-md-4 mb-3">
<h2>{{ export.title|trans }}</h2> <div class="card">
<p>{{ export.description|trans }}</p> <div class="card-body">
<p> <h2 class="card-title">{{ export.title|trans }}</h2>
<a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}"> <p class="card-text">{{ export.description|trans }}</p>
{{ 'Create an export'|trans }} <p>
</a> <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
</p> {{ 'Create an export'|trans }}
</a>
</p>
</div>
</div>
</div> </div>
{% endfor %} {% endfor %}

59
src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
View File

@ -4,7 +4,8 @@
{% block content %} {% block content %}
<div class="col-md-10"> <div class="col-md-10">
<h1>{{ block('title') }}</h1>
{{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }}
<div class="container mt-4"> <div class="container mt-4">
@ -18,17 +19,25 @@
<div class="row grouped"> <div class="row grouped">
{% for s in saveds %} {% for s in saveds %}
<div class="col-6 col-md-4 mb-3"> <div class="col-6 col-md-4 mb-3">
<h2>{{ s.saved.title }}</h2> <div class="card">
<p><strong>{{ s.export.title|trans }}</strong></p> <div class="card-body">
<div> <h2 class="card-title">{{ s.saved.title }}</h2>
{{ s.saved.description|chill_markdown_to_html }} <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
</div>
<ul class="record_actions"> <div class="card-text">
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li> {{ s.saved.description|chill_markdown_to_html }}
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li> </div>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
</ul> <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
<ul class="record_actions">
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
</ul>
</div>
</div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
@ -44,17 +53,25 @@
{% for s in saveds %} {% for s in saveds %}
<div class="col-6 col-md-4 mb-3"> <div class="col-6 col-md-4 mb-3">
<div class="col-6 col-md-4 mb-3"> <div class="col-6 col-md-4 mb-3">
<h2>{{ s.saved.title }}</h2> <div class="card">
<p>{{ s.export.title|trans }}</p> <div class="card-body">
<div> <h2 class="card-title">{{ s.saved.title }}</h2>
{{ s.saved.description|chill_markdown_to_html }} <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
</div>
<ul class="record_actions"> <div class="card-text">
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li> {{ s.saved.description|chill_markdown_to_html }}
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li> </div>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
</ul> <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
<ul class="record_actions">
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
</ul>
</div>
</div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

3
src/Bundle/ChillMainBundle/translations/messages.fr.yml
View File

@ -565,4 +565,5 @@ saved_export:
Are you sure you want to delete this saved ?: Êtes-vous sûr·e de vouloir supprimer ce rapport ? Are you sure you want to delete this saved ?: Êtes-vous sûr·e de vouloir supprimer ce rapport ?
My saved exports: Mes rapports enregistrés My saved exports: Mes rapports enregistrés
Export is deleted: Le rapport est supprimé Export is deleted: Le rapport est supprimé
Saved export is saved!: Le rapport est enregistré Saved export is saved!: Le rapport est enregistré
Created on %date%: Créé le %date%