Project

General

Profile

« Previous | Next » 

Revision 92ea6229

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

Enable django debug toolbar and improve agenda view

View differences:

calebasse/agenda/views.py
35 35 
                '6': u'samedi'
36 36 
                }
37 37 
        weekday = weekday_mapping[context['date'].strftime("%w")]
38 
        time_tables = TimeTable.objects.select_related().\
38 
        time_tables = TimeTable.objects.select_related('worker').\
39 39 
                filter(service=self.service).\
40 40 
                filter(weekday=weekday).\
41 41 
                filter(start_date__lte=context['date']).\
......
54 54 

  		




  55
  55
  
    
        for worker in workers:


  		




  56
  56
  
    
            time_tables_worker = [tt for tt in time_tables if tt.worker.id == worker.id]


  		




  57
  
  
    
            occurrences_worker = [o for o in occurrences for id in o.event.participants.values_list('id') if id[0] == worker.id]


  		




  
  57
  
    
            occurrences_worker = [o for o in occurrences if worker.id in o.event.participants.values_list('id', flat=True)]


  		




  58
  58
  
    
            context['workers_agenda'].append({'worker': worker,


  		




  59
  59
  
    
                    'appointments': get_daily_appointments(context['date'], worker, self.service,


  		




  60
  60
  
    
                        time_tables_worker, occurrences_worker)})


  		












Also available in:  Unified diff