Merge 9b514ca7c7 into cf77b4c346

Co-authored-by: MediMilk <chadricksoup@gmail.com>

ihatemoney/messages.pot

@@ -759,7 +759,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/models.py

@@ -264,6 +264,12 @@ class Project(db.Model):
             .order_by(Bill.id.desc())
         )
 
+    @staticmethod
+    def filter(query, start_date, end_date):
+        return (
+            query.filter(Bill.date >= start_date, Bill.date <= end_date)
+        )
+
     def get_bill_weights(self):
         """
         Return all bills for this project, along with the sum of weight for each bill.
@@ -285,6 +291,9 @@ class Project(db.Model):
         """Ordered version of get_bill_weights"""
         return self.order_bills(self.get_bill_weights())
 
+    def get_filtered_bill_weights_ordered(self, start_date, end_date):
+        return self.filter(self.get_bill_weights_ordered(), start_date, end_date)
+
     def get_member_bills(self, member_id):
         """Return the list of bills related to a specific member"""
         return (

ihatemoney/templates/layout.html

@@ -168,7 +168,7 @@
               <i class="icon book">{{ static_include("images/book.svg") | safe }}</i>
             </a>
             {% if g.show_admin_dashboard_link %}
-            <a target="_blank" rel="noopener" data-toggle="tooltip" data-placement="top" title="{{ _('Administation Dashboard') }}" href="{{ url_for('main.dashboard') }}">
+            <a target="_blank" rel="noopener" data-toggle="tooltip" data-placement="top" title="{{ _('Administration Dashboard') }}" href="{{ url_for('main.dashboard') }}">
               <i class="icon admin">{{ static_include("images/cog.svg") | safe }}</i>
             </a>
             {% endif %}

ihatemoney/templates/list_bills.html

@@ -105,6 +105,16 @@
   <li class="page-item {% if bills.page == bills.pages %}disabled{% endif %}"><a class="page-link" href="{{ url_for('main.list_bills', page=bills.next_num) }}">{{ _("Older bills") }} &raquo;</a></li>
 </ul>
 {% endif %}
+<form action="{{ url_for(".list_bills") }}" method="post">
+    {{ csrf_form.csrf_token }}
+    <label for="start_date">Start Date:</label>
+    <input type="date" id="start_date" name="start_date" value="{{ start_date if start_date else '' }}">
+
+    <label for="end_date">End Date:</label>
+    <input type="date" id="end_date" name="end_date" value="{{ end_date if end_date else '' }}">
+
+    <input type="submit" value="Filter">
+</form>
 <span id="new-bill" class="ml-auto pb-2" {% if not g.project.members %} data-toggle="tooltip" title="{{_('You should start by adding participants')}}" {% endif %}>
     <a href="{{ url_for('.add_bill') }}" class="btn btn-primary {% if not g.project.members %} disabled {% endif %}" data-toggle="modal" data-keyboard="true" data-target="#bill-form" autofocus>
         <i class="icon icon-white before-text">{{ static_include("images/plus.svg") | safe }}</i>

ihatemoney/translations/bn/LC_MESSAGES/messages.po

@@ -782,7 +782,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/bn_BD/LC_MESSAGES/messages.po

@@ -785,7 +785,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/ca/LC_MESSAGES/messages.po

@@ -826,7 +826,7 @@ msgstr "Aplicació mòbil"
 msgid "Documentation"
 msgstr "Documentació"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Panell d'administració"
 
 msgid "Legal information"

ihatemoney/translations/cs/LC_MESSAGES/messages.po

@@ -800,7 +800,7 @@ msgstr "Mobilní aplikace"
 msgid "Documentation"
 msgstr "Dokumentace"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Správcovský panel"
 
 msgid "Legal information"

ihatemoney/translations/de/LC_MESSAGES/messages.po

@@ -824,7 +824,7 @@ msgstr "Handy-Applikation"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Dashboard Administration"
 
 msgid "Legal information"

ihatemoney/translations/el/LC_MESSAGES/messages.po

@@ -811,7 +811,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 #, fuzzy

ihatemoney/translations/eo/LC_MESSAGES/messages.po

@@ -821,7 +821,7 @@ msgstr "Poŝaparata programo"
 msgid "Documentation"
 msgstr "Dokumentaro"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Administra panelo"
 
 #, fuzzy

ihatemoney/translations/es/LC_MESSAGES/messages.po

@@ -818,7 +818,7 @@ msgstr "Aplicación móvil"
 msgid "Documentation"
 msgstr "Documentación"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Panel de administración"
 
 msgid "Legal information"

ihatemoney/translations/es_419/LC_MESSAGES/messages.po

@@ -815,7 +815,7 @@ msgstr "Aplicación móvil"
 msgid "Documentation"
 msgstr "Documentación"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Panel de administración"
 
 msgid "Legal information"

ihatemoney/translations/fa/LC_MESSAGES/messages.po

@@ -782,7 +782,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/fr/LC_MESSAGES/messages.po

@@ -824,7 +824,7 @@ msgstr "Application mobile"
 msgid "Documentation"
 msgstr "Documentation"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Panneau d'administration"
 
 msgid "Legal information"

ihatemoney/translations/he/LC_MESSAGES/messages.po

@@ -788,7 +788,7 @@ msgstr "יישום לנייד"
 msgid "Documentation"
 msgstr "דוקומנטציה"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/hi/LC_MESSAGES/messages.po

@@ -829,7 +829,7 @@ msgstr "मोबाइल एप्लीकेशन"
 msgid "Documentation"
 msgstr "प्रलेखन"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "व्यवस्थापन डैशबोर्ड"
 
 #, fuzzy

ihatemoney/translations/hu/LC_MESSAGES/messages.po

@@ -817,7 +817,7 @@ msgstr "Mobil alkalmazás"
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Adminisztrátori vezérlőpult"
 
 msgid "Legal information"

ihatemoney/translations/id/LC_MESSAGES/messages.po

@@ -812,7 +812,7 @@ msgstr "Aplikasi Gawai"
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Dasbor Administrasi"
 
 msgid "Legal information"

ihatemoney/translations/it/LC_MESSAGES/messages.po

@@ -817,7 +817,7 @@ msgstr "Applicazione mobile"
 msgid "Documentation"
 msgstr "Documentazione"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Cruscotto Amministrazione"
 
 msgid "Legal information"

ihatemoney/translations/ja/LC_MESSAGES/messages.po

@@ -797,7 +797,7 @@ msgstr "携帯アプリ"
 msgid "Documentation"
 msgstr "書類"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "管理ダッシュボード"
 
 #, fuzzy

ihatemoney/translations/kn/LC_MESSAGES/messages.po

@@ -793,7 +793,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/ms/LC_MESSAGES/messages.po

@@ -793,7 +793,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po

@@ -855,7 +855,7 @@ msgstr "Mobilprogram"
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Administrasjonsoversiktspanel"
 
 #, fuzzy

ihatemoney/translations/nl/LC_MESSAGES/messages.po

@@ -814,7 +814,7 @@ msgstr "Mobiele app"
 msgid "Documentation"
 msgstr "Documentatie"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Administratie-overzicht"
 
 #, fuzzy

ihatemoney/translations/oc/LC_MESSAGES/messages.po

@@ -777,7 +777,7 @@ msgstr ""
 msgid "Documentation"
 msgstr "Documentacion"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Panèl d’administracion"
 
 msgid "Legal information"

ihatemoney/translations/pl/LC_MESSAGES/messages.po

@@ -812,7 +812,7 @@ msgstr "Aplikacja mobilna"
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Kokpit administracyjny"
 
 msgid "Legal information"

ihatemoney/translations/pt/LC_MESSAGES/messages.po

@@ -823,7 +823,7 @@ msgstr "Aplicação Mobile"
 msgid "Documentation"
 msgstr "Documentação"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Painel de Administração"
 
 msgid "Legal information"

ihatemoney/translations/pt_BR/LC_MESSAGES/messages.po

@@ -809,7 +809,7 @@ msgstr "Aplicativo"
 msgid "Documentation"
 msgstr "Documentação"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Painel de Administração"
 
 msgid "Legal information"

ihatemoney/translations/ru/LC_MESSAGES/messages.po

@@ -816,7 +816,7 @@ msgstr "Мобильное приложение"
 msgid "Documentation"
 msgstr "Документация"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Панель инструментов администратора"
 
 msgid "Legal information"

ihatemoney/translations/sr/LC_MESSAGES/messages.po

@@ -783,7 +783,7 @@ msgstr "Mobilna Aplikacija"
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/sv/LC_MESSAGES/messages.po

@@ -818,7 +818,7 @@ msgstr "Mobilapplikation"
 msgid "Documentation"
 msgstr "Dokumentation"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Översiktspanel för administration"
 
 msgid "Legal information"

ihatemoney/translations/ta/LC_MESSAGES/messages.po

@@ -809,7 +809,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/te/LC_MESSAGES/messages.po

@@ -817,7 +817,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/th/LC_MESSAGES/messages.po

@@ -778,7 +778,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/tr/LC_MESSAGES/messages.po

@@ -811,7 +811,7 @@ msgstr "Telefon Uygulaması"
 msgid "Documentation"
 msgstr "Belgelendirme"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "Yönetici Gösterge Paneli"
 
 msgid "Legal information"

ihatemoney/translations/uk/LC_MESSAGES/messages.po

@@ -791,7 +791,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/ur/LC_MESSAGES/messages.po

@@ -776,7 +776,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/vi/LC_MESSAGES/messages.po

@@ -775,7 +775,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr ""
 
 msgid "Legal information"

ihatemoney/translations/zh_Hans/LC_MESSAGES/messages.po

@@ -779,7 +779,7 @@ msgstr "手机软件"
 msgid "Documentation"
 msgstr "文件"
 
-msgid "Administation Dashboard"
+msgid "Administration Dashboard"
 msgstr "管理面板"
 
 msgid "Legal information"

ihatemoney/web.py

@@ -642,7 +642,7 @@ def invite():
     return render_template("send_invites.html", form=form, qrcode=qrcode_svg)
 
 
-@main.route("/<project_id>/")
+@main.route("/<project_id>/", methods=["GET", "POST"])
 def list_bills():
     bill_form = get_billform_for(g.project)
     # Used for CSRF validation
@@ -666,19 +666,37 @@ def list_bills():
     # Each item will be a (weight_sum, Bill) tuple.
     # TODO: improve this awkward result using column_property:
     # https://docs.sqlalchemy.org/en/14/orm/mapped_sql_expr.html.
-    weighted_bills = g.project.get_bill_weights_ordered().paginate(
+    if request.method == "GET":
-        per_page=100, error_out=True
+        weighted_bills = g.project.get_bill_weights_ordered().paginate(
-    )
+            per_page=100, error_out=True
+        )
+        return render_template(
+            "list_bills.html",
+            bills=weighted_bills,
+            member_form=MemberForm(g.project),
+            bill_form=bill_form,
+            csrf_form=csrf_form,
+            add_bill=request.values.get("add_bill", False),
+            current_view="list_bills",
+        )
+    if request.method == "POST":
+        start_date = request.form['start_date']
+        end_date = request.form['end_date']
+        weighted_bills = g.project.get_filtered_bill_weights_ordered(start_date, end_date).paginate(
+            per_page=100, error_out=True
+        )
+        return render_template(
+            "list_bills.html",
+            bills=weighted_bills,
+            member_form=MemberForm(g.project),
+            bill_form=bill_form,
+            csrf_form=csrf_form,
+            add_bill=request.values.get("add_bill", False),
+            current_view="list_bills",
+            start_date=start_date,
+            end_date=end_date,
+        )
 
-    return render_template(
-        "list_bills.html",
-        bills=weighted_bills,
-        member_form=MemberForm(g.project),
-        bill_form=bill_form,
-        csrf_form=csrf_form,
-        add_bill=request.values.get("add_bill", False),
-        current_view="list_bills",
-    )
 
 
 @main.route("/<project_id>/members/add", methods=["GET", "POST"])