gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1464 getInsurance3

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3439 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-08-10 13:09:40 +00:00
parent bdb24ccd09
commit 628fc40751
3 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
trunk/app/Resources/views/default/components/booking/insurance.html.twig
View file

@ -22,16 +22,21 @@
</a>
<div id="collapse_in_{{ form.vars.id }}" class="panel-collapse collapse" aria-expanded="false" style="height: 0px;">
<div class="panel-body">
{% if insurance.insuranceName is defined %}
<p><strong>Versicherung:</strong> {{ insurance.insuranceName }} </p>
{% endif %}
<ul class="c1 c1b">
{% for textli in insurance.text|split('\n') %}
<li>{{ textli|raw }}</li>
{% endfor %}
{% if insurance.text is defined %}
{% for textli in insurance.text|split('\n') %}
<li>{{ textli|raw }}</li>
{% endfor %}
{% endif %}
</ul>
<br>
<p><a href="/uploads/{{ insurance.insurancePdf }} " target="_blank"> Informationsblatt zur Versicherung <i class="fa fa-file-pdf-o"></i></a> </p>
{% if insurance.insurancePdf is defined %}
<br>
<p><a href="/uploads/{{ insurance.insurancePdf }} " target="_blank"> Informationsblatt zur Versicherung <i class="fa fa-file-pdf-o"></i></a> </p>
{% endif %}
</div>
</div>

37
trunk/src/AppBundle/Entity/TravelProgram.php
View file

@ -7,7 +7,8 @@ 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="travel_program_ibfk_4", columns={"generalnote"}), @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_insurance_3", columns={"insurance_3"}), @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
@ -295,6 +296,16 @@ class TravelProgram
*/
private $insurance2;
/**
* @var \AppBundle\Entity\TravelInsurance
*
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\TravelInsurance")
* @ORM\JoinColumns({
* @ORM\JoinColumn(name="insurance_3", referencedColumnName="id")
* })
*/
private $insurance3;
/**
* @var \AppBundle\Entity\TravelCategory
*
@ -1334,6 +1345,30 @@ class TravelProgram
return $this->insurance2;
}
/**
* Set insurance3
*
* @param \AppBundle\Entity\TravelInsurance $insurance2
*
* @return TravelProgram
*/
public function setInsurance3(\AppBundle\Entity\TravelInsurance $insurance3 = null)
{
$this->insurance3 = $insurance3;
return $this;
}
/**
* Get insurance3
*
* @return \AppBundle\Entity\TravelInsurance
*/
public function getInsurance3()
{
return $this->insurance3;
}
/**
* Set category
*

4
trunk/src/AppBundle/Form/BookingRequestType.php
View file

@ -197,6 +197,10 @@ class BookingRequestType extends AbstractType
{
$insuranceChoices[$travelProgram->getInsurance2()->getName()] = $travelProgram->getInsurance2();
}
if ($travelProgram->getInsurance3())
{
$insuranceChoices[$travelProgram->getInsurance3()->getName()] = $travelProgram->getInsurance3();
}
if (!empty($insuranceChoices))
{
$builder->add('insurance', EntityType::class, [