From be38251a13d0a336f2eedb04c88877141fa5b1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Nov 2022 19:59:43 +0100
Subject: [PATCH] Feature: [saved export] Switch between list of export and
 saved export thanks to nav at the list's top

---
 .../Resources/views/Export/_navbar.html.twig  | 12 ++++
 .../Resources/views/Export/layout.html.twig   | 42 ++++++++-----
 .../views/SavedExport/index.html.twig         | 59 ++++++++++++-------
 .../translations/messages.fr.yml              |  3 +-
 4 files changed, 78 insertions(+), 38 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig
new file mode 100644
index 000000000..a7d7216b4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig
@@ -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>
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
index 9cf53993d..5ce433535 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
@@ -22,9 +22,11 @@
 
 
 {% block content %}
+
+    {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'common'}) }}
+
     <div class="col-md-10">
-        <h1>{{ 'Exports list'|trans }}</h1>
-        
+
         <div class="container mt-4">
             
             {% for group, exports in grouped_exports %}{%  if group != '_' %}
@@ -32,13 +34,17 @@
                 <div class="row grouped">
                     {% for export_alias, export in exports %}
                     <div class="col-6 col-md-4 mb-3">
-                        <h2>{{ export.title|trans }}</h2>
-                        <p>{{ export.description|trans }}</p>
-                        <p>
-                            <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                                {{ 'Create an export'|trans }}
-                            </a>
-                        </p>
+                        <div class="card">
+                            <div class="card-body">
+                                <h2 class="card-title">{{ export.title|trans }}</h2>
+                                <p class="card-text">{{ export.description|trans }}</p>
+                                <p>
+                                    <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                                        {{ 'Create an export'|trans }}
+                                    </a>
+                                </p>
+                            </div>
+                        </div>
                     </div>
                     {% endfor %}
                 </div>
@@ -52,13 +58,17 @@
             {% for export_alias,export in grouped_exports['_'] %}
                 
                 <div class="col-6 col-md-4 mb-3">
-                    <h2>{{ export.title|trans }}</h2>
-                    <p>{{ export.description|trans }}</p>
-                    <p>
-                        <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                            {{ 'Create an export'|trans }}
-                        </a>
-                    </p>
+                    <div class="card">
+                        <div class="card-body">
+                            <h2 class="card-title">{{ export.title|trans }}</h2>
+                            <p class="card-text">{{ export.description|trans }}</p>
+                            <p>
+                                <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                                    {{ 'Create an export'|trans }}
+                                </a>
+                            </p>
+                        </div>
+                    </div>
                 </div>
                 
             {% endfor %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
index bfe377f6c..17792ecd2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
@@ -4,7 +4,8 @@
 
 {% block content %}
     <div class="col-md-10">
-        <h1>{{ block('title') }}</h1>
+
+        {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }}
 
         <div class="container mt-4">
 
@@ -18,17 +19,25 @@
                     <div class="row grouped">
                         {% for s in saveds %}
                             <div class="col-6 col-md-4 mb-3">
-                                <h2>{{ s.saved.title }}</h2>
-                                <p><strong>{{ s.export.title|trans }}</strong></p>
-                                <div>
-                                    {{ s.saved.description|chill_markdown_to_html }}
-                                </div>
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h2 class="card-title">{{ s.saved.title }}</h2>
+                                        <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
 
-                                <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 class="card-text">
+                                            {{ s.saved.description|chill_markdown_to_html }}
+                                        </div>
+
+                                        <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>
                         {% endfor %}
                     </div>
@@ -44,17 +53,25 @@
                     {% 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>
-                                <p>{{ s.export.title|trans }}</p>
-                                <div>
-                                    {{ s.saved.description|chill_markdown_to_html }}
-                                </div>
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h2 class="card-title">{{ s.saved.title }}</h2>
+                                        <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
 
-                                <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 class="card-text">
+                                            {{ s.saved.description|chill_markdown_to_html }}
+                                        </div>
+
+                                        <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 %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 1100d8ee3..58b3e976e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -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 ?
     My saved exports: Mes rapports enregistrés
     Export is deleted: Le rapport est supprimé
-    Saved export is saved!: Le rapport est enregistré
\ No newline at end of file
+    Saved export is saved!: Le rapport est enregistré
+    Created on %date%: Créé le %date%
\ No newline at end of file