nice fixes

This commit is contained in:
Christian Seyfferth 2019-01-16 18:58:29 +01:00
parent 3dcba4d247
commit f13c16dd93
3 changed files with 18 additions and 7 deletions

8
app.js
View File

@ -183,10 +183,18 @@ var app = new Vue({
deep: true deep: true
} }
}, },
computed: {
groupedTermine() {
return _.groupBy(this.shifts, e => e.Datum);
}
},
methods: { methods: {
updateArten(value){ updateArten(value){
this.selectedRule.Arten = value; this.selectedRule.Arten = value;
}, },
updateTitel(value){ updateTitel(value){
this.selectedRule.Titel = value; this.selectedRule.Titel = value;
}, },

View File

@ -37,15 +37,15 @@
</div> </div>
</nav> </nav>
<ul class="sidenav" id="mobile-nav"> <ul class="sidenav" id="mobile-nav">
</ul> </ul>
<div id="body"> <div id="body">
<main class="container"> <main class="container">
<div id="termine"> <div id="termine">
<div class="card" v-if="shifts.length > 0"> <div class="" v-if="shifts.length > 0">
<div class="card-content"> <div class="">
<h3 class="card-title">Termine</h3> <h3 class="title">Termine</h3>
<table class="highlight" > <table class="highlight" >
<thead class=""> <thead class="">
<tr> <tr>
@ -59,14 +59,14 @@
<tbody> <tbody>
<tr v-for="s in shifts" :key="s.id" @click="selectShift(s)"> <tr v-for="s in shifts" :key="s.id" @click="selectShift(s)">
<td class="text-xs-right align-middle"> <td class="text-xs-right align-middle">
{{s.FormattedDatum}} {{s.FormattedDatum}}
</td> </td>
<td class=""> <td class="">
{{s.Wochentag}} {{s.Wochentag}}
</td> </td>
<td class=""> <td class="">
{{s.VEventTitle}} {{s.VEventTitle}}
<small>{{ s.Ort }}</small> <small v-if="s.Ort != ''"><i class="tiny material-icons red-text">location_on</i>{{ s.Ort }}</small>
</td> </td>
<td class="" v-if="s.Beginn !== '00:00'"> <td class="" v-if="s.Beginn !== '00:00'">
{{s.Beginn}} - {{s.Ende}} {{s.Beginn}} - {{s.Ende}}
@ -254,6 +254,7 @@
style="display:none;"> style="display:none;">
</div> </div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.11/lodash.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.14.1/xlsx.full.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.14.1/xlsx.full.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.23.0/moment-with-locales.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.23.0/moment-with-locales.min.js"></script>

View File

@ -265,7 +265,9 @@ Shift.thaw = function (jsonShift) {
art: jsonShift._kind, art: jsonShift._kind,
name: jsonShift._name, name: jsonShift._name,
datum: begin, datum: begin,
beschreibung: jsonShift._description beschreibung: jsonShift._description,
ort: jsonShift._ort,
}); });
shift.id = jsonShift.id; shift.id = jsonShift.id;
shift.Dauer = moment.duration(jsonShift._duration); shift.Dauer = moment.duration(jsonShift._duration);