/ - Diff - Calebasse - Redmine Entr’ouvert

         def clean(self):
             cleaned_data = super(HolidaySearchForm, self).clean()
             if cleaned_data.get('start_date') or cleaned_data.get('end_date'):
                 if not cleaned_data.get('start_date') \
                        or not cleaned_data.get('end_date'):
                     raise forms.ValidationError(u'Vous devez fournir une date de début et de fin')
             if cleaned_data.get('start_date') and cleaned_data.get('end_date'):
                 if cleaned_data['start_date'] > cleaned_data['end_date']:
                     raise forms.ValidationError(u'La date de début doit être supérieure à la date de fin')
             return cleaned_data

                               |models.Q(service__isnull=True))
         def for_service_workers(self, service):
             return self.filter(worker__services=service)
             return self.filter(models.Q(worker__services=service)
                     |models.Q(service=service)
                     |models.Q(worker__isnull=True, service__isnull=True))
         def future(self):
             return self.filter(end_date__gte=date.today())
-...
                     ret += u" (jusqu'à {0})".format(time2french(self.end_time))
             return ret
         def to_interval(self, date):
         def to_interval(self, date=None):
             if date == self.start_date:
                 start_time = self.start_time or datetime_time(8, 0)
             else:

       <h4>En cours</h4>
       <ul>
         {% for holiday in current_holidays %}
         <li><a href="{% url 'worker_update' service=service pk=holiday.worker.pk %}">
             <span class="lastname">{{ holiday.worker.last_name }}</span> {{holiday.worker.first_name }}</a>,
             {{ holiday }}</li>
         {% for holiday in current_holidays|dictsort:"worker" %}
           <li><a href="{{ holiday.url }}">{{ holiday.worker }} {{ holiday.holiday }}</a></li>
         {% endfor %}
       </ul>
     {% endif %}
