JandL_gitea/jandl-taskmanager-app
1
0 Fork 0
mirror of https://bitbucket.org/studiotem/jandl-taskmanager-app.git synced 2026-10-21 14:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugs

Browse Source
This commit is contained in:
romankko2 committed 2023-06-06 23:09:25 +02:00
1 parent 856c0cff95
commit c94327a9b7
5 files changed
+11 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/_components/z-timeline.vue
+1 -1
View File
@@ -65,7 +65,7 @@
</div>
</div>
<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished ? '#dedfe0' : event.color || event.subtask.color}">
<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000}" :style="{backgroundColor: event._timeblock_is_finished || event.subtask.is_finished ? '#dedfe0' : event.color || event.subtask.color}">
<div class="event-content" :class="{'is-blocker': event.isBlocker}">
<template v-if="event.type == 'subtask'">
<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small>
app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
+5 -3
View File
@@ -4,9 +4,11 @@
<v-select v-model="filter.teamId" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
<v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" />
<v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
<!-- <v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" /> -->
<v-autocomplete v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" item-title="_fullName" item-value="id" label="Zamestnanec" variant="outlined" />
<!-- <v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" /> -->
<v-autocomplete v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
<v-select v-model="filter.month" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+1 -1
View File
@@ -305,7 +305,7 @@ export default {
this.$nextTick(() => {
this.$refs['description']?.setHTML(this.mastertask.description || '')
if (!this.mastertask) return
if (!this.mastertask?.id) return
const date = new Date(this.mastertask.deadline)
const hours = date.getHours()
app/src/plugins/tm@modal/task/z-task-modal.vue
+1 -1
View File
@@ -92,7 +92,7 @@
<div class="d-flex justify-start align-center mt-8">
<v-btn class="done-btn" v-if="!subtask.is_finished" @click.stop="showCompleteTaskModal()">Dokončiť</v-btn>
<v-btn class="button secondary" v-else @click.stop="showCompleteTaskModal()">Znovu otvoriť</v-btn>
<v-btn class="button secondary" @click="save()">Uložiť zmeny</v-btn>
<v-btn class="button secondary" @click="closeModal()">Uložiť zmeny</v-btn>
</div>
</div>
</v-card-actions>
app/src/plugins/tm@overview/_components/z-tasks-search.vue
+3 -3
View File
@@ -1,14 +1,14 @@
<template>
<v-row class="px-10 py-8 subheader">
<v-select
<v-autocomplete
v-model="selectedEmployeeId"
class="subheader-input"
variant="outlined"
label="Zamestanec"
:items="[null, ...enrichedEmployees]"
:items="enrichedEmployees"
item-title="_fullName"
item-value="id"
></v-select>
/>
<v-text-field
v-model="searchQuery"