Have filter by date running properly

ihatemoney/models.py

@@ -133,7 +133,7 @@ class Project(db.Model):
                 should_receive[bill.payer.id] += bill.converted_amount
                 for ower in bill.owers:
                     should_pay[ower.id] += (
-                            ower.weight * bill.converted_amount / total_weight
+                        ower.weight * bill.converted_amount / total_weight
                     )
 
             if bill.bill_type == BillType.REIMBURSEMENT:
@@ -265,50 +265,12 @@ class Project(db.Model):
         )
 
     @staticmethod
-    def filter_by_date(query, start_date=None, end_date=None):
+    def filter_by_date(query, start_date, end_date):
         if start_date and end_date:
-            return query.filter(Bill.date.between(start_date, end_date))
+            return query.filter(Bill.date >= start_date, Bill.date <= end_date)
         else:
             return query
 
-    @staticmethod
-    def filter_by_paid_by(query, paid_by=None):
-        if paid_by:
-            return query.filter(Bill.payer.has(id=paid_by))
-        else:
-            return query
-
-    @staticmethod
-    def filter_by_for_what(query, for_what=None):
-        if for_what:
-            return query.filter(Bill.what.has(id=for_what))
-        else:
-            return query
-
-    @staticmethod
-    def filter_by_for_whom(query, for_whom=None):
-        if for_whom:
-            return query.filter(Bill.payed_for.has(id=for_whom))
-        else:
-            return query
-
-    @staticmethod
-    def filter_by_how_much(query, how_much=None):
-        if how_much is not None:
-            return query.filter(Bill.amount.has(id=how_much))
-        else:
-            return query
-
-    @staticmethod
-    def apply_filters(self, query, **kwargs):
-        filtered_query = query
-        filtered_query = self.filter_by_date(filtered_query, kwargs.get('start_date'), kwargs.get('end_date'))
-        filtered_query = self.filter_by_paid_by(filtered_query, kwargs.get('paid_by'))
-        filtered_query = self.filter_by_for_what(filtered_query, kwargs.get('for_what'))
-        filtered_query = self.filter_by_for_whom(filtered_query, kwargs.get('for_whom'))
-        filtered_query = self.filter_by_how_much(filtered_query, kwargs.get('how_much'))
-        return filtered_query
-
     def get_bill_weights(self):
         """
         Return all bills for this project, along with the sum of weight for each bill.
@@ -330,27 +292,10 @@ 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=None, end_date=None, paid_by=None, for_what=None,
+    def get_filtered_date_bill_weights_ordered(self, start_date, end_date):
-                                          for_whom=None,
+        bill_weights_ordered = self.get_bill_weights_ordered()
-                                          how_much=None):
+        filtered_bill_weights = self.filter_by_date(bill_weights_ordered, start_date, end_date)
-        query = self.get_bill_weights_ordered()
+        return filtered_bill_weights
-
-        if start_date and end_date:
-            query = self.filter_by_date(query, start_date, end_date)
-
-        if paid_by:
-            query = self.filter_by_paid_by(query, paid_by)
-
-        if for_what:
-            query = self.filter_by_for_what(query, for_what)
-
-        if for_whom:
-            query = self.filter_by_for_whom(query, for_whom)
-
-        if how_much is not None:
-            query = self.filter_by_how_much(query, how_much)
-
-        return query
 
     def get_member_bills(self, member_id):
         """Return the list of bills related to a specific member"""
@@ -764,16 +709,16 @@ class Bill(db.Model):
     currency_helper = CurrencyConverter()
 
     def __init__(
-            self,
+        self,
-            amount: float,
+        amount: float,
-            date: datetime.datetime = None,
+        date: datetime.datetime = None,
-            external_link: str = "",
+        external_link: str = "",
-            original_currency: str = "",
+        original_currency: str = "",
-            owers: list = [],
+        owers: list = [],
-            payer_id: int = None,
+        payer_id: int = None,
-            project_default_currency: str = "",
+        project_default_currency: str = "",
-            what: str = "",
+        what: str = "",
-            bill_type: str = "Expense",
+        bill_type: str = "Expense",
     ):
         super().__init__()
         self.amount = amount

ihatemoney/templates/list_bills.html

@@ -107,41 +107,15 @@
 {% 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 '' }}">
 
-    <div>
+    <label for="end_date">End Date:</label>
-        <label for="start_date">Start Date:</label>
+    <input type="date" id="end_date" name="end_date" value="{{ end_date if end_date else '' }}">
-        <input type="date" id="start_date" name="start_date" value="{{ start_date if start_date else '' }}">
-    </div>
-
-    <div>
-        <label for="end_date">End Date:</label>
-        <input type="date" id="end_date" name="end_date" value="{{ end_date if end_date else '' }}">
-    </div>
-
-    <div>
-        <label for="paid_by">Paid By:</label>
-        <input type="text" id="paid_by" name="paid_by" value="{{ paid_by if paid_by else '' }}">
-    </div>
-
-    <div>
-        <label for="for_what">For What:</label>
-        <input type="text" id="for_what" name="for_what" value="{{ for_what if for_what else '' }}">
-    </div>
-
-    <div>
-        <label for="for_whom">For Whom:</label>
-        <input type="text" id="for_whom" name="for_whom" value="{{ for_whom if for_whom else '' }}">
-    </div>
-
-    <div>
-        <label for="how_much">How Much:</label>
-        <input type="number" id="how_much" name="how_much" value="{{ how_much if how_much else '' }}">
-    </div>
 
     <input type="submit" value="Enter">
 </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/web.py

@@ -670,50 +670,27 @@ def list_bills():
         weighted_bills = g.project.get_bill_weights_ordered().paginate(
             per_page=100, error_out=True
         )
-        return render_template(
+    elif request.method == "POST":
-            "list_bills.html",
+        # Retrieve start_date and end_date from form data
-            bills=weighted_bills,
+        start_date = request.form.get('start_date')
-            member_form=MemberForm(g.project),
+        end_date = request.form.get('end_date')
-            bill_form=bill_form,
+
-            csrf_form=csrf_form,
+
-            add_bill=request.values.get("add_bill", False),
+        weighted_bills = g.project.get_filtered_date_bill_weights_ordered(start_date, end_date).paginate(
-            current_view="list_bills",
+            per_page=100, error_out=True
         )
 
-    if request.method == "POST":
+    return render_template(
-        start_date = request.form.get('start_date', None)
+        "list_bills.html",
-        end_date = request.form.get('end_date', None)
+        bills=weighted_bills,
-        paid_by = request.form.get('paid_by', None)
+        member_form=MemberForm(g.project),
-        for_what = request.form.get('for_what', None)
+        bill_form=bill_form,
-        for_whom = request.form.get('for_whom', None)
+        csrf_form=csrf_form,
-        how_much = request.form.get('how_much', None)
+        add_bill=request.values.get("add_bill", False),
-
+        current_view="list_bills",
-        weighted_bills = g.project.get_filtered_bill_weights_ordered(
+        start_date=start_date if request.method == "POST" else None,
-            start_date=start_date,
+        end_date=end_date if request.method == "POST" else None,
-            end_date=end_date,
+    )
-            paid_by=paid_by,
-            for_what=for_what,
-            for_whom=for_whom,
-            how_much=how_much
-        ).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,
-            paid_by=paid_by,
-            for_what=for_what,
-            for_whom=for_whom,
-            how_much=how_much
-        )
-
-
 
 @main.route("/<project_id>/members/add", methods=["GET", "POST"])
 def add_member():