Browse Source

don't show today if empty; shot start time in tracking-info;

modulation
stingl 4 years ago
parent
commit
35b605a8f8
  1. 20
      src/views/Trackers.vue

20
src/views/Trackers.vue

@ -19,16 +19,16 @@
<div class="spinner-grow spinner-grow-sm" role="status"> <div class="spinner-grow spinner-grow-sm" role="status">
<span class="sr-only">Tracking...</span> <span class="sr-only">Tracking...</span>
</div> </div>
Tracking Tracking (<i class="fas fa-play"></i> {{ getTrackingStartTime(tracker) }})
</div> </div>
</div> </div>
</div> </div>
<template v-if="!tracker.isTimeBox"> <template v-if="!tracker.isTimeBox">
<div v-if="tracker.tracking === true"> <div v-if="tracker.tracking === true">
<span class="float-end">{{ getTrackingStartTime(tracker) }}</span> <!-- <span class="float-end">{{ getTrackingStartTime(tracker) }}</span>-->
<span v-if="tracker.tracking === true">Gestartet: </span> <!-- <span v-if="tracker.tracking === true">Gestartet: </span>-->
<br/> <!-- <br/>-->
<span class="float-end">{{ currentTrackingRunningFor(tracker) }}</span> <span class="float-end">{{ currentTrackingRunningFor(tracker) }}</span>
<span v-if="tracker.tracking === true">Läuft seit: </span> <span v-if="tracker.tracking === true">Läuft seit: </span>
</div> </div>
@ -38,8 +38,10 @@
<span class="current-tracker-info">Gesamt: </span> <span class="current-tracker-info">Gesamt: </span>
</div> </div>
<span class="float-end">{{ getTotalTimeToday(tracker) }}</span> <div v-if="getTotalTimeToday(tracker, true) > 1">
<span class="">Heute: </span> <span class="float-end">{{ getTotalTimeToday(tracker) }}</span>
<span class="">Heute: </span>
</div>
<div class="row"> <div class="row">
<div class="col-md-6" v-if="!tracker.tracking"> <div class="col-md-6" v-if="!tracker.tracking">
@ -241,7 +243,7 @@ export default {
return this.timeWithPostFix(totalTime); return this.timeWithPostFix(totalTime);
} }
}, },
getTotalTimeToday(tracker) { getTotalTimeToday(tracker, raw = false) {
let totalTime = 0; let totalTime = 0;
if (tracker.history.length > 0) { if (tracker.history.length > 0) {
@ -256,6 +258,10 @@ export default {
totalTime += Math.round(moment.duration(moment().diff(tracker.trackingStarted)).as('minutes')); totalTime += Math.round(moment.duration(moment().diff(tracker.trackingStarted)).as('minutes'));
} }
if (raw) {
return totalTime;
}
return this.timeWithPostFix(totalTime); return this.timeWithPostFix(totalTime);
}, },
timeWithPostFix(time) { timeWithPostFix(time) {

Loading…
Cancel
Save