Merge branch 'develop'
This commit is contained in:
Björn Fromme
Generated
+53
-53
@@ -2784,16 +2784,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/cache",
|
||||
"version": "v5.4.13",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/cache.git",
|
||||
"reference": "89bb6a0fe27205636d80e568ffaf9bbb52f691e3"
|
||||
"reference": "60e87188abbacd29ccde44d69c5392a33e888e98"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/cache/zipball/89bb6a0fe27205636d80e568ffaf9bbb52f691e3",
|
||||
"reference": "89bb6a0fe27205636d80e568ffaf9bbb52f691e3",
|
||||
"url": "https://api.github.com/repos/symfony/cache/zipball/60e87188abbacd29ccde44d69c5392a33e888e98",
|
||||
"reference": "60e87188abbacd29ccde44d69c5392a33e888e98",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2861,7 +2861,7 @@
|
||||
"psr6"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/cache/tree/v5.4.13"
|
||||
"source": "https://github.com/symfony/cache/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -2877,7 +2877,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-06T13:23:31+00:00"
|
||||
"time": "2022-10-27T07:55:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/cache-contracts",
|
||||
@@ -3039,16 +3039,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v5.4.14",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d"
|
||||
"reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/984ea2c0f45f42dfed01d2f3987b187467c4b16d",
|
||||
"reference": "984ea2c0f45f42dfed01d2f3987b187467c4b16d",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669",
|
||||
"reference": "ea59bb0edfaf9f28d18d8791410ee0355f317669",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3118,7 +3118,7 @@
|
||||
"terminal"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/console/tree/v5.4.14"
|
||||
"source": "https://github.com/symfony/console/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -3134,7 +3134,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-10-07T08:01:20+00:00"
|
||||
"time": "2022-10-26T21:41:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/dependency-injection",
|
||||
@@ -3807,16 +3807,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v5.4.14",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "e7c7b395c3a61d746919c21e915f51f0039c3f75"
|
||||
"reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e7c7b395c3a61d746919c21e915f51f0039c3f75",
|
||||
"reference": "e7c7b395c3a61d746919c21e915f51f0039c3f75",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3",
|
||||
"reference": "75bd663ff2db90141bfb733682459d5bbe9e29c3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3863,7 +3863,7 @@
|
||||
"description": "Defines an object-oriented layer for the HTTP specification",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/http-foundation/tree/v5.4.14"
|
||||
"source": "https://github.com/symfony/http-foundation/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -3879,7 +3879,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-10-01T21:59:28+00:00"
|
||||
"time": "2022-10-12T09:43:19+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/inflector",
|
||||
@@ -3956,16 +3956,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/mailer",
|
||||
"version": "v5.4.13",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/mailer.git",
|
||||
"reference": "63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11"
|
||||
"reference": "926f4deddb60d40024e6058fd8f94e70e4024930"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/mailer/zipball/63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11",
|
||||
"reference": "63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11",
|
||||
"url": "https://api.github.com/repos/symfony/mailer/zipball/926f4deddb60d40024e6058fd8f94e70e4024930",
|
||||
"reference": "926f4deddb60d40024e6058fd8f94e70e4024930",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4012,7 +4012,7 @@
|
||||
"description": "Helps sending emails",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/mailer/tree/v5.4.13"
|
||||
"source": "https://github.com/symfony/mailer/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -4028,7 +4028,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-08-29T06:47:07+00:00"
|
||||
"time": "2022-10-27T07:55:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/mime",
|
||||
@@ -5145,16 +5145,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/property-info",
|
||||
"version": "v5.4.14",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/property-info.git",
|
||||
"reference": "dc7ac44b5ea36c9f7532051b01ba64b1737932d1"
|
||||
"reference": "3ef5e026a71a39345da241292c153979893033c2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/property-info/zipball/dc7ac44b5ea36c9f7532051b01ba64b1737932d1",
|
||||
"reference": "dc7ac44b5ea36c9f7532051b01ba64b1737932d1",
|
||||
"url": "https://api.github.com/repos/symfony/property-info/zipball/3ef5e026a71a39345da241292c153979893033c2",
|
||||
"reference": "3ef5e026a71a39345da241292c153979893033c2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -5216,7 +5216,7 @@
|
||||
"validator"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/property-info/tree/v5.4.14"
|
||||
"source": "https://github.com/symfony/property-info/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -5232,20 +5232,20 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-10-07T08:01:20+00:00"
|
||||
"time": "2022-10-27T07:55:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v5.4.11",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
"reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226"
|
||||
"reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/3e01ccd9b2a3a4167ba2b3c53612762300300226",
|
||||
"reference": "3e01ccd9b2a3a4167ba2b3c53612762300300226",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69",
|
||||
"reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -5306,7 +5306,7 @@
|
||||
"url"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/routing/tree/v5.4.11"
|
||||
"source": "https://github.com/symfony/routing/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -5322,7 +5322,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-07-20T13:00:38+00:00"
|
||||
"time": "2022-10-13T14:10:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/serializer",
|
||||
@@ -5503,16 +5503,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/string",
|
||||
"version": "v5.4.14",
|
||||
"version": "v5.4.15",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/string.git",
|
||||
"reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4"
|
||||
"reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4",
|
||||
"reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
|
||||
"reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -5569,7 +5569,7 @@
|
||||
"utf8"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/string/tree/v5.4.14"
|
||||
"source": "https://github.com/symfony/string/tree/v5.4.15"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -8660,16 +8660,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "9.2.17",
|
||||
"version": "9.2.18",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
|
||||
"reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
|
||||
"reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
|
||||
"reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -8725,7 +8725,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -8733,7 +8733,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2022-08-30T12:24:04+00:00"
|
||||
"time": "2022-10-27T13:35:33+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
@@ -8978,16 +8978,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "9.5.25",
|
||||
"version": "9.5.26",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
|
||||
"reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
|
||||
"reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
|
||||
"reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -9060,7 +9060,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
|
||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -9076,7 +9076,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-25T03:44:45+00:00"
|
||||
"time": "2022-10-28T06:00:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/cli-parser",
|
||||
|
||||
Generated
+941
-1115
File diff suppressed because it is too large
Load Diff
@@ -171,7 +171,7 @@
|
||||
import ServicesOverview from './components/ServicesOverview'
|
||||
import TransportationSelect from './components/TransportationSelect'
|
||||
import { mapGetters, mapMutations, mapState } from 'vuex'
|
||||
import { checkStatus, defaultOptions } from './api'
|
||||
import {checkStatus, defaultOptions, handleError} from './api'
|
||||
|
||||
export default {
|
||||
name: 'BookingEdit',
|
||||
@@ -232,7 +232,7 @@
|
||||
this.participantData = data.participantData
|
||||
this.travelData = data.travelData
|
||||
})
|
||||
.catch(() => {})
|
||||
.catch(handleError)
|
||||
.finally(() => {
|
||||
this.endLoading()
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@ function checkStatus(response) {
|
||||
if (response.ok) {
|
||||
return response
|
||||
} else {
|
||||
const error = new Error(response.status)
|
||||
const error = new Error(response.statusText)
|
||||
error.response = response.json()
|
||||
throw error
|
||||
}
|
||||
@@ -20,7 +20,6 @@ function handleError() {
|
||||
message: 'Es ist ein Fehler aufgetreten :(',
|
||||
success: false,
|
||||
})
|
||||
throw error
|
||||
}
|
||||
|
||||
export { checkStatus, handleError, defaultOptions }
|
||||
|
||||
@@ -7,76 +7,46 @@
|
||||
|
||||
<f:section name="Main">
|
||||
<ep:container data="{data}">
|
||||
<div class="w-full max-w-full overflow-x-scroll md:overflow-x-auto">
|
||||
<table class="w-full mb-4 bg-zinc-200">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Gebiet
|
||||
</th>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Berg/Tal
|
||||
</th>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Qualität
|
||||
</th>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Geöffnete Lifte
|
||||
</th>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Letzter Schneefall
|
||||
</th>
|
||||
<th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
|
||||
Letzte Akt.
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<div class="flex flex-col space-y-2">
|
||||
<f:for each="{list}" as="snowreport">
|
||||
<tr class="odd:bg-zinc-50 hover:bg-zinc-100 odd:hover:bg-zinc-100">
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2">
|
||||
<div class="grid md:grid-cols-3 md:gap-y-0">
|
||||
<div class="md:col-span-1 bg-ep-primary-dark p-2 flex items-start space-x-2">
|
||||
{ep:icon(icon: 'flag-{snowreport.countryCode -> f:format.case(mode: \'lower\')}', class: 'w-8 h-6')}
|
||||
<f:link.typolink parameter="{snowreport.regionDetailPage}"
|
||||
title="{snowreport.regionName}"
|
||||
class="text-ep-primary">
|
||||
class="text-white uppercase text-lg">
|
||||
{snowreport.regionName}
|
||||
</f:link.typolink>
|
||||
<br>
|
||||
<f:link.typolink parameter="{snowreport.countryDetailPage}"
|
||||
title="{snowreport.countryName}"
|
||||
class="text-ep-primary">
|
||||
{snowreport.countryName}
|
||||
</f:link.typolink>
|
||||
</td>
|
||||
<f:if condition="{snowreport.inSeason}">
|
||||
<f:then>
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
|
||||
{snowreport.snow_level_mountain -> v:or(alternative: '-')}/{snowreport.snow_level_valley -> v:or(alternative: '-')} cm
|
||||
</td>
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
|
||||
{snowreport.snow_quality}
|
||||
</td>
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
|
||||
<f:if condition="{snowreport.lifts_opened} > 0">
|
||||
<f:then>{snowreport.lifts_opened}/{snowreport.lifts_total}</f:then>
|
||||
<f:else>k. A.</f:else>
|
||||
</f:if>
|
||||
</td>
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
|
||||
{f:if(condition: snowreport.last_snowfall, then: '{snowreport.last_snowfall -> f:format.date(format: \'%d.%m.%Y\')}', else: '-')}
|
||||
</td>
|
||||
<td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
|
||||
{snowreport.last_update -> f:format.date(format: '%d.%m.%Y')}
|
||||
</td>
|
||||
</f:then>
|
||||
<f:else>
|
||||
<td colspan="5" style="text-align: center; vertical-align: middle">Saison vom {snowreport.seasonStart -> f:format.date(format: '%d.%m.%Y')} bis {snowreport.seasonEnd -> f:format.date(format: '%d.%m.%Y')}</td>
|
||||
</f:else>
|
||||
</f:if>
|
||||
</tr>
|
||||
</div>
|
||||
<div class="md:col-span-2 bg-ep-primary-dark/20 p-2">
|
||||
<f:if condition="{snowreport.inSeason}">
|
||||
<f:then>
|
||||
<ul class="flex flex-col space-y-1">
|
||||
<li>
|
||||
<strong>Berg/Tal:</strong> {snowreport.snow_level_mountain -> v:or(alternative: '-')}/{snowreport.snow_level_valley -> v:or(alternative: '-')} cm
|
||||
</li>
|
||||
<li>
|
||||
<strong>Qualität:</strong> {snowreport.snow_quality}
|
||||
</li>
|
||||
<li>
|
||||
<strong>Geöffnete Lifte:</strong> <f:if condition="{snowreport.lifts_opened} > 0"><f:then>{snowreport.lifts_opened}/{snowreport.lifts_total}</f:then><f:else>keine Angabe</f:else></f:if>
|
||||
</li>
|
||||
<li>
|
||||
<strong>Letzter Schneefall:</strong> {f:if(condition: snowreport.last_snowfall, then: '{snowreport.last_snowfall -> f:format.date(format: \'%d.%m.%Y\')}', else: 'keine Angabe')}
|
||||
</li>
|
||||
<li>
|
||||
<strong>Letzte Akt.:</strong> {snowreport.last_update -> f:format.date(format: '%d.%m.%Y')}
|
||||
</li>
|
||||
</ul>
|
||||
</f:then>
|
||||
<f:else>
|
||||
Saison vom {snowreport.seasonStart -> f:format.date(format: '%d.%m.%Y')} bis {snowreport.seasonEnd -> f:format.date(format: '%d.%m.%Y')}
|
||||
</f:else>
|
||||
</f:if>
|
||||
</div>
|
||||
</div>
|
||||
</f:for>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</ep:container>
|
||||
</f:section>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user