Project

General

Profile

« Previous | Next » 

Revision 5c9550bf

Added by Serghei Mihai almost 11 years ago

agenda: holidays display for other services improved

Closes #4114

View differences:

calebasse/agenda/appointments.py
163 163
        delta = interval.upper_bound - interval.lower_bound
164 164
        delta_minutes = delta.seconds / 60
165 165
        appointment = Appointment()
166
        appointment.type = 'busy-here'
166 167
        label = u"Congé (%s)" % holiday.holiday_type.name
167 168
        appointment.init_holiday_time(label,
168 169
                    delta_minutes,
......
171 172
        services = holiday.services.all()
172 173
        if service not in services:
173 174
            appointment.type = 'busy-elsewhere'
174
            appointment.other_services_names = [s.slug for s in services]
175
        appointment.other_services_names = [s.slug for s in services]
175 176
        appointments.append(appointment)
176 177
    for time_table in time_tables:
177 178
        interval_set = IntervalSet.between(time_table.to_interval(date).lower_bound.time(),

Also available in: Unified diff