7 - Filter by Range of Time

Author: codingforentrepreneurs

src/analytics/templates/analytics/sales.html

@@ -11,30 +11,33 @@ <h1>Sales Data</h1>
 </div>
 
 <div class='row'>
+    <div class='col-12'>
+        <h1>Today's sales</h1>
+    </div>
     <div class='col'>
-        <p>Recent Total: ${{ recent_orders_data.total__sum }}</p>
+        <p>Recent Total: ${{ today.recent_data.total__sum }}</p>
         <ol>
-        {% for order in recent_orders %}
+        {% for order in today.recent %}
             <li>{{ order.order_id }}
             {{ order.total }}
             {{ order.updated }}</li>
         {% endfor %}
     </ol>
     </div>
     <div class='col'>
-        <p>Shipped Total: ${{ shipped_orders_data.total__sum }}</p>
+        <p>Shipped Total: ${{ today.shipped_data.total__sum }}</p>
         <ol>
-        {% for order in shipped_orders %}
+        {% for order in today.shipped %}
              <li>{{ order.order_id }}
             {{ order.total }}
             {{ order.updated }} </li>
         {% endfor %}
         </ol>
     </div>
     <div class='col'>
-        <p>Paid Totals: ${{ paid_orders_data.total__sum }}</p>
+        <p>Paid Totals: ${{ today.paid_data.total__sum }}</p>
         <ol>
-        {% for order in paid_orders %}
+        {% for order in today.paid %}
              <li>{{ order.order_id }}
             {{ order.total }}
             {{ order.updated }} </li>
@@ -45,5 +48,62 @@ <h1>Sales Data</h1>
 
 
 
+<div class='row'>
+    <div class='col-12'>
+        <h1>This week's sales</h1>
+    </div>
+    <div class='col'>
+        <p>Recent Total: ${{ this_week.recent_data.total__sum }}</p>
+        <ol>
+        {% for order in this_week.recent %}
+            <li>{{ order.order_id }}
+            {{ order.total }}
+            {{ order.updated }}</li>
+        {% endfor %}
+    </ol>
+    </div>
+    <div class='col'>
+        <p>Shipped Total: ${{ this_week.shipped_data.total__sum }}</p>
+        <ol>
+        {% for order in this_week.shipped %}
+             <li>{{ order.order_id }}
+            {{ order.total }}
+            {{ order.updated }} </li>
+        {% endfor %}
+        </ol>
+    </div>
+    <div class='col'>
+        <p>Paid Totals: ${{ this_week.paid_data.total__sum }}</p>
+        <ol>
+        {% for order in this_week.paid %}
+             <li>{{ order.order_id }}
+            {{ order.total }}
+            {{ order.updated }} </li>
+        {% endfor %}
+    </ol>
+    </div>
+</div>
+
+
+
+<div class='row'>
+    <div class='col-12'>
+        <h1>Previous 4 weeks</h1>
+    </div>
+    <div class='col'>
+        <p>Orders Total: ${{ last_four_weeks.recent_data.total__sum }}</p>
+    </div>
+    <div class='col'>
+        <p>Shipped Total: {% if last_four_weeks.shipped_data.total__sum %}
+            ${{ last_four_weeks.shipped_data.total__sum }} {% endif %}</p>
+    </div>
+    <div class='col'>
+        <p>Paid Totals: ${{ last_four_weeks.paid_data.total__sum }}</p>
+    </div>
+</div>
+
+
+
+
 
 {% endblock %}

src/analytics/views.py

@@ -1,9 +1,11 @@
+import datetime
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import Count, Sum, Avg
 from django.http import HttpResponse
 from django.views.generic import TemplateView
 from django.shortcuts import render
 
+from django.utils import  timezone
 
 
 from orders.models import Order
@@ -20,14 +22,10 @@ def dispatch(self, *args, **kwargs):
 
     def get_context_data(self, *args, **kwargs):
         context = super(SalesView, self).get_context_data(*args, **kwargs)
-        qs = Order.objects.all().by_date()
-        context['orders'] = qs
-        context['recent_orders'] = qs.recent().not_refunded()
-        context['recent_orders_data'] = context['recent_orders'].totals_data()
-        context['recent_orders_cart_data'] = context['recent_orders'].cart_data()
-        context['shipped_orders'] = qs.recent().not_refunded().by_status(status='shipped')
-        context['shipped_orders_data'] =  context['shipped_orders'].totals_data()
-        context['paid_orders'] = qs.recent().not_refunded().by_status(status='paid')
-        context['paid_orders_data'] = context['paid_orders'].totals_data()
-
+        #two_weeks_ago = timezone.now() - datetime.timedelta(days=14)
+        #one_week_ago = timezone.now() - datetime.timedelta(days=7)
+        qs = Order.objects.all().by_weeks_range(weeks_ago=10, number_of_weeks=10)
+        context['today'] = qs.by_range(start_date=timezone.now().date()).get_sales_breakdown()
+        context['this_week'] = qs.by_weeks_range(weeks_ago=1, number_of_weeks=1).get_sales_breakdown()
+        context['last_four_weeks'] = qs.by_weeks_range(weeks_ago=5, number_of_weeks=4).get_sales_breakdown()
         return context

src/orders/models.py

@@ -24,6 +24,39 @@ class OrderManagerQuerySet(models.query.QuerySet):
     def recent(self):
         return self.order_by("-updated", "-timestamp")
 
+    def get_sales_breakdown(self):
+        recent = self.recent().not_refunded()
+        recent_data = recent.totals_data()
+        recent_cart_data = recent.cart_data()
+        shipped = recent.not_refunded().by_status(status='shipped')
+        shipped_data = shipped.totals_data()
+        paid = recent.by_status(status='paid')
+        paid_data = paid.totals_data()
+        data = {
+            'recent': recent,
+            'recent_data':recent_data,
+            'recent_cart_data': recent_cart_data,
+            'shipped': shipped,
+            'shipped_data': shipped_data,
+            'paid': paid,
+            'paid_data': paid_data
+        }
+        return data
+
+    def by_weeks_range(self, weeks_ago=7, number_of_weeks=2):
+        if number_of_weeks > weeks_ago:
+            number_of_weeks = weeks_ago
+        days_ago_start = weeks_ago * 7  # days_ago_start = 49
+        days_ago_end = days_ago_start - (number_of_weeks * 7) #days_ago_end = 49 - 14 = 35
+        start_date = timezone.now() - datetime.timedelta(days=days_ago_start)
+        end_date = timezone.now() - datetime.timedelta(days=days_ago_end) 
+        return self.by_range(start_date, end_date=end_date)
+
+    def by_range(self, start_date, end_date=None):
+        if end_date is None:
+            return self.filter(updated__gte=start_date)
+        return self.filter(updated__gte=start_date).filter(updated__lte=end_date)
+
     def by_date(self):
         now = timezone.now() - datetime.timedelta(days=9)
         return self.filter(updated__day__gte=now.day)