#1429

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3413 f459cee4-fb09-11de-96c3-f9c5f16c3c76

trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig

@@ -129,11 +129,20 @@
                 <div role="tabpanel" class="tab-pane active" id="travel-description-content-tab">
                     {{ travel_program.htmlDescription|raw|keywords }}
 
-                    {% if travel_program.advices is not empty %}
+                    {% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
                         <h3>Hinweise</h3>
                         <ul>
+                             {% if travel_program.generalnote is not empty %}
+                                 {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+                                     {% if notes is not empty %}
+                                        <li>{{ notes|raw }}</li>
+                                      {% endif %}
+                                 {% endfor %}
+                            {% endif %}
                             {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+                                {% if travel_program_advice is not empty %}
                                 <li>{{ travel_program_advice|raw }}</li>
+                                 {% endif %}
                             {% endfor %}
                         </ul>
                     {% endif %}

trunk/src/AppBundle/Entity/TravelGeneralNote.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace AppBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * TravelGeneralNote
+ *
+ * @ORM\Table(name="travel_general_notes")
+ * @ORM\Entity
+ */
+class TravelGeneralNote
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", length=255, nullable=true)
+     */
+    private $name;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="text", type="text", length=65535, nullable=false)
+     */
+    private $text;
+
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    private $id;
+
+
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     *
+     * @return TravelGeneralNote
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set text
+     *
+     * @param string $text
+     *
+     * @return TravelGeneralNote
+     */
+    public function setText($text)
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get text
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+}

trunk/src/AppBundle/Entity/TravelProgram.php

@@ -7,7 +7,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * TravelProgram
  *
- * @ORM\Table(name="travel_program", indexes={@ORM\Index(name="FK_travel_program_travel_organizer", columns={"organizer"}), @ORM\Index(name="FK_travel_program_travel_insurance", columns={"insurance_1"}), @ORM\Index(name="FK_travel_program_travel_insurance_2", columns={"insurance_2"}), @ORM\Index(name="FK_travel_program_travel_category", columns={"category_id"}), @ORM\Index(name="FK_travel_program_travel_arrival_point", columns={"travel_arrival_point_id"})})
+ * @ORM\Table(name="travel_program", indexes={@ORM\Index(name="FK_travel_program_travel_organizer", columns={"organizer"}), @ORM\Index(name="FK_travel_program_travel_insurance", columns={"insurance_1"}), @ORM\Index(name="FK_travel_program_travel_insurance_2", columns={"insurance_2"}), @ORM\Index(name="FK_travel_program_travel_category", columns={"category_id"}), @ORM\Index(name="travel_program_ibfk_4", columns={"generalnote"}), @ORM\Index(name="FK_travel_program_travel_arrival_point", columns={"travel_arrival_point_id"})})
  * @ORM\Entity(repositoryClass="AppBundle\Entity\TravelProgramRepository")
  */
 class TravelProgram
@@ -298,6 +298,17 @@ class TravelProgram
      */
     private $category;
 
+
+    /**
+     * @var \AppBundle\Entity\TravelGeneralNote
+     *
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\TravelGeneralNote")
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="generalnote", referencedColumnName="id")
+     * })
+     */
+    private $generalnote;
+
     /**
      * @ORM\OneToMany(targetEntity="AppBundle\Entity\TravelPeriod", mappedBy="program")
      */
@@ -1274,6 +1285,31 @@ class TravelProgram
         $this->travelDateByKey = [];
     }
 
+    /**
+     * Set generalnote
+     *
+     * @param \AppBundle\Entity\TravelGeneralNote $generalnote
+     *
+     * @return TravelGeneralNote
+     */
+    public function setGeneralnote(\AppBundle\Entity\TravelGeneralNote $generalnote = null)
+    {
+        $this->generalnote = $generalnote;
+
+        return $this;
+    }
+
+    /**
+     * Get generalnote
+     *
+     * @return \AppBundle\Entity\TravelGeneralNote
+     */
+    public function getGeneralnote()
+    {
+        return $this->generalnote;
+    }
+
+
     /**
      * Add period
      *