Merge branch 'release/2020.10-06'

composer.lock

@@ -266,16 +266,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "2.11.1",
+            "version": "2.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86"
+                "reference": "fb5d5f2f26babf8dce217b1eb88300c22bb703a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/6e6903cd5e3a5be60a79439e3ee8fe126f78fe86",
-                "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/fb5d5f2f26babf8dce217b1eb88300c22bb703a4",
+                "reference": "fb5d5f2f26babf8dce217b1eb88300c22bb703a4",
                 "shasum": ""
             },
             "require": {
@@ -287,12 +287,11 @@
             "require-dev": {
                 "doctrine/coding-standard": "^8.1",
                 "jetbrains/phpstorm-stubs": "^2019.1",
-                "nikic/php-parser": "^4.4",
                 "phpstan/phpstan": "^0.12.40",
-                "phpunit/phpunit": "^9.3",
+                "phpunit/phpunit": "^9.4",
                 "psalm/plugin-phpunit": "^0.10.0",
                 "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-                "vimeo/psalm": "^3.14.2"
+                "vimeo/psalm": "^3.17.2"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -370,7 +369,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-09-27T04:09:41+00:00"
+            "time": "2020-10-20T14:36:48+00:00"
         },
         {
             "name": "doctrine/event-manager",

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CollapsiblePanel.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="panel">
-        <div class="panel-heading" role="tab" :id="'heading-' + id">
+        <div class="panel-heading">
             <h3 class="panel-title">
-              <a role="button" data-toggle="collapse" :data-parent="parent" :href="'#collapse-' + id"
-                 aria-expanded="false" :aria-controls="'collapse-' + id">
-                {{ title }}
+              <a role="button" href="#" class="flex items-center justify-between" @click.prevent="expanded = !expanded">
+                <span>{{ title }}</span>
+                <i class="fa fa-chevron-right transform" :class="{ 'rotate-90': expanded }"></i>
               </a>
             </h3>
         </div>
-        <div :id="'collapse-' + id" class="panel-collapse collapse" role="tabpanel" :aria-labelledby="'headine-' + id">
+        <div :class="{ 'hidden': !expanded }">
           <div class="panel-body">
             <slot></slot>
           </div>
@@ -22,6 +22,7 @@
         data () {
           return {
             id: null,
+            expanded: false,
           }
         },
         props: {

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ContingentsOverview.vue

@@ -8,7 +8,7 @@
             <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 }}</span></td>
+                    <td><span class="label" :class="contingent.available > 0 ? 'label-success' : 'label-danger'">{{ contingent.available >= 0 ? contingent.available : 0 }}</span></td>
                 </tr>
             </tbody>
         </table>

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServicesOverview.vue

@@ -2,7 +2,7 @@
     <panel title="Gebuchte Zusatzleistungen">
         <ul class="list-group">
             <li class="list-group-item" v-for="(assignment, serviceId) in serviceAssignments">
-                {{ services[serviceId].name }}: {{ assignment.join(', ')}}
+                {{ services[serviceId].name }}: {{ assignment.length }}
             </li>
         </ul>
     </panel>
@@ -48,4 +48,4 @@
 
 <style scoped>
 
-</style>
+</style>