1nicerOli
/
timetrack
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity
Browse Source

fixes

modals-to-spa
stingl 4 years ago
parent
c63ce10cd6
commit
f65d0929ac
2 changed files with 6 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      index.html
  2. 9
      js/app.js

31
index.html
Unescape View File

@ -356,42 +356,15 @@
<span v-if="getTotalTime(ticket) > 0">Gesamtzeit: {{ getTotalTime(ticket) }}</span> <span v-if="getTotalTime(ticket) > 0">Gesamtzeit: {{ getTotalTime(ticket) }}</span>
<br> <br>
<div class="row"> <div class="row">
<template v-if="experimental.customManualBooking"> <template>
<div class="col"> <div class="col">
<button class="btn btn-info ticket-action-button" <button class="btn btn-info ticket-action-button"
@click="showCustomBookingForTicket(ticket)" @click="showCustomBookingForTracker(ticket)"
title="Manuelle Buchung"> title="Manuelle Buchung">
<i class="fas fa-user-edit"></i> <i class="fas fa-user-edit"></i>
</button> </button>
</div> </div>
</template> </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"> <div class="col">
<button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal" <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
@click="archiveTracker(ticketIndex)" title="Archivieren"> @click="archiveTracker(ticketIndex)" title="Archivieren">

9
js/app.js
Unescape View File

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