Fix ordering, display

elefan-grenoble · Sep 7, 2023 · 47eb348 · 47eb348
1 parent 36ae029
commit 47eb348
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/app/Resources/views/admin/openinghour/kind/_partial/card.html.twig b/app/Resources/views/admin/openinghour/kind/_partial/card.html.twig
@@ -1,6 +1,12 @@
 {% set openingHourJoinString = "&" %}
 
 <div class="card-panel">
-    <p style="margin-top:0;text-align:center;">{{ openingHourKind.name }}</p>
+    <p style="margin-top:0;text-align:center;">
+        {{ openingHourKind.name }}
+        {% if openingHourKind.startDate and openingHourKind.endDate %}
+            <br />
+            <i>du {{ openingHourKind.startDate | date_fr_long }} au {{ openingHourKind.endDate | date_fr_long }}</i>
+        {% endif %}
+    </p>
     {% include "/admin/openinghour/_partial/table.html.twig" with { openingHours: openingHourKind.openingHours } %}
 </div>
diff --git a/app/Resources/views/openinghour/_partial/widget.html.twig b/app/Resources/views/openinghour/_partial/widget.html.twig
@@ -8,7 +8,8 @@
     <p style="margin-top:0;{% if align != "left" %}text-align:center;"{% endif %}>
         {{ openingHourKind.name }}
         {% if openingHourKind.startDate and openingHourKind.endDate %}
-            (du {{ openingHourKind.startDate | date_fr_long }} au {{ openingHourKind.endDate | date_fr_long }})
+            <br />
+            <i>du {{ openingHourKind.startDate | date_fr_long }} au {{ openingHourKind.endDate | date_fr_long }}
         {% endif %}
     </p>
 {% endif %}

diff --git a/src/AppBundle/Controller/AdminOpeningHourController.php b/src/AppBundle/Controller/AdminOpeningHourController.php
@@ -89,22 +89,18 @@ public function editAction(Request $request, OpeningHour $openingHour)
         $form = $this->createForm(OpeningHourType::class, $openingHour);
         $form->handleRequest($request);
 
-        $closed = $form->get('closed');
+        $closed = $form->get('closed')->getData();
 
         if ($request->isMethod('GET')) {
-            if (!$closed) {
-                $form->get('start')->setData($openingHour->getStart()->format('H:i'));
-                $form->get('end')->setData($openingHour->getEnd()->format('H:i'));
-            }
+            $form->get('start')->setData($closed ? null : $openingHour->getStart()->format('H:i'));
+            $form->get('end')->setData($closed ? null : $openingHour->getEnd()->format('H:i'));
         }
 
         if ($form->isSubmitted() && $form->isValid()) {
-            if (!$closed) {
-                $start = $form->get('start')->getData();
-                $openingHour->setStart(new \DateTime($start));
-                $end = $form->get('end')->getData();
-                $openingHour->setEnd(new \DateTime($end));
-            }
+            $start = $form->get('start')->getData();
+            $end = $form->get('end')->getData();
+            $openingHour->setStart($closed ? null : new \DateTime($start));
+            $openingHour->setEnd($closed ? null : new \DateTime($end));
 
             $em->persist($openingHour);
             $em->flush();

diff --git a/src/AppBundle/Entity/OpeningHourKind.php b/src/AppBundle/Entity/OpeningHourKind.php
@@ -3,6 +3,7 @@
 namespace AppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Doctrine\ORM\Mapping\OrderBy;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
@@ -55,6 +56,7 @@ class OpeningHourKind
 
     /**
      * @ORM\OneToMany(targetEntity="OpeningHour", mappedBy="kind", cascade={"persist"})
+     * @OrderBy({"dayOfWeek" = "ASC", "start" = "ASC"})
      */
     private $openingHours;
 

diff --git a/src/AppBundle/Form/OpeningHourType.php b/src/AppBundle/Form/OpeningHourType.php
@@ -37,7 +37,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ))
             ->add('closed', CheckboxType::class, array(
                 'required' => false,
-                'data' => false,
                 'label' => 'Fermé ?',
                 'attr' => array('class' => 'filled-in')
             ))