Projet

Général

Profil

« Précédent | Suivant » 

Révision 7a2fc3bb

Ajouté par Serghei Mihai il y a presque 10 ans

agenda: overlapping events taking in account absent act states

Voir les différences:

calebasse/agenda/managers.py
102 102
        date_time = date_time or datetime.now()
103 103
        if events is None:
104 104
            events = self.today_occurrences(date_time.date())
105
        overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time, events)
105
        overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time \
106
                         and not e.is_absent(), events)
106 107
        same_type_events = []
107 108
        different_overlap = []
108 109
        for event in overlap:
calebasse/agenda/models.py
449 449
            parts.append(self.recurrence_end_date.strftime('%d/%m/%Y'))
450 450
        return u' '.join(parts)
451 451

  
452
    def is_absent(self):
453
        try:
454
            return self.eventwithact.is_absent()
455
        except self.DoesNotExist:
456
            return False
457

  
452 458
    def __unicode__(self):
453 459
        return self.title
454 460

  

Formats disponibles : Unified diff