Fixes #697

Author: BrunoSpy

module/Administration/view/administration/op-sups/index.phtml

@@ -11,6 +11,16 @@ $formatterHour = \IntlDateFormatter::create(
     'HH:mm'
 );
 
+$formatterHourLoc = \IntlDateFormatter::create(
+    \Locale::getDefault(),
+    \IntlDateFormatter::FULL,
+    \IntlDateFormatter::FULL,
+    new \DateTimeZone('Europe/Paris'),
+    \IntlDateFormatter::GREGORIAN,
+    'HH:mm'
+);
+
+
 ?>
 
 <div class="container-fluid">
@@ -100,7 +110,7 @@ $formatterHour = \IntlDateFormatter::create(
                         <th>Id</th>
                         <th data-sort="string" data-autosort="true">Type</th>
                         <th data-sort="string">Zone qualif.</th>
-                        <th>Heure</th>
+                        <th>Heure locale</th>
                         <th><a class="btn btn-xs btn-primary" href="#shifthour-container" data-toggle="modal" id="add-shifthour">Ajouter</a></th>
                     </tr>
                     </thead>
@@ -111,7 +121,7 @@ $formatterHour = \IntlDateFormatter::create(
                         echo '<td>' . $shifthour->getId() . '</td>';
                         echo '<td>' . $shifthour->getOpsuptype()->getName() . '</td>';
                         echo '<td>' . ($shifthour->getQualificationzone() == null ? '' : $shifthour->getQualificationzone()->getName()) . '</td>';
-                        echo '<td>' . $formatterHour->format($shifthour->getHour()) . '</td>';
+                        echo '<td>' . $formatterHourLoc->format($shifthour->getHour()) . '</td>';
                         echo '<td>';
                         echo "<a 
                                 title=\"Modifier\" 

module/Application/src/Application/Controller/EventsController.php

@@ -2314,15 +2314,15 @@ public function getshifthoursAction() {
                                         'id' => $shifthour->getId(),
                                         'name' => $shifthour->getOpSupType()->getName(),
                                         'zone' => $shifthour->getQualificationZone()->getName(),
-                                        'hour' => $shifthour->getFormattedHour()
+                                        'hour' => $shifthour->getFormattedHourUTC()
                                 );
                             }
                         } else {
                             $shifthours[] = array(
                                     'id' => $shifthour->getId(),
                                     'name' => $shifthour->getOpSupType()->getName(),
                                     'zone' => '',
-                                    'hour' => $shifthour->getFormattedHour()
+                                    'hour' => $shifthour->getFormattedHourUTC()
                             );
                         }
                         //inutile de vérifier les autres rôles

module/Application/src/Application/Entity/ShiftHour.php

@@ -66,6 +66,7 @@ class ShiftHour
      * @Annotation\Type("Zend\Form\Element\Text") //type=time not supported by Firefox...
      * @Annotation\Required(true)
      * @Annotation\Options({"label":"Heure", "format" : "H:i"})
+     * @Annotation\Attributes({"placeholder":"Heure locale Europe/Paris"})
      */
     protected $hour;
 
@@ -96,10 +97,25 @@ public function setQualificationzone($qualificationzone)
 
     public function getHour()
     {
-        return $this->hour;
+        $datetime = new \DateTime();
+        $datetime->setTime($this->hour->format('H'), $this->hour->format('i'));
+        return $datetime;
     }
 
     public function getFormattedHour() {
+        $formatterHour = \IntlDateFormatter::create(
+            \Locale::getDefault(),
+            \IntlDateFormatter::FULL,
+            \IntlDateFormatter::FULL,
+            new \DateTimeZone('Europe/Paris'),
+            \IntlDateFormatter::GREGORIAN,
+            'HH:mm'
+        );
+        return $formatterHour->format($this->getHour());
+    }
+
+    public function getFormattedHourUTC() {
+        error_log(print_r($this->getHour(), true));
         $formatterHour = \IntlDateFormatter::create(
             \Locale::getDefault(),
             \IntlDateFormatter::FULL,
@@ -119,7 +135,7 @@ public function setHour($hour)
     /**
      * @ORM\PostLoad
      */
-    public function doCorrectUTC()
+/*    public function doCorrectUTC()
     {
         // les dates sont stockées sans information de timezone, on considère par convention qu'elles sont en UTC
         // mais à la création php les crée en temps local, il faut donc les corriger
@@ -128,7 +144,7 @@ public function doCorrectUTC()
             $this->hour->setTimezone(new \DateTimeZone("UTC"));
             $this->hour->add(new \DateInterval("PT" . $offset . "S"));
         }
-    }
+    }*/
 
     public function getArrayCopy()
     {