Project

General

Profile

« Previous | Next » 

Revision 9edb5f60

Added by Mikaël Ates over 12 years ago

personnes: Enhance holiday management pages.

View differences:

calebasse/personnes/views.py
224 224
        qs = models.Holiday.objects.for_service_workers(self.service).future()
225 225
        today = date.today()
226 226
        future_qs = qs.for_period(today, end_date)
227
        annual_qs = models.Holiday.objects.for_service(self.service)
227
        group_qs = models.Holiday.objects.for_service(self.service)
228 228
        current_qs = qs.today()
229 229
        form = self.get_form()
230 230
        if form.is_valid() and form.cleaned_data.get('start_date'):
......
234 234
            future_qs = models.Holiday.objects \
235 235
                    .for_period(start_date, end_date) \
236 236
                    .for_service_workers(self.service)
237
            annual_qs = annual_qs.for_period(start_date, end_date)
237
            group_qs = group_qs.for_period(start_date, end_date)
238 238
            current_qs = []
239 239
        ctx['current_holidays'] = current_qs
240 240
        future_holidays = defaultdict(lambda:[])
......
245 245
            'date': date(day=1, month=key[1], year=key[0]),
246 246
            'holidays': future_holidays[key]
247 247
          } for key in sorted(future_holidays.keys()) ]
248
        ctx['annual_holidays'] = annual_qs
248
        ctx['group_holidays'] = group_qs.order_by('-start_date')
249 249
        ctx['search_form'] = form
250 250
        return ctx
251 251

  
......
253 253
holiday_listing = HolidayView.as_view()
254 254

  
255 255

  
256
class YearlyHolidayUpdateView(cbv.FormView):
257
    form_class = forms.YearlyHolidayFormSet
258
    template_name = 'personnes/yearly_holiday_update.html'
256
class GroupHolidayUpdateView(cbv.FormView):
257
    form_class = forms.GroupHolidayFormSet
258
    template_name = 'personnes/group_holiday_update.html'
259 259
    success_url = '.'
260 260

  
261 261
    def get_form_kwargs(self):
262
        kwargs = super(YearlyHolidayUpdateView, self).get_form_kwargs()
262
        kwargs = super(GroupHolidayUpdateView, self).get_form_kwargs()
263 263
        qs = models.Holiday.objects.for_service(self.service)
264 264
        kwargs['queryset'] = qs
265 265
        kwargs['service'] = self.service
......
267 267

  
268 268
    def form_valid(self, form):
269 269
        form.save()
270
        return super(YearlyHolidayUpdateView, self).form_valid(form)
270
        return super(GroupHolidayUpdateView, self).form_valid(form)
271 271

  
272 272

  
273
yearly_holiday_update = YearlyHolidayUpdateView.as_view()
273
group_holiday_update = GroupHolidayUpdateView.as_view()

Also available in: Unified diff