#128 - Filter by node in dashboard stats

market/views/index.py

@@ -47,8 +47,8 @@ def get_context_data(self, **kwargs):
         today = datetime.date.today()
         since = today - datetime.timedelta(days=query)
         context['last'] = last
-        context['total_providers'] = Provider.objects.count()
-        context['total_consumers'] = Consumer.objects.count()
+        context['total_providers'] = Provider.objects.filter(node=self.node).count()
+        context['total_consumers'] = Consumer.objects.filter(node=self.node).count()
         context['new_providers'] = helpers.paginate(
             Provider.objects.filter(node=self.node, registration_date__gte=since),
             1, elems_perpage=DASHBOARD_LIST_PAGECOUNT)

market/views/member.py

@@ -5,25 +5,26 @@
 from django.views.generic import TemplateView
 
 from helpers.pdf import render_pdf_response
-from market.models import Account, Provider
+from market.mixins.current_market import MarketMixin
+from market.models import Account, Provider, Consumer
 import urllib.parse
 
 
 class MemberCheck(TemplateView):
     template_name = 'member/check_outside_app.html'
 
 
-class CheckMemberStatus(TemplateView):
+class CheckMemberStatus(MarketMixin, TemplateView):
     template_name = 'member/check_form.html'
 
     def get_member_status(self, member_id):
         status_info = {}
-        member = Account.objects.filter(member_id=member_id).first()
+        member = Consumer.objects.filter(node=self.node, member_id=member_id).first()
         if member is not None:
             status_info['member_type'] = 'person'
             status_info['is_intercoop'] = member.is_intercoop
         else:
-            member = Account.objects.filter(member_id=member_id).first()
+            member = Provider.objects.filter(node=self.node, member_id=member_id).first()
             if member is None:
                 return None
             status_info['member_type'] = 'entity'
@@ -43,6 +44,9 @@ def get_context_data(self, **kwargs):
 
         return context
 
+    def user_can_access(self):
+        return True
+
     def post(self, request, *args, **kwargs):
         kwargs['member_id'] = self.request.POST.get('member_id', None)
         context = self.get_context_data(**kwargs)

reports/views.py

@@ -32,7 +32,7 @@ def get_context_data(self, **kwargs):
 
         context['last'] = last
         context['published'] = published
-        context['active'] = Offer.objects.active_last_days(days)
+        context['active'] = Offer.objects.active_last_days(days).filter(provider__node=self.node)
         context['providers'] = Provider.objects.filter(node=self.node, pk__in=published.values_list('provider').distinct())
         context['daily'] = published.annotate(day=TruncDay('published_date')).values('day').annotate(total=Count('id')).order_by('day')
         context['date_ranges'] = { 'start': since, 'end': today }