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

[Bugfixes]

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-04-13 23:49:31 +02:00
1 parent 1264ab5416
commit 3d39525a8d
6 files changed
+16 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/lib@search/search/search.vue
+7 -2
View File
@@ -3,7 +3,7 @@
<p v-if="!this.searchResults" class="px-3 py-3">{{ this.search?.length ? $t('Searching...') : $t('Type something') }}</p>
<p v-else-if="this.searchResults.error" class="px-3">{{ this.searchResults.error }}</p>
<div v-else>
<div v-else class="results-wrapper">
<A-search-result-mastertasks :mastertasks="searchResults.mastertasks"/>
<A-search-result-subtasks :subtasks="searchResults.subtasks" />
<A-search-result-team :teams="searchResults.teams" />
@@ -81,4 +81,9 @@ export default {
}, 300)
}
}
</script>
</script>
<style lang="sass" scoped>
.results-wrapper
margin-bottom: 60px
</style>
app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
+3 -2
View File
@@ -1,14 +1,15 @@
<template>
<v-row class="px-10 py-8 subheader">
<v-select
<v-autocomplete
v-model="selectedEmployee"
class="subheader-input"
:items="enrichedEmployees"
:menu-props="{maxHeight: 500}"
item-title="_fullName"
item-value="id"
label="Zamestnanec"
variant="outlined"
></v-select>
></v-autocomplete>
<div class="d-flex date-wrapper">
<v-btn class="subheader-icon-button prev" variant="outlined" @click="prevWeek()"><img :src="require('@/plugins/app/_img/icons/icon-prev.svg')" alt=""></v-btn>
<v-text-field
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+1 -1
View File
@@ -201,7 +201,7 @@ export default {
// TODO zmazat ked zacne prichadzat project_id a team_id
const project = this.projects.find((project) => project.code == this.mastertask.project_code)
this.mastertask.project_id = project.id
this.mastertask.project_id = project?.id || null
this.mastertask.team_id = this.mastertask.team?.id || null
// this.mastertask.project_code = project.code
app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</div>
<v-card-actions class="mt-10 d-flex flex-column modal-content">
<Datepicker v-model="form.date" format="dd.MM.yyyy" locale="sk" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Dátum" :enable-time-picker="false" class="mb-5 modal-input" />
<Datepicker v-model="form.date" format="dd.MM.yyyy" locale="sk" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Dátum" :enable-time-picker="false" class="mb-5 modal-input" :class="{error: v$.form.date.$errors.length}" />
<v-text-field v-model="form.starts_at_time" type="time" variant="solo" bg-color="white" :hint="v$.form.starts_at_time.$errors ? errorUtils.parseErrors(v$.form.starts_at_time.$errors) : null" :class="{ error: v$.form.starts_at_time.$errors.length }" class="mb-1 modal-input" label="Začiatok" />
<v-text-field v-model="form.ends_at_time" type="time" variant="solo" bg-color="white" :hint="v$.form.ends_at_time.$errors ? errorUtils.parseErrors(v$.form.ends_at_time.$errors) : null" :class="{ error: v$.form.ends_at_time.$errors.length }" class="modal-input" label="Koniec" />
</v-card-actions>
app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+2 -2
View File
@@ -18,8 +18,8 @@
<td>{{ subtask.duration - subtask.spent_time }} h</td>
<td class="task-action">
<div class="d-flex justify-start">
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)" />
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
<!-- <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)" /> -->
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(subtask)" />
</div>
</td>
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+2 -2
View File
@@ -17,8 +17,8 @@
<td>{{ subtask.spent_time }} h</td>
<td class="task-action">
<div class="d-flex justify-start">
<img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)">
<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">
<!-- <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(subtask, true)"> -->
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(subtask)">
</div>
</td>