Projet

Général

Profil

0001-agenda-displaying-overlapping-appointments-is-a-serv.patch

Serghei Mihai, 16 septembre 2014 09:58

Télécharger (2,84 ko)

Voir les différences: 

Subject: [PATCH] agenda: displaying overlapping appointments is a service
 option

Closes #5459

 calebasse/agenda/managers.py | 6 +++++-
 calebasse/agenda/views.py    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
calebasse/agenda/managers.py
7 7 

  		




  8
  8
  
    
from calebasse.agenda.conf import default

  		




  9
  9
  
    
from calebasse.utils import weeks_since_epoch, weekday_ranks

  		




  
  10
  
    
from calebasse.utils import get_service_setting

  		




  10
  11
  
    
from calebasse import agenda

  		




  11
  12
  
    

  		




  12
  13
  
    
__all__ = (

  		




  ......




  78
  79
  
    
                quarter = 0

  		




  79
  80
  
    
            interval = IntervalSet.between(start_datetime, end_datetime, False)

  		




  80
  81
  
    
            mins = quarter * 15

  		




  81
  
  
    
            crossed_events = self.overlap_occurences(start_datetime, events)

  		




  
  82
  
    
            if get_service_setting('show_overlapping_appointments'):

  		




  
  83
  
    
                crossed_events = self.overlap_occurences(start_datetime, events)

  		




  
  84
  
    
            else:

  		




  
  85
  
    
                crossed_events = []

  		




  82
  86
  
    
            if len(crossed_events) > 1:

  		




  83
  87
  
    
                result[start_datetime.hour][quarter].append((mins, {'id': participant.id, 'dispo': 'overlap'}))

  		




  84
  88
  
    
            elif interval.intersection(events_intervals):

  		












  

    
      calebasse/agenda/views.py
    
  





  22
  22
  
    
from calebasse.actes.models import Act, ValidationMessage

  		




  23
  23
  
    
from calebasse.actes.validation import (automated_validation, unlock_all_acts_of_the_day)

  		




  24
  24
  
    
from calebasse import cbv

  		




  
  25
  
    
from calebasse.utils import get_service_setting

  		




  25
  26
  
    

  		




  26
  27
  
    
from calebasse.agenda.forms import (NewAppointmentForm, NewEventForm, UpdatePeriodicAppointmentForm,

  		




  27
  28
  
    
        DisablePatientAppointmentForm, UpdateAppointmentForm, UpdatePeriodicEventForm,

  		




  ......




  614
  615
  
    

  		




  615
  616
  
    
            if events:

  		




  616
  617
  
    
                for event in events:

  		




  617
  
  
    
                    overlap_events = Event.objects.overlap_occurences(start_datetime, events)

  		




  
  618
  
    
                    if get_service_setting('show_overlapping_appointments'):

  		




  
  619
  
    
                        overlap_events = Event.objects.overlap_occurences(start_datetime, events)

  		




  
  620
  
    
                    else:

  		




  
  621
  
    
                        overlap_events = []

  		




  618
  622
  
    
                    if len(overlap_events) > 1:

  		




  619
  623
  
    
                        dispo = 'overlap'

  		




  620
  624
  
    
                    elif event.start_datetime <= start_datetime and event.end_datetime >= end_datetime:

  		




  621
  
  
    
-