imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 40 Wiki Activity

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

Browse Source
This commit is contained in:
依瑪貓 2023-03-08 07:51:48 +08:00
parent 52b5151fe0
commit 6e1d35eda4
8 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/accounting/templates/accounting/report/balance-sheet.html
View File

@ -56,9 +56,7 @@ First written: 2023/3/7
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>
@ -75,9 +73,7 @@ First written: 2023/3/7
{% endwith %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>

4
src/accounting/templates/accounting/report/include/report-chooser.html
View File

@ -22,11 +22,11 @@ First written: 2023/3/4
<div class="btn-group" role="group"> <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"> <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> <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> <span class="d-md-none">{{ A_("Report") }}</span>
</button> </button>
<ul class="dropdown-menu" aria-labelledby="accounting-report-chooser"> <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> <li><a class="dropdown-item {% if report.is_active %} active {% endif %}" href="{{ report.url }}">{{ report.title }}</a></li>
{% endfor %} {% endfor %}
<li> <li>

8
src/accounting/templates/accounting/report/income-expenses.html
View File

@ -57,9 +57,7 @@ First written: 2023/3/5
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-chooser.html" %} {% include "accounting/report/include/currency-chooser.html" %}
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <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 %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-chooser.html" %} {% include "accounting/report/include/currency-chooser.html" %}
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">

8
src/accounting/templates/accounting/report/income-statement.html
View File

@ -56,9 +56,7 @@ First written: 2023/3/7
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>
@ -75,9 +73,7 @@ First written: 2023/3/7
{% endwith %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>

8
src/accounting/templates/accounting/report/journal.html
View File

@ -57,9 +57,7 @@ First written: 2023/3/4
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
<button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal"> <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> <i class="fa-solid fa-calendar-day"></i>
{{ report.period.desc|title }} {{ report.period.desc|title }}
@ -75,9 +73,7 @@ First written: 2023/3/4
{% endwith %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
<button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#accounting-period-chooser-modal"> <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> <i class="fa-solid fa-calendar-day"></i>
{{ A_("Period") }} {{ A_("Period") }}

8
src/accounting/templates/accounting/report/ledger.html
View File

@ -57,9 +57,7 @@ First written: 2023/3/5
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-chooser.html" %} {% include "accounting/report/include/currency-chooser.html" %}
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <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 %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-chooser.html" %} {% include "accounting/report/include/currency-chooser.html" %}
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">

8
src/accounting/templates/accounting/report/search.html
View File

@ -56,9 +56,7 @@ First written: 2023/3/8
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
<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") }}"> <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"> <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"> <label for="accounting-search-desktop" class="accounting-search-label">
@ -79,9 +77,7 @@ First written: 2023/3/8
{% endwith %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
<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") }}"> <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"> <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"> <label for="accounting-search-mobile" class="accounting-search-label">

8
src/accounting/templates/accounting/report/trial-balance.html
View File

@ -56,9 +56,7 @@ First written: 2023/3/5
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>
@ -75,9 +73,7 @@ First written: 2023/3/5
{% endwith %} {% endwith %}
<div class="btn-group btn-actions mb-3 d-md-none"> <div class="btn-group btn-actions mb-3 d-md-none">
{% with report_chooser = report.report_chooser %} {% include "accounting/report/include/report-chooser.html" %}
{% include "accounting/report/include/report-chooser.html" %}
{% endwith %}
{% include "accounting/report/include/currency-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"> <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> <i class="fa-solid fa-calendar-day"></i>