From 965f367dfc241eb16350672dca54dfdcc98367d4 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 10 May 2022 21:20:37 +0200 Subject: [PATCH 1/2] add templates --- .../ExpenseReportAdminController.php | 1 + .../admin/expense_report/_show.html.twig | 232 +++++++++--------- 2 files changed, 120 insertions(+), 113 deletions(-) diff --git a/src/Controller/ExpenseReportAdminController.php b/src/Controller/ExpenseReportAdminController.php index 20009b8..8175e75 100644 --- a/src/Controller/ExpenseReportAdminController.php +++ b/src/Controller/ExpenseReportAdminController.php @@ -318,6 +318,7 @@ class ExpenseReportAdminController extends CrudController ->setView('form', 'admin/expense_report/_form.html.twig') ->setView('show_entity', 'admin/expense_report/_show.html.twig') ->setView('edit', 'admin/expense_report/edit.html.twig') + ->setView('show', 'admin/expense_report/show.html.twig') ->setForm('edit', Type::class, []) ->setForm('new', Type::class) diff --git a/templates/admin/expense_report/_show.html.twig b/templates/admin/expense_report/_show.html.twig index f1b81e4..3b4b056 100644 --- a/templates/admin/expense_report/_show.html.twig +++ b/templates/admin/expense_report/_show.html.twig @@ -1,117 +1,123 @@ -{% set total = 0 %} +
+
+
+
+ {% if entity.moves|length %} +
+ + + + + + + + + + + + + -{% if entity.moves|length %} -
-
DateÉvènementTrajetDistanceAller-retourPéage(s)Parkink(s)Montant TTC
- - - - - - - - - - - - - - {% for item in entity.moves %} - - - - - - - - - - - {% endfor %} -
DateÉvènementTrajetDistanceAller-retourPéage(s)Parkink(s)Montant TTC
- {{ item.date|date('d/m/Y') }} - - {{ item.event }} - - {{ item.addressFrom }}
- {{ item.addressTo }} - 		- {{ item.distance }}Km - - {{ item.isRoundTrip ? 'oui' : 'non' }} - - {{ item.highwayPay > 0 ? (item.highwayPay|number_format(2, ',') ~ '€') : '-' }} - - {{ item.parkingPay > 0 ? (item.parkingPay|number_format(2, ',') ~ '€') : '-' }} - - {{ entity.totalAmount('move', item)|number_format(2, ',') }}€ -
-
-{% endif %} - -{% if entity.moves|length %} -
- - - - - - - - - - {% for item in entity.variousPayments %} - - - - - - {% endfor %} -
DateLibelléMontant TTC
- {{ item.date|date('d/m/Y') }} - - {{ item.label }} - - {{ entity.totalAmount('various_payment', item)|number_format(2, ',') }}€ -
-
-{% endif %} - -
- - - - - - - + + + + + + + + + + {% endfor %} +
- Facture(s) - Total {{ entity.totalAmount|number_format(2, ',') }}€
- {% for item in entity.bills %} -
- {{ item|split('/')|last }} + {% for item in entity.moves %} +
+ {{ item.date|date('d/m/Y') }} + + {{ item.event }} + + {{ item.addressFrom }}
+ {{ item.addressTo }} + 		+ {{ item.distance }}Km + + {{ item.isRoundTrip ? 'oui' : 'non' }} + + {{ item.highwayPay > 0 ? (item.highwayPay|number_format(2, ',') ~ '€') : '-' }} + + {{ item.parkingPay > 0 ? (item.parkingPay|number_format(2, ',') ~ '€') : '-' }} + + {{ entity.totalAmount('move', item)|number_format(2, ',') }}€ +
- {% else %} - - - {% endfor %} - - - Barème au kilomètre : {{ entity.scalePerKilometer|number_format(2, ',') }} -
-
- - {% if entity.isPaid %} - {% if entity.paidAt %} - Payée le {{ entity.paidAt|date('d/m/Y à H:i') }} - {% else %} - Payée - {% endif %} - {% elseif entity.isRequestedPayment %} - En attente de paiement - {% else %} - Brouillon {% endif %} - - - + + {% if entity.moves|length %} +
+ + + + + + + + + + {% for item in entity.variousPayments %} + + + + + + {% endfor %} +
DateLibelléMontant TTC
+ {{ item.date|date('d/m/Y') }} + + {{ item.label }} + + {{ entity.totalAmount('various_payment', item)|number_format(2, ',') }}€ +
+
+ {% endif %} + +
+ + + + + + + + + +
+ Facture(s) + Total {{ entity.totalAmount|number_format(2, ',') }}€
+ {% for item in entity.bills %} +
+ {{ item|split('/')|last }} +
+ {% else %} + - + {% endfor %} + 		+ Barème au kilomètre : {{ entity.scalePerKilometer|number_format(2, ',') }} +
+
+ + {% if entity.isPaid %} + {% if entity.paidAt %} + Payée le {{ entity.paidAt|date('d/m/Y à H:i') }} + {% else %} + Payée + {% endif %} + {% elseif entity.isRequestedPayment %} + En attente de paiement + {% else %} + Brouillon + {% endif %} +
+
+
+
+
From 22c574fe3a5622587e4829f11f310a7434a7d0a7 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 10 May 2022 21:20:40 +0200 Subject: [PATCH 2/2] add templates --- templates/admin/expense_report/show.html.twig | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 templates/admin/expense_report/show.html.twig diff --git a/templates/admin/expense_report/show.html.twig b/templates/admin/expense_report/show.html.twig new file mode 100644 index 0000000..58c1609 --- /dev/null +++ b/templates/admin/expense_report/show.html.twig @@ -0,0 +1,3 @@ +{% extends '@Core/admin/crud/show.html.twig' %} + +{% block body_class %}has-form{% endblock %}