From a2d4159c88a94c3c8a4d6421b3026eac3cad77ff Mon Sep 17 00:00:00 2001
From: "valentin.wacker" <valentin.wacker@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Thu, 26 Oct 2017 07:05:31 +0000
Subject: [PATCH] #1352 - bisheriger aktueller Stand, vor CalenderDayState

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3354 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../default/admin/lodgingsEdit.html.twig      | 12 +++---
 .../views/default/admin/lodgingsNew.html.twig |  5 ++-
 .../default/admin/reservationsEdit.html.twig  |  2 +-
 .../default/admin/reservationsNew.html.twig   |  2 +-
 .../views/default/admin/seasons.html.twig     |  4 +-
 .../AppBundle/Controller/AdminController.php  |  4 +-
 trunk/src/AppBundle/Entity/FewoLodging.php    |  4 +-
 .../src/AppBundle/Entity/FewoReservation.php  |  2 +-
 trunk/src/AppBundle/Form/FewoLodgingType.php  | 38 +++++++++++++------
 .../AppBundle/Form/FewoReservationType.php    |  2 +
 10 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig
index a405f4c4..0a5d41f7 100644
--- a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig
+++ b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig
@@ -24,8 +24,9 @@
                     {{ form_row(form.city, {'label': 'Ort'}) }}
                     {{ form_row(form.maximumPersons, {'label': 'Maximale Personenanzahl'}) }}
                     {{ form_row(form.deposit, {'label': 'Kaution'}) }}
