Project

General

Profile

« Previous | Next » 

Revision ad9330e1

Added by Jérôme Schneider over 12 years ago

agenda: add display for service activity

View differences:

calebasse/agenda/managers.py
82 82

  
83 83
class OccurrenceManager(models.Manager):
84 84

  
85
    def daily_occurrences(self, date=None, participants=None, services=None):
85
    def daily_occurrences(self, date=None, participants=None, services=None,
86
            event_type=None):
86 87
        '''
87 88
        Returns a queryset of for instances that have any overlap with a 
88 89
        particular day.
......
113 114
        if participants:
114 115
            qs = qs.filter(event__participants__in=participants)
115 116
        if services:
116
            qs = qs.filter(services__in=services)
117
            qs = qs.filter(event__services__in=services)
118
        if event_type:
119
            qs = qs.filter(event__event_type=event_type)
117 120
        return qs
118 121

  
119 122
    def daily_disponiblity(self, date, occurrences, participants):
......
145 148
            start_datetime += timedelta(minutes=15)
146 149
            end_datetime += timedelta(minutes=15)
147 150
        return result
151

  

Also available in: Unified diff