Merge 9b514ca7c7 into 05742347c3

* Update forms.html

Added navigation element in 'Edit Participants' window

* Update forms.html

Updated button on form for editing participants--"Save" for edits instead of "Add."

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/forms.html

@@ -236,7 +236,8 @@
     {{ input(form.weight) }}
     </fieldset>
     <div class="actions">
-        {{ form.submit(class="btn btn-primary") }}
+        <button class="btn btn-secondary input-group-addon" type="submit">{{ _("Save") }}</button>
+        <a href="{{ url_for(".list_bills") }}" class="btn btn-outline-secondary"> {{_("Cancel") }} </a>
     </div>
 {% endmacro %}
 

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/templates/sidebar_table_layout.html

@@ -11,7 +11,7 @@
         </tr>
       </thead>
     {%- endif %}
-    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2) != 0 %}
+    {%- for member in g.project.members | sort(attribute='name') if member.activated or balance[member.id]|round(2)|abs > 0.01 %}
       <tr id="bal-member-{{ member.id }}" action="{% if member.activated %}delete{% else %}reactivate{% endif %}">
         <td class="balance-name">{{ member.name }}
           {%- if show_weight -%}
@@ -61,4 +61,4 @@
 {% endblock %}
 
 {# It must be set outside of the block definition #}
-{% set messages_shown = True %}
+{% set messages_shown = True %}

ihatemoney/web.py

@@ -648,7 +648,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
@@ -672,19 +672,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(
-        per_page=100, error_out=True
-    )
+    if request.method == "GET":
+        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"])