Revision a5bdc8ec
Added by Benjamin Dauvergne over 12 years ago
| 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: |
Also available in: Unified diff
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).