diff --git a/bt/views.py b/bt/views.py index 8d236a4388aceef842e9554c472f83ad38b0bec6..bc94097665e89d33ff0c889c162d6a0869c159b6 100644 --- a/bt/views.py +++ b/bt/views.py @@ -193,10 +193,28 @@ def ajax(request, country=None, operator=None): def index(request): v_list = Violation.objects.filter(activationid='',featuredcase__isnull=False).order_by('id').reverse()[:3] form = AddViolation() + reports=sorted([(i['total'],i['id']) + for i in Violation.objects.values('id').filter(activationid='').annotate(total=Count('confirmation'))], + reverse=True) + countries=sorted([(i['total'],i['country']) + for i in Violation.objects.values('country').filter(activationid='').annotate(total=Count('country'))], + reverse=True) + confirms=sorted([(i['total'],i['country']) + for i in Violation.objects.values('country').filter(activationid='').annotate(total=Count('confirmation'))], + reverse=True) + operators=sorted([(i['total'],i['operator']) + for i in Violation.objects.values('operator').filter(activationid='').annotate(total=Count('confirmation'))], + reverse=True) return render_to_response( 'index.html', { 'form': form, + 'stats': [ ('Countries with reports(confirmed)', len(countries), len([i for i,_ in confirms if i>1])), + ('Total reports (confirmed)', sum([i for i,_ in countries]),len([i for i,_ in reports if i>1])), + ('Total Operators with reports(confirmed)', len(operators), len([x for x in operators if x[0]>1])), + + ('Total confirmations(most)', sum([i for i, _ in confirms]), reports[0][0]), + ], 'violations': v_list }, context_instance=RequestContext(request)) diff --git a/media/css/style.css b/media/css/style.css index e1db54d62c62ea8442bf748132d4462cac5972f8..08b9213c9c6d7c7e4ddb451e69a1d5f8976ad41a 100644 --- a/media/css/style.css +++ b/media/css/style.css @@ -694,3 +694,7 @@ tr.ooscope-status td { background: #aaa !important; } .legendclass2 { background: rgba(255, 138, 00, 0.4);} .legendclass1 { background: rgba(255, 204, 00, 0.4);} .legendclass0 { background: rgba(255, 255, 00, 0.4);} + +.inline { display: inline; } + +.stat dt { width: 20em; display: inline-block; } diff --git a/templates/index.html b/templates/index.html index b9f6e32519875f75f26996d3f980db6e64432b14..f4da0216ce3adef95382a87e745cdc8697a94523 100644 --- a/templates/index.html +++ b/templates/index.html @@ -12,6 +12,7 @@