Project

General

Profile

« Previous | Next » 

Revision a5bdc8ec

Added by Benjamin Dauvergne over 12 years ago

personnes: add new methods of the HolidayQuerySet

New methods allow to filter holidays based on a time period or for the
future (happening later than today, today included).

View differences:

calebasse/personnes/models.py
118 118 
        filter_query = models.Q(worker=worker) \
119 119 
              | models.Q(worker__isnull=True,
120 120 
                           service=worker.services.all())
121 
        return self.filter(filter_query) \
122 
                   .filter(end_date__gte=date.today())
121 
        return self.filter(filter_query)
123 122 

  		




  124
  123
  
    
    def for_service(self, service):


  		




  125
  124
  
    
        return self.filter(worker__isnull=True) \


  		




  126
  125
  
    
                   .filter(models.Q(service=service)


  		




  127
  126
  
    
                          |models.Q(service__isnull=True)) \


  		




  128
  
  
    
                   .filter(end_date__gte=date.today())


  		




  129
  127
  
    

  		




  130
  128
  
    
    def for_service_workers(self, service):


  		




  131
  
  
    
        return self.filter(worker__services=service,


  		




  132
  
  
    
                end_date__gte=date.today())


  		




  
  129
  
    
        return self.filter(worker__services=service)


  		




  
  130
  
    

  		




  
  131
  
    
    def future(self):


  		




  
  132
  
    
        return self.filter(end_date__gte=date.today())


  		




  
  133
  
    

  		




  
  134
  
    
    def today(self):


  		




  
  135
  
    
        today = date.today()


  		




  
  136
  
    
        return self.filter(start_date__lte=today,


  		




  
  137
  
    
                end_date__gte=today)


  		




  
  138
  
    

  		




  
  139
  
    
    def for_period(self, start_date, end_date):


  		




  
  140
  
    
        return self.filter(start_date__lte=end_date, end_date__gte=start_date)


  		




  133
  141
  
    

  		




  134
  142
  
    
def time2french(time):


  		




  135
  143
  
    
    if time.minute:


  		












  

    
      calebasse/personnes/views.py
    
  





  80
  80
  
    
            if intervene_status and 0 < len(intervene_status) < 2:


  		




  81
  81
  
    
                qs = qs.filter(type__intervene=intervene_status[0] == 'a')


  		




  82
  82
  
    
        today = date.today()


  		




  83
  
  
    
        if models.Holiday.objects.for_service(self.service) \


  		




  
  83
  
    
        if models.Holiday.objects.for_service(self.service).future() \


  		




  84
  84
  
    
                .filter(start_date__lte=today).exists():


  		




  85
  85
  
    
            for worker in qs:


  		




  86
  86
  
    
                worker.holiday = True


  		




  87
  87
  
    
        else:


  		




  88
  
  
    
            qs2 = models.Holiday.objects.filter(


  		




  89
  
  
    
                           start_date__lte=today,


  		




  90
  
  
    
                           end_date__gte=today)


  		




  
  88
  
    
            qs2 = models.Holiday.objects.today()


  		




  91
  89
  
    
            worker_dict = dict(((w.id, w) for w in qs))


  		




  92
  90
  
    
            for worker in qs:


  		




  93
  91
  
    
                worker.holiday = False


  		




  ......




  138
  136
  
    
        ctx['timetables'] = timetable


  		




  139
  137
  
    
        ctx['holidays'] = models.Holiday.objects \


  		




  140
  138
  
    
                            .for_worker(self.object) \


  		




  
  139
  
    
                            .future() \


  		




  141
  140
  
    
                            .order_by('start_date')


  		




  142
  141
  
    
        try:


  		




  143
  
  
    
            holiday = models.Holiday.objects.for_worker(self.object) \


  		




  144
  
  
    
                .filter(start_date__lte=date.today())[0]


  		




  
  142
  
    
            holiday = models.Holiday.objects \


  		




  
  143
  
    
                    .for_worker(self.object) \


  		




  
  144
  
    
                    .today()[0]


  		




  145
  145
  
    
        except IndexError:


  		




  146
  146
  
    
            holiday = None


  		




  147
  147
  
    
        ctx['holiday'] = holiday


  		




  ......




  209
  209
  
    
    def get_context_data(self, **kwargs):


  		




  210
  210
  
    
        ctx = super(HolidayView, self).get_context_data(**kwargs)


  		




  211
  211
  
    
        end_date = date.today() + relativedelta(months=self.months)


  		




  212
  
  
    
        qs = models.Holiday.objects.for_service_workers(self.service)


  		




  
  212
  
    
        qs = models.Holiday.objects.for_service_workers(self.service).future()


  		




  213
  213
  
    
        today = date.today()


  		




  214
  
  
    
        future_qs = qs.filter(start_date__gt=today,


  		




  215
  
  
    
                start_date__lte=end_date)


  		




  
  214
  
    
        future_qs = qs.for_period(today, end_date)


  		




  216
  215
  
    
        annual_qs = models.Holiday.objects.for_service(self.service)


  		




  217
  
  
    
        current_qs = qs.filter(start_date__lte=today)


  		




  
  216
  
    
        current_qs = qs.today()


  		




  218
  217
  
    
        form = self.get_form()


  		




  219
  218
  
    
        if form.is_valid() and form.cleaned_data.get('start_date'):


  		




  220
  219
  
    
            cleaned_data = form.cleaned_data


  		




  221
  220
  
    
            start_date = cleaned_data['start_date']


  		




  222
  221
  
    
            end_date = cleaned_data['end_date']


  		




  223
  
  
    
            q = Q(start_date__gte=start_date, start_date__lte=end_date)


  		




  224
  
  
    
            q |= Q(end_date__gte=start_date, end_date__lte=end_date)


  		




  225
  
  
    
            future_qs = models.Holiday.objects.filter(q) \


  		




  226
  
  
    
                    .filter(worker__services=self.service)


  		




  227
  
  
    
            annual_qs = annual_qs.filter(q)


  		




  
  222
  
    
            future_qs = models.Holiday.objects \


  		




  
  223
  
    
                    .for_period(start_date, end_date) \


  		




  
  224
  
    
                    .for_service_workers(self.service)


  		




  
  225
  
    
            annual_qs = annual_qs.for_period(start_date, end_date)


  		




  228
  226
  
    
            current_qs = []


  		




  229
  227
  
    
        ctx['current_holidays'] = current_qs


  		




  230
  228
  
    
        future_holidays = defaultdict(lambda:[])


  		












Also available in:  Unified diff