-                    {{ form_row(form.onlyWeekday, {'label': 'Exklusiver Wochentag'}) }}
+                    {#{{ form_row(form.onlyWeekday, {'label': 'Exklusiver Wochentag'}) }}#}
 
+                    {#
                     <div class="checkbox">
                         {{ form_widget(form.calendarVisible) }}
                         <label for="{{ form.calendarVisible.vars.id }}">
@@ -33,6 +34,7 @@
                         </label>
                         {{ form_errors(form.calendarVisible) }}
                     </div>
+                    #}
 
                     <br><br>
 
@@ -97,8 +99,8 @@
                             {% for lodgingPrice in lodging.prices %}
                                 <tr>
                                     <td>{{ lodgingPrice.season.name }}</td>
-                                    <td>{{ lodgingPrice.season.fromDate|date('d-m-y') }}</td>
-                                    <td>{{ lodgingPrice.season.toDate|date('d-m-y') }}</td>
+                                    <td>{{ lodgingPrice.season.fromDate|date('d.m.y') }}</td>
+                                    <td>{{ lodgingPrice.season.toDate|date('d.m.y') }}</td>
                                     <td>{{ lodgingPrice.season.minimumStay }}</td>
                                     <td>{{ lodgingPrice.perNight }}</td>
                                     <td>{{ lodgingPrice.flatPrice }}</td>
@@ -152,8 +154,8 @@
 
                             {% for lodgingReservation in lodging.reservations %}
                                 <tr>
-                                    <td>{{ lodgingReservation.fromDate|date('d-m-y') }}</td>
-                                    <td>{{ lodgingReservation.toDate|date('d-m-y') }}</td>
+                                    <td>{{ lodgingReservation.fromDate|date('d.m.y') }}</td>
+                                    <td>{{ lodgingReservation.toDate|date('d.m.y') }}</td>
                                     <td>
                                         {% if lodgingReservation.status == 0 %}
                                             belegt
diff --git a/trunk/app/Resources/views/default/admin/lodgingsNew.html.twig b/trunk/app/Resources/views/default/admin/lodgingsNew.html.twig
index e8add428..6b52113c 100644
--- a/trunk/app/Resources/views/default/admin/lodgingsNew.html.twig
+++ b/trunk/app/Resources/views/default/admin/lodgingsNew.html.twig
@@ -24,9 +24,9 @@
                     {{ form_row(form.city, {label: 'Ort'}) }}
                     {{ form_row(form.maximumPersons, {label: 'Maximale Personenanzahl'}) }}
                     {{ form_row(form.deposit, {label: 'Kaution'}) }}
-                    {{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}
-
+                    {#{{ form_row(form.onlyWeekday, {label: 'Exklusiver Wochentag'}) }}#}
 
+                    {#
                     <div class="checkbox">
                         {{ form_widget(form.calendarVisible) }}
                         <label for="{{ form.calendarVisible.vars.id }}">
@@ -34,6 +34,7 @@
                         </label>
                         {{ form_errors(form.calendarVisible) }}
                     </div>
+                    #}
 
                     <div class="col-md-12 col-sm-12 col-xs-12">
                         <button type="submit" value="SEND" id="submit"
diff --git a/trunk/app/Resources/views/default/admin/reservationsEdit.html.twig b/trunk/app/Resources/views/default/admin/reservationsEdit.html.twig
index 15d405d3..8331208a 100644
--- a/trunk/app/Resources/views/default/admin/reservationsEdit.html.twig
+++ b/trunk/app/Resources/views/default/admin/reservationsEdit.html.twig
@@ -44,7 +44,7 @@
                     {{ form_row(form.fromDate , {label: 'Von'}) }}
                     {{ form_row(form.toDate, {label: 'Bis'}) }}
                     {{ form_row(form.status, {label: 'Status'}) }}
-                    {{ form_row(form.type, {label: 'Typ'}) }}
+                    {#{{ form_row(form.type, {label: 'Typ'}) }}#}
 
                     <div class="col-md-12 col-sm-12 col-xs-12">
                         <button type="submit" value="SEND" id="submit"
diff --git a/trunk/app/Resources/views/default/admin/reservationsNew.html.twig b/trunk/app/Resources/views/default/admin/reservationsNew.html.twig
index 4a68df96..e74d9d84 100644
--- a/trunk/app/Resources/views/default/admin/reservationsNew.html.twig
+++ b/trunk/app/Resources/views/default/admin/reservationsNew.html.twig
@@ -44,7 +44,7 @@
                     {{ form_row(form.fromDate , {label: 'Von'}) }}
                     {{ form_row(form.toDate, {label: 'Bis'}) }}
                     {{ form_row(form.status, {label: 'Status'}) }}
-                    {{ form_row(form.type, {label: 'Typ'}) }}
+                    {#{{ form_row(form.type, {label: 'Typ'}) }}#}
 
                     <div class="col-md-12 col-sm-12 col-xs-12">
                         <button type="submit" value="SEND" id="submit"
diff --git a/trunk/app/Resources/views/default/admin/seasons.html.twig b/trunk/app/Resources/views/default/admin/seasons.html.twig
index 71cdf0f0..001a647a 100644
--- a/trunk/app/Resources/views/default/admin/seasons.html.twig
+++ b/trunk/app/Resources/views/default/admin/seasons.html.twig
@@ -22,8 +22,8 @@
                         {% for season in seasons %}
                             <tr>
                                 <td>{{ season.name }}</td>
-                                <td>{{ season.fromDate|date('d-m-y') }}</td>
-                                <td>{{ season.toDate|date('d-m-y') }}</td>
+                                <td>{{ season.fromDate|date('d.m.y') }}</td>
+                                <td>{{ season.toDate|date('d.m.y') }}</td>
                                 <td>
                                     <a href="{{ '/admin/fewo/seasons/' ~ season.id }}"
                                        class="btn btn-primary"
diff --git a/trunk/src/AppBundle/Controller/AdminController.php b/trunk/src/AppBundle/Controller/AdminController.php
index c25b34dc..aac45748 100644
--- a/trunk/src/AppBundle/Controller/AdminController.php
+++ b/trunk/src/AppBundle/Controller/AdminController.php
@@ -548,8 +548,6 @@ class AdminController extends Controller
      */
     public function adminFewoNewReservationWithStartingDayAction(Request $request, $lodgingId, $fromDate)
     {
-        //todo price -> season
-        //todo season.minimumStay
         $em = $this->getEntityManager();
         $fewoLodgingRepo = $em->getRepository('AppBundle:FewoLodging');
         $lodging = $fewoLodgingRepo->find($lodgingId);
@@ -608,6 +606,7 @@ class AdminController extends Controller
         $fewoReservationRepo = $em->getRepository('AppBundle:FewoReservation');
         $lodging = $fewoLodgingRepo->find($lodgingId);
         $reservation = $fewoReservationRepo->find($reservationId);
+        $reservation->setType(1);
         $fromDate = $reservation->getFromDate()->format('d.m.Y');
 
         $form = $this->createForm(FewoReservationType::class, $reservation, [
@@ -623,6 +622,7 @@ class AdminController extends Controller
 
         if ($request->getMethod() == 'POST' && $form->isValid())
         {
+            $reservation->setType(1); // 0 = Buchung; 1 = Händisch
             $em->flush();
 
             return $this->redirect('/admin/fewo/lodgings/'.$lodgingId);
diff --git a/trunk/src/AppBundle/Entity/FewoLodging.php b/trunk/src/AppBundle/Entity/FewoLodging.php
index 6ecc0f24..360858e5 100644
--- a/trunk/src/AppBundle/Entity/FewoLodging.php
+++ b/trunk/src/AppBundle/Entity/FewoLodging.php
@@ -128,7 +128,7 @@ class FewoLodging
     /**
      * @var integer
      *
-     * @ORM\Column(name="only_weekday", type="integer", nullable=false)
+     * @ORM\Column(name="only_weekday", type="integer", nullable=true)
      */
     private $onlyWeekday;
 
@@ -142,7 +142,7 @@ class FewoLodging
     /**
      * @var boolean
      *
-     * @ORM\Column(name="calendar_visible", type="boolean", nullable=false)
+     * @ORM\Column(name="calendar_visible", type="boolean", nullable=true)
      */
     private $calendarVisible;
 
diff --git a/trunk/src/AppBundle/Entity/FewoReservation.php b/trunk/src/AppBundle/Entity/FewoReservation.php
index 6a07afe7..7b954770 100644
--- a/trunk/src/AppBundle/Entity/FewoReservation.php
+++ b/trunk/src/AppBundle/Entity/FewoReservation.php
@@ -58,7 +58,7 @@ class FewoReservation
     /**
      * @var integer
      *
-     * @ORM\Column(name="type", type="integer", nullable=false)
+     * @ORM\Column(name="type", type="integer", nullable=true)
      */
     private $type;
 
diff --git a/trunk/src/AppBundle/Form/FewoLodgingType.php b/trunk/src/AppBundle/Form/FewoLodgingType.php
index bbc85032..246ba900 100644
--- a/trunk/src/AppBundle/Form/FewoLodgingType.php
+++ b/trunk/src/AppBundle/Form/FewoLodgingType.php
@@ -40,24 +40,40 @@ class FewoLodgingType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name')
-            ->add('description')
-            ->add('equipment')
-            ->add('adress1')
-            ->add('adress2')
-            ->add('zipCode')
-            ->add('city')
-            ->add('maximumPersons', TextType::class, [
-
+            ->add('name', null, [
+                'required' => true,
             ])
-            ->add('deposit')
+            ->add('description', null, [
+                'required' => true,
+            ])
+            ->add('equipment', null, [
+                'required' => true,
+            ])
+            ->add('adress1', null, [
+                'required' => true,
+            ])
+            ->add('adress2')
+            ->add('zipCode', null, [
+                'required' => true,
+            ])
+            ->add('city', null, [
+                'required' => true,
+            ])
+            ->add('maximumPersons', TextType::class, [
+                'required' => true,
+            ])
+            ->add('deposit', null, [
+                'required' => true,
+            ])
+            /*
             ->add('onlyWeekday', ChoiceType::class, [
                 'choices' => self::$WEEKDAY_CHOICES,
                 'constraints' => [
                     new Choice(['choices' => self::$WEEKDAY_CHOICES])
                 ]
             ])
-            ->add('calendarVisible')
+            */
+            //->add('calendarVisible')
             ->add('type', EntityType::class, [
                 'placeholder' => '(Bitte wählen) *',
                 'class' => 'AppBundle\Entity\FewoLodgingType',
diff --git a/trunk/src/AppBundle/Form/FewoReservationType.php b/trunk/src/AppBundle/Form/FewoReservationType.php
index 264cf136..015589ce 100644
--- a/trunk/src/AppBundle/Form/FewoReservationType.php
+++ b/trunk/src/AppBundle/Form/FewoReservationType.php
@@ -57,6 +57,7 @@ class FewoReservationType extends AbstractType
                 ],
                 'required' => true,
             ])
+            /*
             ->add('type', ChoiceType::class, [
                 'placeholder' => 'Buchungstyp (Bitte wählen) *',
                 'choices' => self::$TYPE_CHOICES,
@@ -65,6 +66,7 @@ class FewoReservationType extends AbstractType
                 ],
                 'required' => true,
             ])
+            */
             //->add('lodging') // wird händisch gesetzt
         ;
     }