From 1e7454bc64454349287aee251f00b4a43bcaa986 Mon Sep 17 00:00:00 2001
From: Christian <info@chrosey.de>
Date: Fri, 12 Mar 2021 22:23:17 +0100
Subject: [PATCH] updates

---
 app.js     |  2 ++
 index.html | 48 +++++++++++++++++++++++-------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app.js b/app.js
index a106e1e..7e3c2e7 100644
--- a/app.js
+++ b/app.js
@@ -203,6 +203,8 @@ var app = new Vue({
                 'use strict';
                 shiftStorage.save(shifts);
                 this.remaining = shifts.length;
+                this.icsFile = null;
+                this.blob = null;
                 this.makeToast("Änderungen gespeichert.");
             },
             deep: true
diff --git a/index.html b/index.html
index cad6d3e..edfa6b3 100644
--- a/index.html
+++ b/index.html
@@ -52,18 +52,6 @@
                                 </a>
                             </div>
                         </div>
-
-                    </li>
-                    <li class="step">
-                        <div class="step-title waves-effect">Dateiformat erkennen</div>
-                        <div class="step-content">
-
-                            <div v-if="format">Erkanntes Format: {{format}}</div>
-                            <div v-else>keine neue Datei eingelesen</div>
-                            <div class="step-actions">
-                                <button class="waves-effect waves-dark btn next-step">Weiter</button>
-                            </div>
-                        </div>
                     </li>
                     <li class="step">
                         <div class="step-title waves-effect" data-step-label="Termin-Dauer-Bestimmung">
@@ -97,8 +85,9 @@
                                 </a>
                             </div>
                             <div class="step-actions">
-                                <button class="waves-effect waves-dark btn-flat" @click.prevent="applyRules">Regeln
-                                    anwenden</button>
+                                <button class="waves-effect waves-dark btn-flat" @click.prevent="applyRules">
+                                    Regeln anwenden
+                                </button>
                                 <button class="waves-effect waves-dark btn next-step">Weiter</button>
                             </div>
                         </div>
@@ -121,10 +110,17 @@
                                             <th v-if="i == 0" :rowspan="g.length">
                                                 {{s.FormattedDatum}}
                                             </th>
-                                            <td>{{ s.Beginn }} - {{ s.Ende }} Uhr</td>
+                                            <td>
+                                                <button class="waves-effect waves-light btn-small btn-flat" @click.prevent="updateBeginn(s, -1)" title="1 Stunde früher">
+                                                    <i class="material-icons">skip_previous</i>
+                                                </button>
+                                                {{ s.Beginn }} - {{ s.Ende }} Uhr
+                                                <button class="waves-effect waves-light btn-small btn-flat" @click.prevent="updateBeginn(s, 1)" title="1 Stunde später">
+                                                    <i class="material-icons">skip_next</i>
+                                                </button>
+                                            </td>
                                             <td>
                                                 <h6>{{ s.VEventTitle }}</h6>
-                                                {{ s.Dauer }}
                                                 <p v-if="s.Ort!=''">
                                                     <i class="material-icons red-text">location_on</i>
                                                     {{ s.Ort }}
@@ -138,8 +134,7 @@
                                                     @click.prevent="removeShift(s)">löschen</button>
                                                 <button class="btn-flat"
                                                     @click.prevent="selectShift(s)">bearbeiten</button>
-                                                <button class="waves-effect waves-dark btn blue" @click.prevent="updateBeginn(s, -1)">1 h früher</button>
-                                                <button class="waves-effect waves-dark btn blue" @click.prevent="updateBeginn(s, 1)">1 h später</button>
+
                                             </td>
                                         </tr>
                                     </template>
@@ -147,10 +142,6 @@
                             </table>
 
                             <div class="step-actions">
-                                <button class="btn-flat waves-effect" @click.prevent="createDownloadFile"
-                                    :disabled=" (remaining > 0) ? null : 'disabled'">
-                                    Kalenderdatei erstellen
-                                </button>
                                 <button class="waves-effect waves-dark btn blue" @click.prevent="changeTime(-1)">alle 1 h früher</button>
                                 <button class="waves-effect waves-dark btn blue" @click.prevent="changeTime(1)">alle 1 h später</button>
                                 <button class="waves-effect waves-dark btn next-step">Weiter</button>
@@ -160,8 +151,15 @@
                     <li class="step">
                         <div class="step-title waves-effect">Kalenderdatei speichern</div>
                         <div class="step-content">
+                            <p>
+                                Erst die Kalenderdatei erstellen. Danach kann sie gespeichert werden.
+                            </p>
                             <div class="step-actions">
-                                <a class="btn-flat waves-effect" :href="icsFile" :class="[ icsFile ? '' : 'disabled']"
+                                <button class="btn waves-effect" @click.prevent="createDownloadFile"
+                                    :disabled=" (remaining > 0) ? null : 'disabled'">
+                                    Kalenderdatei erstellen
+                                </button>
+                                <a class="btn waves-effect" :href="icsFile" :class="[ icsFile ? '' : 'disabled']"
                                     download="dienstplan.ics" @click.stop="downloadFile">
                                     Kalenderdatei speichern
                                 </a>
@@ -179,7 +177,7 @@
                     <button class="btn-flat" @click="false">Abbrechen</button>
                 </div>
             </div>
-            <div id="ruleModal" class="modal bottom-sheet active">
+            <div id="ruleModal" class="modal modal-fixed-footer active">
                 <div class="modal-content">
                     <h4>Regel anpassen</h4>
                     <div class="row">
@@ -208,7 +206,7 @@
                         @click="discardRule(selectedRule)">Verwerfen</button>
                 </div>
             </div>
-            <div id="shiftModal" class="modal bottom-sheet">
+            <div id="shiftModal" class="modal modal-fixed-footer">
                 <div class="modal-content">
                     <h4>{{ selectedShift.VEventTitle || 'kein Titel'}}</h4>
                     <div class="row">