Merge branch 'develop'

This commit is contained in:
Björn Fromme
2021-03-31 14:56:19 +02:00
2 changed files with 5 additions and 5 deletions
@@ -17,7 +17,7 @@
</div>
<div>
<mutable-fields :mutable-fields="mutableFields"></mutable-fields>
<contingents-overview :contingents="contingents"/>
<contingents-overview :contingents="bookingData.accomodations"/>
<panel title="Beförderungsart (alle Teilnehmer)" :body="true">
<transportation-select :services="services.transportation"
:initial-transportation-ids="bookingData.selectedTransportationIds"
@@ -76,7 +76,7 @@
<participant-sizes-form :services="services.other"
:participant="participant"
:mutable="mutableFields.services.mutable"
v-on:updated="[onParticipantDataUpdated($event, index)]"
v-on:updated="onParticipantDataUpdated($event, index)"
/>
<pickup-select
:pickups="services.pickups"
@@ -1,5 +1,5 @@
<template>
<panel title="Kontingente" :body="true">
<panel title="Gebuchte Kontingente" :body="true">
<table class="table table-condensed">
<colgroup>
<col style="width: 75%">
@@ -7,8 +7,8 @@
</colgroup>
<tbody>
<tr v-for="contingent in contingents" :key="contingent.id">
<th>{{ contingent.name }}</th>
<td><span class="label" :class="contingent.available > 0 ? 'label-success' : 'label-danger'">{{ contingent.available >= 0 ? contingent.available : 0 }}</span></td>
<th>{{ contingent.room }}</th>
<td>{{ contingent.count }}</td>
</tr>
</tbody>
</table>