-...
       <h4>À venir (jusqu'au {{ end_date|date:"d/m/Y" }})</h4>
       <table id="conges-a-venir">
         <thead>
           <tr>
             {% for month in future_holidays %}
               <th>{{ month.date|date:"F"|capfirst }}</th>
             {% endfor %}
           </tr>
         </thead>
         <tbody>
           <tr>
             {% for month in future_holidays %}
               <td>
                 <ul>
                   {% for holiday in month.holidays %}
                   <li><a href="{% url 'worker_update' service=service pk=holiday.worker.pk %}">
                       <span class="lastname">{{ holiday.worker.last_name }}</span> {{holiday.worker.first_name }}</a>,
                       {{ holiday }}</li>
                   {% endfor %}
                 </ul>
               </td>
             {% endfor %}
           </tr>
         </tbody>
         {% for months in future_holidays %}
           <thead>
             <tr>
               {% for future in months %}
                 <th>{{ future.month|capfirst }}</th>
               {% endfor %}
             </tr>
           </thead>
           <tbody>
             <tr>
               {% for future in months %}
                 <td>
                   <ul>
                     {% for holiday in future.holidays|dictsort:"worker" %}
                       <li>
                         <a href="{{ holiday.url }}">
                           {{ holiday.worker }} {{ holiday.holiday }}
                         </a>
                       </li>
                     {% endfor %}
                   </ul>
                 </td>
               {% endfor %}
             </tr>
           </tbody>
        {% endfor %}
       </table>
     {% endif %}
-...
       <form>
         {{ search_form.non_field_errors }}
         {{ search_form.start_date.errors }}
         {{ search_form.end_date.errors }}
         <p>Afficher la liste des congés pris entre
           <span id="start-date-datepicker" data-number-of-months="3" data-before-selector="#end-date-datepicker" class="datepicker">{{ search_form.start_date }}</span>
           et

         url(r'^new/$', 'worker_new'),
         url(r'^(?P<pk>\d+)/$', 'worker_update', name='worker_update'),
         url(r'^(?P<pk>\d+)/delete/$', 'worker_delete'),
         url(r'^(?P<pk>\d+)/holidays/$', 'worker_holidays_update'),
         url(r'^(?P<pk>\d+)/holidays/$', 'worker_holidays_update',
             name='worker-holidays-update'),
         url(r'^(?P<pk>\d+)/(?P<weekday>\d)/$', 'worker_schedule_update'),
+    )
     holidays_patterns = patterns('calebasse.personnes.views',
         url(r'^$', 'holiday_listing'),
         url(r'^groupe/$', 'group_holiday_update'))
         url(r'^groupe/$', 'group_holiday_update',
             name='group-holiday-update'))
     urlpatterns = patterns('calebasse.personnes.views',
         url(r'^$', 'homepage'),

     # -*- coding: utf-8 -*-
     from collections import defaultdict
     from datetime import date
     from interval import IntervalSet
     from dateutil.relativedelta import relativedelta
-...
     from django.db.models import Q
     from django.contrib.auth.models import User
     from django.contrib import messages
     from django.core.urlresolvers import reverse
     from calebasse import cbv, models as cb_models
     from calebasse.ressources.models import Service
-...
         def get_context_data(self, **kwargs):
             ctx = super(HolidayView, self).get_context_data(**kwargs)
             end_date = date.today() + relativedelta(months=self.months)
             qs = models.Holiday.objects.future().select_related('worker')
             form = forms.HolidaySearchForm(data=self.request.GET)
             today = date.today()
             future_qs = qs.for_period(today, end_date).select_related('worker')
             group_qs = models.Holiday.objects.for_service(self.service).select_related()
             current_qs = qs.today()
             form = self.get_form()
             if form.is_valid() and form.cleaned_data.get('start_date'):
                 cleaned_data = form.cleaned_data
                 start_date = cleaned_data['start_date']
                 end_date = cleaned_data['end_date']
                 future_qs = models.Holiday.objects \
                         .for_period(start_date, end_date) \
                         .for_service_workers(self.service)
                 group_qs = group_qs.for_period(start_date, end_date)
                 current_qs = []
             ctx['end_date'] = end_date
             ctx['current_holidays'] = current_qs
             future_holidays = defaultdict(lambda:[])
             for holiday in future_qs:
                 key = (holiday.start_date.year, holiday.start_date.month, holiday.start_date.strftime('%B'))
                 future_holidays[key].append(holiday)
             ctx['future_holidays'] = [ {
                 'date': date(day=1, month=key[1], year=key[0]),
                 'holidays': future_holidays[key]
               } for key in sorted(future_holidays.keys()) ]
             ctx['group_holidays'] = group_qs.order_by('-start_date')
             filter_start_date = today
             filter_end_date = date.today() + relativedelta(months=self.months)
             if form.is_valid():
                 if form.cleaned_data.get('start_date'):
                     filter_start_date = form.cleaned_data.get('start_date')
                 if form.cleaned_data.get('end_date'):
                     filter_end_date = form.cleaned_data.get('end_date')
             workers = models.Worker.objects.filter(enabled=True)
             holidays = models.Holiday.objects \
                     .filter(end_date__gte=filter_start_date,
                             start_date__lte=filter_end_date) \
                     .select_related('worker', 'service')
             holiday_by_worker = defaultdict(lambda: [])
             all_holidays = holidays.filter(worker__isnull=True)
             for worker in workers:
                 holiday_by_worker[worker] = list(all_holidays)
             for holiday in holidays.filter(worker__isnull=False):
                 holiday_by_worker[holiday.worker].append(holiday)
             def holiday_url(holiday):
                 if holiday.worker:
                     return reverse('worker-holidays-update', kwargs=dict(
                         service=self.service.slug, pk=holiday.worker.pk))
                 else:
                     slug = holiday.service.slug if holiday.service else self.service.slug
                     return reverse('group-holiday-update', kwargs=dict(
                         service=slug))
             currents = []
             futures = defaultdict(lambda: [])
             for worker, holidays in holiday_by_worker.iteritems():
                 for holiday in holidays:
                     url = holiday_url(holiday)
                     holiday_tpl = dict(worker=worker.display_name, holiday=holiday, url=url)
                     if holiday.start_date <= today <= holiday.end_date:
                         currents.append(holiday_tpl)
                     start_date = max(holiday.start_date, filter_start_date)
                     month_name = start_date.strftime('%B')
                     key = start_date.year, start_date.month, month_name
                     futures[key].append(holiday_tpl)
             future_holidays = []
             for key in sorted(futures.keys()):
                 future_holidays.append(dict(
                     month=key[2],
                     holidays=futures[key]))
             future_holidays2 = []
             for i in range(0, len(future_holidays), 2):
                 future_holidays2.append(future_holidays[i:i+2])
             ctx['end_date'] = filter_end_date
             ctx['current_holidays'] = currents
             ctx['future_holidays'] = future_holidays2
             ctx['group_holidays'] = all_holidays.order_by('-start_date')
             ctx['search_form'] = form
             return ctx

Project

General

Profile

Produits Entr'ouvert » Calebasse

Revision 84614733

Added by Benjamin Dauvergne over 12 years ago