From 6e1d35eda4a58c6bbfd303bb478392004b8eca9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Wed, 8 Mar 2023 07:51:48 +0800
Subject: [PATCH] Revised the report-chooser.html template to simplify the
 reports.

---
 .../templates/accounting/report/balance-sheet.html        | 8 ++------
 .../accounting/report/include/report-chooser.html         | 4 ++--
 .../templates/accounting/report/income-expenses.html      | 8 ++------
 .../templates/accounting/report/income-statement.html     | 8 ++------
 src/accounting/templates/accounting/report/journal.html   | 8 ++------
 src/accounting/templates/accounting/report/ledger.html    | 8 ++------
 src/accounting/templates/accounting/report/search.html    | 8 ++------
 .../templates/accounting/report/trial-balance.html        | 8 ++------
 8 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/accounting/templates/accounting/report/balance-sheet.html b/src/accounting/templates/accounting/report/balance-sheet.html
index 70d1228..7d66cd9 100644
--- a/src/accounting/templates/accounting/report/balance-sheet.html
+++ b/src/accounting/templates/accounting/report/balance-sheet.html
@@ -56,9 +56,7 @@ First written: 2023/3/7
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
@@ -75,9 +73,7 @@ First written: 2023/3/7
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
diff --git a/src/accounting/templates/accounting/report/include/report-chooser.html b/src/accounting/templates/accounting/report/include/report-chooser.html
index 6212988..93bb815 100644
--- a/src/accounting/templates/accounting/report/include/report-chooser.html
+++ b/src/accounting/templates/accounting/report/include/report-chooser.html
@@ -22,11 +22,11 @@ First written: 2023/3/4
 <div class="btn-group" role="group">
   <button id="accounting-report-chooser" class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
     <i class="fa-solid fa-book"></i>
-    <span class="d-none d-md-inline">{{ report_chooser.current_report }}</span>
+    <span class="d-none d-md-inline">{{ report.report_chooser.current_report }}</span>
     <span class="d-md-none">{{ A_("Report") }}</span>
   </button>
   <ul class="dropdown-menu" aria-labelledby="accounting-report-chooser">
-    {% for report in report_chooser %}
+    {% for report in report.report_chooser %}
       <li><a class="dropdown-item {% if report.is_active %} active {% endif %}" href="{{ report.url }}">{{ report.title }}</a></li>
     {% endfor %}
     <li>
diff --git a/src/accounting/templates/accounting/report/income-expenses.html b/src/accounting/templates/accounting/report/income-expenses.html
index 1d09b7d..1bcd501 100644
--- a/src/accounting/templates/accounting/report/income-expenses.html
+++ b/src/accounting/templates/accounting/report/income-expenses.html
@@ -57,9 +57,7 @@ First written: 2023/3/5
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
@@ -91,9 +89,7 @@ First written: 2023/3/5
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
diff --git a/src/accounting/templates/accounting/report/income-statement.html b/src/accounting/templates/accounting/report/income-statement.html
index b9522f3..94c1978 100644
--- a/src/accounting/templates/accounting/report/income-statement.html
+++ b/src/accounting/templates/accounting/report/income-statement.html
@@ -56,9 +56,7 @@ First written: 2023/3/7
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
@@ -75,9 +73,7 @@ First written: 2023/3/7
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
diff --git a/src/accounting/templates/accounting/report/journal.html b/src/accounting/templates/accounting/report/journal.html
index eda7c57..b8a660b 100644
--- a/src/accounting/templates/accounting/report/journal.html
+++ b/src/accounting/templates/accounting/report/journal.html
@@ -57,9 +57,7 @@ First written: 2023/3/4
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
     {{ report.period.desc|title }}
@@ -75,9 +73,7 @@ First written: 2023/3/4
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
     {{ A_("Period") }}
diff --git a/src/accounting/templates/accounting/report/ledger.html b/src/accounting/templates/accounting/report/ledger.html
index 1daf8eb..dfdbbe3 100644
--- a/src/accounting/templates/accounting/report/ledger.html
+++ b/src/accounting/templates/accounting/report/ledger.html
@@ -57,9 +57,7 @@ First written: 2023/3/5
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
@@ -91,9 +89,7 @@ First written: 2023/3/5
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
diff --git a/src/accounting/templates/accounting/report/search.html b/src/accounting/templates/accounting/report/search.html
index 09efd4f..ca832f3 100644
--- a/src/accounting/templates/accounting/report/search.html
+++ b/src/accounting/templates/accounting/report/search.html
@@ -56,9 +56,7 @@ First written: 2023/3/8
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.report.search") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
     <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label for="accounting-search-desktop" class="accounting-search-label">
@@ -79,9 +77,7 @@ First written: 2023/3/8
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.report.search") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
     <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label for="accounting-search-mobile" class="accounting-search-label">
diff --git a/src/accounting/templates/accounting/report/trial-balance.html b/src/accounting/templates/accounting/report/trial-balance.html
index 0003c5a..7084aaf 100644
--- a/src/accounting/templates/accounting/report/trial-balance.html
+++ b/src/accounting/templates/accounting/report/trial-balance.html
@@ -56,9 +56,7 @@ First written: 2023/3/5
       </ul>
     </div>
   {% endif %}
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>
@@ -75,9 +73,7 @@ First written: 2023/3/5
 {% endwith %}
 
 <div class="btn-group btn-actions mb-3 d-md-none">
-  {% with report_chooser = report.report_chooser %}
-    {% include "accounting/report/include/report-chooser.html" %}
-  {% endwith %}
+  {% include "accounting/report/include/report-chooser.html" %}
   {% include "accounting/report/include/currency-chooser.html" %}
   <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal">
     <i class="fa-solid fa-calendar-day"></i>