Revised the report-chooser.html template to simplify the reports.

2023-03-08 07:51:48 +08:00
parent 52b5151fe0
commit 6e1d35eda4
8 changed files with 16 additions and 44 deletions
--- 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>
--- 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>
--- 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">
--- 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>
--- 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") }}
--- 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">
--- 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">
--- 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>