Browse Source

fixes

modals-to-spa
stingl 4 years ago
parent
commit
f65d0929ac
  1. 31
      index.html
  2. 9
      js/app.js

31
index.html

@ -356,42 +356,15 @@ @@ -356,42 +356,15 @@
<span v-if="getTotalTime(ticket) > 0">Gesamtzeit: {{ getTotalTime(ticket) }}</span>
<br>
<div class="row">
<template v-if="experimental.customManualBooking">
<template>
<div class="col">
<button class="btn btn-info ticket-action-button"
@click="showCustomBookingForTicket(ticket)"
@click="showCustomBookingForTracker(ticket)"
title="Manuelle Buchung">
<i class="fas fa-user-edit"></i>
</button>
</div>
</template>
<template v-else>
<div class="col-md-3">
<button class="btn btn-success ticket-action-button"
@click="bookTimeManually(ticket, 30)">
+ ½h
</button>
</div>
<div class="col-md-3">
<button class="btn btn-success ticket-action-button"
@click="bookTimeManually(ticket, 60)">
+ 1h
</button>
</div>
<div class="col-md-3">
<button class="btn btn-warning ticket-action-button"
@click="bookTimeManually(ticket, -30)">
- ½h
</button>
</div>
<div class="col-md-3">
<button class="btn btn-warning ticket-action-button"
@click="bookTimeManually(ticket, -60)">
- 1h
</button>
</div>
</template>
<div class="col">
<button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
@click="archiveTracker(ticketIndex)" title="Archivieren">

9
js/app.js

@ -5,8 +5,7 @@ const TimeTrack = { @@ -5,8 +5,7 @@ const TimeTrack = {
trackWorktime: false,
boardView: false,
snippetSpace: false,
portalSwitcher: true,
customManualBooking: true
portalSwitcher: true
},
view: 'board',
theme: 'materia',
@ -28,7 +27,7 @@ const TimeTrack = { @@ -28,7 +27,7 @@ const TimeTrack = {
trackingStopped: null,
history: []
},
selectedTicket: null,
selectedTracker: null,
searchQuery: '',
portal: '',
portals: null,
@ -449,8 +448,8 @@ const TimeTrack = { @@ -449,8 +448,8 @@ const TimeTrack = {
historyModal.toggle();
}, 50);
},
showCustomBookingForTicket(ticket) {
this.selectedTicket = ticket;
showCustomBookingForTracker(ticket) {
this.selectedTracker = ticket;
this.$forceUpdate();
setTimeout(() => {
let customBookingModal = new bootstrap.Modal(document.getElementById('customBookingModal'));