From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Wed, 26 Sep 2018 15:31:39 +0000 (+0200)
Subject: remove dev code
X-Git-Tag: 1.4.0~39^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c98e9a79a451d44eeb2f6d109d4101050cf11ac;p=teleforma.git

remove dev code
---

diff --git a/teleforma/models/appointment.py b/teleforma/models/appointment.py
index 49921dd2..eb3650c1 100644
--- 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 df7fa7e6..aba27107 100644
--- 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'