add reimbursement stats

Author: Gerard Casas Saez

Diff for: README.md

@@ -73,7 +73,7 @@ You can deploy this project into heroku for free. You will need to verify your a
 - Create super user by running `python manage.py createsuperuser` once the heroku app is deployed
 - Add scheduler addon: https://elements.heroku.com/addons/scheduler
 - Open scheduler dashboard: https://scheduler.heroku.com/dashboard (make sure it opens the just created heroku app)
-- Add daily job `python manage.py expire_applications`
+- Add daily job `python manage.py expire_applications && python manage.py expire_reimbursements`
 
 ### Production environment
 

Diff for: management.sh.template

@@ -7,4 +7,4 @@ export SG_KEY="API_KEY"
 # Domain where running
 export DOMAIN="my.hackupc.com"
 
-./env/bin/python manage.py expire_applications
+./env/bin/python manage.py expire_applications && ./env/bin/python manage.py expire_reimbursements

Diff for: reimbursement/management/__init__.py

@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+
+
+from reimbursement import models
+
+
+class Command(BaseCommand):
+    help = 'Checks reimbursements that have expired'
+
+    def handle(self, *args, **options):
+        self.stdout.write('Checking expired reimbursements...')
+        reimbs = models.Reimbursement.objects.filter(
+            expiration_time__lte=timezone.now(), status=models.RE_PEND_TICKET)
+        self.stdout.write('Checking expired reimbursements...%s found' % reimbs.count())
+        for reimb in reimbs:
+            reimb.expire()
+

Diff for: reimbursement/management/commands/__init__.py

@@ -18,6 +18,7 @@
 RE_PEND_TICKET = 'PT'
 RE_PEND_APPROVAL = 'PA'
 RE_APPROVED = 'A'
+RE_EXPIRED = 'X'
 RE_FRIEND_SUBMISSION = 'FS'
 
 RE_STATUS = [
@@ -26,6 +27,7 @@
     (RE_PEND_TICKET, 'Pending receipt submission'),
     (RE_PEND_APPROVAL, 'Pending receipt approval'),
     (RE_APPROVED, 'Receipt approved'),
+    (RE_EXPIRED, 'Expired'),
     (RE_FRIEND_SUBMISSION, 'Friend submission'),
 ]
 
@@ -105,7 +107,7 @@ def timeleft_expiration(self):
 
     @property
     def expired(self):
-        return timezone.now() > self.expiration_time and self.status == RE_PEND_TICKET
+        return self.status == RE_EXPIRED
 
     def generate_draft(self, application):
         if self.status != RE_DRAFT:
@@ -116,6 +118,10 @@ def generate_draft(self, application):
         self.reimbursement_money = None
         self.save()
 
+    def expire(self):
+        self.status = RE_EXPIRED
+        self.save()
+
     def send(self, user):
         if not self.assigned_money:
             raise ValidationError('Reimbursement can\'t be sent because '

Diff for: reimbursement/management/commands/expire_reimbursements.py

@@ -1,8 +1,9 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.utils import timezone
 
 from applications.models import Application
-from reimbursement.models import Reimbursement
+from reimbursement.models import Reimbursement, RE_EXPIRED, RE_PEND_TICKET
 
 
 @receiver(post_save, sender=Application)
@@ -18,3 +19,10 @@ def reimbursement_create(sender, instance, created, *args, **kwargs):
     else:
         reimb = Reimbursement()
     reimb.generate_draft(instance)
+
+
+@receiver(post_save, sender=Reimbursement)
+def reimbursement_unexpire(sender, instance, created, *args, **kwargs):
+    if instance.status == RE_EXPIRED and instance.expiration_time > timezone.now():
+        instance.status = RE_PEND_TICKET
+        instance.save()

Diff for: reimbursement/models.py

@@ -14,6 +14,7 @@ <h1>Application stats</h1>
         <div class="col-md-6">
             <h3>Status</h3>
             <div id="applications_stats"></div>
+            <p><b>Application count:</b> <span id="app_count"></span></p>
         </div>
         <div class="col-md-6">
             <h3>Gender</h3>
@@ -44,7 +45,7 @@ <h3>Confirmed only</h3>
             <div id="diet_stats_confirmed"></div>
         </div>
         <div class="col-md-12">
-            <p><b>Other diet requirements</b> <span id="other_diet"></span></p>
+            <p><b>Confirmed extra diet requirements:</b><br> <span id="other_diet"></span></p>
         </div>
 
     </div>
@@ -190,6 +191,7 @@ <h3>Confirmed only</h3>
             });
             $('#other_diet').html(data['other_diet']);
             $('#update_date').html(data['update_time']);
+            $('#app_count').html(data['app_count']);
         })
         ;
 

Diff for: reimbursement/signals.py

