Révision 055d68a5
Ajouté par Serghei Mihai il y a plus de 9 ans
| calebasse/agenda/managers.py | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
from calebasse.agenda.conf import default |
| 9 | 9 |
from calebasse.utils import weeks_since_epoch, weekday_ranks |
| 10 |
from calebasse.utils import get_service_setting |
|
| 10 | 11 |
from calebasse import agenda |
| 11 | 12 |
|
| 12 | 13 |
__all__ = ( |
| ... | ... | |
| 78 | 79 |
quarter = 0 |
| 79 | 80 |
interval = IntervalSet.between(start_datetime, end_datetime, False) |
| 80 | 81 |
mins = quarter * 15 |
| 81 |
crossed_events = self.overlap_occurences(start_datetime, events) |
|
| 82 |
if get_service_setting('show_overlapping_appointments'):
|
|
| 83 |
crossed_events = self.overlap_occurences(start_datetime, events) |
|
| 84 |
else: |
|
| 85 |
crossed_events = [] |
|
| 82 | 86 |
if len(crossed_events) > 1: |
| 83 | 87 |
result[start_datetime.hour][quarter].append((mins, {'id': participant.id, 'dispo': 'overlap'}))
|
| 84 | 88 |
elif interval.intersection(events_intervals): |
Formats disponibles : Unified diff
agenda: displaying overlapping appointments is a service option
Closes #5459