diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-26 13:17:37 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-26 13:17:37 +0200 | 
| commit | be2a26140068fc3810940bfb398a81366b72e90a (patch) | |
| tree | b9965fbe2fd173d3e58755d784030de25a82b88a /ishtar/ishtar_base/models.py | |
| parent | e5949b5e76897f102fc41d493b0504641935e3fb (diff) | |
| download | Ishtar-be2a26140068fc3810940bfb398a81366b72e90a.tar.bz2 Ishtar-be2a26140068fc3810940bfb398a81366b72e90a.zip | |
Archaeological file dashboard (closes #521)
Diffstat (limited to 'ishtar/ishtar_base/models.py')
| -rw-r--r-- | ishtar/ishtar_base/models.py | 134 | 
1 files changed, 106 insertions, 28 deletions
| diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index 6f29196ce..e686b6ca2 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -28,7 +28,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext  from django.utils.safestring import SafeUnicode, mark_safe  from django.core.urlresolvers import reverse, NoReverseMatch  from django.db.utils import DatabaseError -from django.db.models import Q, Max, Count +from django.db.models import Q, Max, Count, Sum  from django.db.models.signals import m2m_changed  from django.contrib.auth.models import User @@ -360,8 +360,8 @@ class UserDashboard:      def __init__(self):          types = IshtarUser.objects.values('person__person_type',                                            'person__person_type__label') -        self.types = types.annotate(number=Count('pk')).order_by( -                                                       'person__person_type') +        self.types = types.annotate(number=Count('pk'))\ +                          .order_by('person__person_type')  class FileDashboard:      def __init__(self): @@ -372,36 +372,114 @@ class FileDashboard:          types = File.objects.values('file_type', 'file_type__label')          self.types = types.annotate(number=Count('pk')).order_by('file_type') -        self.by_years = main_dashboard.values +        by_year = File.objects.extra( +                        {'date':"date_trunc('year', creation_date)"}) +        self.by_year = by_year.values('date')\ +                              .annotate(number=Count('pk')).order_by('-date')          now = datetime.date.today()          limit = datetime.date(now.year, now.month, 1) - datetime.timedelta(365)          by_month = File.objects.filter(creation_date__gt=limit).extra( -                        {'month':"date_trunc('month', creation_date)"}) -        self.by_month = by_month.values('month').annotate(number=Count('pk') -                                                        ).order_by('-month') +                        {'date':"date_trunc('month', creation_date)"}) +        self.by_month = by_month.values('date')\ +                                .annotate(number=Count('pk')).order_by('-date') -        # programmed -        self.prog = {} +        # research +        self.research = {}          prog_type = FileType.objects.get(txt_idx='prog') -        progs = File.objects.filter(file_type=prog_type) -        self.prog['total_number'] = progs.count() -        by_year = progs.extra({'year':"date_trunc('year', creation_date)"}) -        self.prog['by_year'] = by_year.values('year').annotate(number=Count('pk') -                                                        ).order_by('-year') -        by_month = progs.filter(creation_date__gt=limit).extra( -                        {'month':"date_trunc('month', creation_date)"}) -        self.prog['by_month'] = by_month.values('month').annotate( -                                      number=Count('pk')).order_by('-month') - -        self.prog['by_dpts'] = FileByDepartment.objects.filter( -                       file__file_type=prog_type).values('department' -                       ).annotate(number=Count('file')).order_by('-number') +        researchs = File.objects.filter(file_type=prog_type) +        self.research['total_number'] = researchs.count() +        by_year = researchs.extra({'date':"date_trunc('year', creation_date)"}) +        self.research['by_year'] = by_year.values('date')\ +                                          .annotate(number=Count('pk'))\ +                                          .order_by('-date') +        by_month = researchs.filter(creation_date__gt=limit)\ +                           .extra({'date':"date_trunc('month', creation_date)"}) +        self.research['by_month'] = by_month.values('date')\ +                                            .annotate(number=Count('pk'))\ +                                            .order_by('-date') + +        self.research['by_dpt'] = FileByDepartment.objects\ +                        .filter(file__file_type=prog_type)\ +                        .values('department__label')\ +                        .annotate(number=Count('file'))\ +                        .order_by('department__label')          FileTown = File.towns.through -        self.prog['towns'] = FileTown.objects.filter( -                       file__file_type=prog_type).values('town' -                       ).annotate(number=Count('file')).order_by('-number') - +        self.research['towns'] = FileTown.objects\ +                        .filter(file__file_type=prog_type)\ +                        .values('town__name')\ +                        .annotate(number=Count('file'))\ +                        .order_by('-number','town__name')[:10] + +        # rescue +        rescue_type = FileType.objects.get(txt_idx='preventive') +        rescues = File.objects.filter(file_type=rescue_type) +        self.rescue = {} +        self.rescue['total_number'] = rescues.count() +        self.rescue['saisine'] = rescues.values('saisine_type__label')\ +                                          .annotate(number=Count('pk'))\ +                                          .order_by('saisine_type__label') +        self.rescue['administrative_act'] = AdministrativeAct.objects\ +                        .filter(associated_file__isnull=False)\ +                        .values('act_type__label')\ +                        .annotate(number=Count('pk'))\ +                        .order_by('act_type__pk') + +        by_year = rescues.extra({'date':"date_trunc('year', creation_date)"}) +        self.rescue['by_year'] = by_year.values('date')\ +                                          .annotate(number=Count('pk'))\ +                                          .order_by('-date') +        by_month = rescues.filter(creation_date__gt=limit)\ +                          .extra({'date':"date_trunc('month', creation_date)"}) +        self.rescue['by_month'] = by_month.values('date')\ +                                          .annotate(number=Count('pk'))\ +                                          .order_by('-date') + +        self.rescue['by_dpt'] = FileByDepartment.objects\ +                        .filter(file__file_type=rescue_type)\ +                        .values('department__label')\ +                        .annotate(number=Count('file'))\ +                        .order_by('department__label') +        self.rescue['towns'] = FileTown.objects\ +                        .filter(file__file_type=rescue_type)\ +                        .values('town__name')\ +                        .annotate(number=Count('file'))\ +                        .order_by('-number','town__name')[:10] + +        self.rescue['with_associated_operation'] = rescues\ +                        .filter(operations__isnull=False).count() + +        self.rescue['with_associated_operation_percent'] = round( +                float(self.rescue['with_associated_operation'])\ +                /self.rescue['total_number']*100, 2) + +        by_year_operationnal = rescues.filter(operations__isnull=False)\ +                .extra({'date':"date_trunc('year', creation_date)"}) +        by_year_operationnal = by_year_operationnal.values('date')\ +                                          .annotate(number=Count('pk'))\ +                                          .order_by('-date') +        percents, idx = [], 0 +        for dct in self.rescue['by_year']: +            if idx > len(by_year_operationnal): +                break +            if by_year_operationnal[idx]['date'] != dct['date'] or\ +               not dct['number']: +                continue +            val = round(float(by_year_operationnal[idx]['number'])/\ +                        dct['number']*100, 2) +            percents.append({'date':dct['date'], 'number':val}) +        self.rescue['operational_by_year'] = percents + +        self.rescue['surface_by_town'] = FileTown.objects\ +                        .filter(file__file_type=rescue_type)\ +                        .values('town__name')\ +                        .annotate(number=Sum('file__total_surface'))\ +                        .order_by('-number','town__name')[:10] +        self.rescue['surface_by_dpt'] = FileByDepartment.objects\ +                        .filter(file__file_type=rescue_type)\ +                        .values('department__label')\ +                        .annotate(number=Sum('file__total_surface'))\ +                        .order_by('department__label')  class Dashboard:      def __init__(self, model): @@ -411,8 +489,8 @@ class Dashboard:          # last edited - created          self.recents, self.lasts = [], []          for last_lst, modif_type in ((self.lasts, '+'), (self.recents, '~')): -            last_ids = history_model.objects.values('id').annotate(hd=\ -                                                        Max('history_date')) +            last_ids = history_model.objects.values('id')\ +                                            .annotate(hd=Max('history_date'))              last_ids = last_ids.filter(history_type=modif_type)              if self.model == Item:                  last_ids = last_ids.filter(downstream_treatment_id__isnull=True) | 