@@ -0,0 +1,90 @@
+{% extends 'c3_base.html' %}
+
+{% block head_title %}Reimbursement stats{% endblock %}
+{% block panel %}
+    <h1>Reimbursement stats</h1>
+    <small class="pull-right"><b>Last updated:</b> <span id="update_date"></span></small>
+    <div class="row">
+        <div class="col-md-12">
+            <div id="amounts">
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-6">
+            <h3>Status</h3>
+            <div id="reimb_stats"></div>
+            <p><b>Reimbursement count:</b> <span id="reimb_count"></span></p>
+        </div>
+        <div class="col-md-6">
+            <h3>Applications</h3>
+            <div id="reimb_apps"></div>
+        </div>
+    </div>
+{% endblock %}
+{% block c3script %}
+    <script>
+        $.getJSON('{% url 'api_reimb_stats' %}', function (data) {
+            c3.generate({
+                bindto: '#amounts',
+                data: {
+                    json: data['amounts'],
+                    keys: {
+                        x: 'status_name',
+                        value: ['final_amount', 'max_amount']
+                    },
+                    type: 'bar'
+                },
+
+                axis: {
+                    x: {
+                        type: 'category'
+                    }
+                }
+            });
+
+
+            var status_data = {};
+            var sites = [];
+            $(data['status']).each(function (c, e) {
+                sites.push(e.status_name);
+                status_data[e.status_name] = e.reimbursements;
+            });
+            c3.generate({
+                bindto: '#reimb_stats',
+                data: {
+                    json: status_data,
+                    type: 'donut'
+
+                },
+                donut: {
+                    label: {
+                        format: function (value, ratio, id) {
+                            return value;
+                        }
+                    }
+                }
+            });
+
+            c3.generate({
+                bindto: '#reimb_apps',
+                data: {
+                    json: data['reimb_apps'],
+                    type: 'donut'
+
+                },
+                donut: {
+                    label: {
+                        format: function (value, ratio, id) {
+                            return value;
+                        }
+                    }
+                }
+            });
+            $('#update_date').html(data['update_time']);
+            $('#reimb_count').html(data['reimb_count']);
+        })
+        ;
+
+    </script>
+{% endblock %}

Diff for: stats/templates/application_stats.html

@@ -5,5 +5,7 @@
 
 urlpatterns = [
     url(r'^api/apps/$', cache_page(60)(views.app_stats_api), name='api_app_stats'),
-    url(r'^$', views.AppStats.as_view(), name='app_stats'),
+    url(r'^api/reimb/$', cache_page(60)(views.reimb_stats_api), name='api_reimb_stats'),
+    url(r'^apps/$', views.AppStats.as_view(), name='app_stats'),
+    url(r'^reimb/$', views.ReimbStats.as_view(), name='reimb_stats'),
 ]

Diff for: stats/templates/reimbursement_stats.html

@@ -1,16 +1,50 @@
-from django.db.models import Count
+from django.db.models import Count, Sum
 from django.db.models.functions import TruncDate
 from django.http import JsonResponse
+from django.urls import reverse
 from django.utils import timezone
 
 from app.views import TabsView
 from applications.models import Application, STATUS, APP_CONFIRMED, GENDERS
+from reimbursement.models import Reimbursement, RE_STATUS, RE_DRAFT
 from user.mixins import is_organizer, IsOrganizerMixin
 
 STATUS_DICT = dict(STATUS)
+RE_STATUS_DICT = dict(RE_STATUS)
 GENDER_DICT = dict(GENDERS)
 
 
+def stats_tabs():
+    return [('Applications', reverse('app_stats'), False),
+            ('Reimbursements', reverse('reimb_stats'), False)]
+
+
+@is_organizer
+def reimb_stats_api(request):
+    # Status analysis
+    status_count = Reimbursement.objects.all().values('status') \
+        .annotate(reimbursements=Count('status'))
+    status_count = map(lambda x: dict(status_name=RE_STATUS_DICT[x['status']], **x), status_count)
+
+    total_apps = Application.objects.count()
+    no_reimb_apps = Application.objects.filter(reimb__isnull=True).count()
+
+    amounts =Reimbursement.objects.all().exclude(status=RE_DRAFT).values('assigned_money', 'reimbursement_money', 'status') \
+        .annotate(final_amount=Sum('reimbursement_money'), max_amount=Sum('assigned_money'))
+    amounts = map(lambda x: dict(status_name=RE_STATUS_DICT[x['status']], **x), amounts)
+
+
+    return JsonResponse(
+        {
+            'update_time': timezone.now(),
+            'reimb_count': Reimbursement.objects.count(),
+            'reimb_apps': {'Reimbursement needed': total_apps - no_reimb_apps, 'No reimbursement': no_reimb_apps},
+            'status': list(status_count),
+            'amounts': list(amounts),
+        }
+    )
+
+
 @is_organizer
 def app_stats_api(request):
     # Status analysis
@@ -31,27 +65,35 @@ def app_stats_api(request):
         .annotate(applications=Count('diet'))
     diet_count_confirmed = Application.objects.filter(status=APP_CONFIRMED).values('diet') \
         .annotate(applications=Count('diet'))
-    other_diets = Application.objects.values('other_diet')
+    other_diets = Application.objects.filter(status=APP_CONFIRMED).values('other_diet')
 
     timeseries = Application.objects.all().annotate(date=TruncDate('submission_date')).values('date').annotate(
         applications=Count('date'))
     return JsonResponse(
         {
             'update_time': timezone.now(),
+            'app_count': Application.objects.count(),
             'status': list(status_count),
             'shirt_count': list(shirt_count),
             'shirt_count_confirmed': list(shirt_count_confirmed),
             'timeseries': list(timeseries),
             'gender': list(gender_count),
             'diet': list(diet_count),
             'diet_confirmed': list(diet_count_confirmed),
-            'other_diet': ';'.join([el['other_diet'] for el in other_diets if el['other_diet']])
+            'other_diet': '<br>'.join([el['other_diet'] for el in other_diets if el['other_diet']])
         }
     )
 
 
 class AppStats(IsOrganizerMixin, TabsView):
     template_name = 'application_stats.html'
 
-    def get_context_data(self, **kwargs):
-        return {}
+    def get_current_tabs(self):
+        return stats_tabs()
+
+
+class ReimbStats(IsOrganizerMixin, TabsView):
+    template_name = 'reimbursement_stats.html'
+
+    def get_current_tabs(self):
+        return stats_tabs()