Revision 84614733
Added by Benjamin Dauvergne over 12 years ago
| calebasse/personnes/models.py | ||
|---|---|---|
| 356 | 356 |
|models.Q(service__isnull=True)) |
| 357 | 357 |
|
| 358 | 358 |
def for_service_workers(self, service): |
| 359 |
return self.filter(worker__services=service) |
|
| 359 |
return self.filter(models.Q(worker__services=service) |
|
| 360 |
|models.Q(service=service) |
|
| 361 |
|models.Q(worker__isnull=True, service__isnull=True)) |
|
| 360 | 362 |
|
| 361 | 363 |
def future(self): |
| 362 | 364 |
return self.filter(end_date__gte=date.today()) |
| ... | ... | |
| 418 | 420 |
ret += u" (jusqu'Ã {0})".format(time2french(self.end_time))
|
| 419 | 421 |
return ret |
| 420 | 422 |
|
| 421 |
def to_interval(self, date): |
|
| 423 |
def to_interval(self, date=None):
|
|
| 422 | 424 |
if date == self.start_date: |
| 423 | 425 |
start_time = self.start_time or datetime_time(8, 0) |
| 424 | 426 |
else: |
Also available in: Unified diff
personnes: rewrite holidays view (fixes #2308)