remove dev code

diff --git a/teleforma/models/appointment.py b/teleforma/models/appointment.py
index 49921dd2472afdc77bb9437a54ca0e68b6a6a3ff..eb3650c16d21f6db3f76223cf5d8f24d336ff98c 100644 (file)
--- a/teleforma/models/appointment.py
+++ b/teleforma/models/appointment.py
@@ -175,7 +175,7 @@ class AppointmentSlot(Model):
                             related_name = 'slots',
                             verbose_name = 'jour')
 
-    start = models.TimeField('heure du premier créneau')
+    start = models.TimeField("heure du premier créneau (heure d'arrivée)")
     nb = models.IntegerField('nombre de créneaux')
 
     def __unicode__(self):
@@ -204,10 +204,11 @@ class AppointmentSlot(Model):
 
 
         for i in range(self.nb):
-            # for jury in self.
-            start = datetime.datetime.combine(self.day.date, self.start) + datetime.timedelta(minutes = i * size)
+            # for jury in self
+            arrival = datetime.datetime.combine(self.day.date, self.start) + datetime.timedelta(minutes = i * size)
+            start = arrival + datetime.timedelta(minutes = 60)
             end = start + datetime.timedelta(minutes = size)
-            arrival = start - datetime.timedelta(minutes = 60)
+
             slot_info = {
                 'slot_nb':i,
                 'start':start,
@@ -278,9 +279,7 @@ class Appointment(Model):
 
     @property
     def start(self):
-        start = self.slot.start
-        delta = self.slot_nb * self.period.appointment_slot_size
-        dt = datetime.datetime.combine(datetime.date.today(), start) + datetime.timedelta(minutes=delta)
+        dt = datetime.datetime.combine(datetime.date.today(), self.arrival) + datetime.timedelta(minutes=60)
         return datetime.time(dt.hour, dt.minute, 0)
 
     @property
@@ -290,12 +289,14 @@ class Appointment(Model):
 
     @property
     def arrival(self):
-        dt = datetime.datetime.combine(datetime.date.today(), self.start) - datetime.timedelta(minutes=60)
+        start = self.slot.start
+        delta = self.slot_nb * self.period.appointment_slot_size
+        dt = datetime.datetime.combine(datetime.date.today(), start) + datetime.timedelta(minutes=delta)
         return datetime.time(dt.hour, dt.minute, 0)
 
     @property
     def real_date(self):
-        return datetime.datetime.combine(self.day.date, self.start)
+        return datetime.datetime.combine(self.day.date, self.arrival)
 
     @property
     def real_date_human(self):

diff --git a/teleforma/views/appointment.py b/teleforma/views/appointment.py
index df7fa7e6ac18c2d3ffc619c46f25b10a2047e356..aba27107e879999609135401eb1cba537c267e31 100644 (file)
--- a/teleforma/views/appointment.py
+++ b/teleforma/views/appointment.py
@@ -128,8 +128,8 @@ class Appointments(View):
                  'student': ap.student,
                  'main_text': ap.period.appointment_mail_text }
         # DEBUG
-        data['mto'] = "gael@pilotsystems.net"
-        data['mto'] = "dorothee.lavalle@pre-barreau.com"
+        #data['mto'] = "gael@pilotsystems.net"
+        #data['mto'] = "dorothee.lavalle@pre-barreau.com"
 
         subject_template = 'teleforma/messages/email_appointment_sujet.txt'
         message_template = 'teleforma/messages/email_appointment.txt'