Project

General

Profile

« Previous | Next » 

Revision 54e6ef3d

Added by Serghei Mihai almost 11 years ago

personnes: holidays from foreign services marked gray and services icons displayed

Closes #4114

View differences:

calebasse/agenda/appointments.py
114 114

  
115 115
    def init_busy_time(self, title, length, begin_time, description=None):
116 116
        self.title = title
117
        self.type = "busy-here"
118 117
        self.length = length
119 118
        self.__set_time(begin_time)
120 119
        self.description = description
......
169 168
                    delta_minutes,
170 169
                    time(interval.lower_bound.hour, interval.lower_bound.minute),
171 170
                    description=holiday.comment)
171
        services = holiday.services.all()
172
        if service not in services:
173
            appointment.type = 'busy-elsewhere'
174
            appointment.other_services_names = [s.slug for s in services]
172 175
        appointments.append(appointment)
173 176
    for time_table in time_tables:
174 177
        interval_set = IntervalSet.between(time_table.to_interval(date).lower_bound.time(),

Also available in: Unified diff