web/views/timetable.py
branchstable
changeset 3917 0f912c1cde28
parent 3914 36be7a5e53ad
child 3998 94cc7cad3d2d
child 4212 ab6573088b4a
equal deleted inserted replaced
3916:6e7af0e8e524 3917:0f912c1cde28
     8 
     8 
     9 from logilab.mtconverter import xml_escape
     9 from logilab.mtconverter import xml_escape
    10 
    10 
    11 from cubicweb.interfaces import ITimetableViews
    11 from cubicweb.interfaces import ITimetableViews
    12 from cubicweb.selectors import implements
    12 from cubicweb.selectors import implements
    13 from cubicweb.utils import date_range
    13 from cubicweb.utils import date_range, todatetime
    14 from cubicweb.view import AnyRsetView
    14 from cubicweb.view import AnyRsetView
    15 
    15 
    16 
    16 
    17 class _TaskEntry(object):
    17 class _TaskEntry(object):
    18     def __init__(self, task, color, column):
    18     def __init__(self, task, color, column):
    53             elif task.start:
    53             elif task.start:
    54                 the_dates.append(task.start)
    54                 the_dates.append(task.start)
    55             elif task.stop:
    55             elif task.stop:
    56                 the_dates.append(task.stop)
    56                 the_dates.append(task.stop)
    57             for d in the_dates:
    57             for d in the_dates:
       
    58                 d = todatetime(d)
    58                 d_users = dates.setdefault(d, {})
    59                 d_users = dates.setdefault(d, {})
    59                 u_tasks = d_users.setdefault(user, set())
    60                 u_tasks = d_users.setdefault(user, set())
    60                 u_tasks.add( task )
    61                 u_tasks.add( task )
    61                 task_max = users_max.setdefault(user, 0)
    62                 task_max = users_max.setdefault(user, 0)
    62                 if len(u_tasks)>task_max:
    63                 if len(u_tasks)>task_max: