Révision ae79c334
Ajouté par Serghei Mihai il y a presque 10 ans
| calebasse/agenda/views.py | ||
|---|---|---|
| 630 | 630 |
|
| 631 | 631 |
if events: |
| 632 | 632 |
for event in events: |
| 633 |
if event.start_datetime <= start_datetime and event.end_datetime >= end_datetime: |
|
| 633 |
overlap_events = Event.objects.overlap_occurences(start_datetime, events) |
|
| 634 |
if len(overlap_events) > 1: |
|
| 635 |
dispo = 'overlap' |
|
| 636 |
elif event.start_datetime <= start_datetime and event.end_datetime >= end_datetime: |
|
| 634 | 637 |
dispo = 'busy' |
| 635 |
crossed_events = filter(lambda e: e.start_datetime <= start_datetime and e.end_datetime >= end_datetime, events) |
|
| 636 |
if len(crossed_events) > 1: |
|
| 637 |
dispo = 'common' |
|
| 638 | 638 |
disponibility[start_datetime.hour][quarter].append((mins, {'id': ressource_id, 'dispo': dispo}))
|
| 639 | 639 |
quarter += 1 |
| 640 | 640 |
start_datetime += datetime.timedelta(minutes=15) |
Formats disponibles : Unified diff
agenda: overlapping events marked in the availability bars
Closes #4143