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

Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

Browse Source
This commit is contained in:
StudioTem committed 2023-07-24 09:17:17 +02:00
2 parents c5812ecb07 9a5346eded
commit 1644c8ca52
15 files changed
+56 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@_components/z-files-upload.vue
+2
View File
@@ -66,6 +66,8 @@ export default {
this.uploadedFiles = [...this.uploadedFiles, ...files]
this.$emit('files-uploaded', this.uploadedFiles)
this.$refs.fileUpload.value = ''
},
remove(index) {
app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
<W-loadable :content="blocker" class="h-100">
<v-card height="100%" class="d-flex flex-column">
<div class="d-flex justify-space-between align-center modal-header">
app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
+10 -3
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Ste si istý, že chcete zmazať <b>{{ blocker.name }}</b>?</h1>
@@ -12,7 +12,7 @@
></v-icon>
</div>
<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
<v-btn class="button primary half" variant="flat" @click="deleteBlocker()">ÁNO</v-btn>
<v-btn class="button primary half" variant="flat" @click="deleteBlocker()" :disabled="isDeleting">ÁNO</v-btn>
<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
</v-card-actions>
</v-card>
@@ -26,7 +26,8 @@ export default {
data() {
return {
visible: false,
blocker: null
blocker: null,
isDeleting: false
}
},
@@ -41,6 +42,10 @@ export default {
},
async deleteBlocker() {
if (this.isDeleting) return
this.isDeleting = true
try {
await this.$axios.delete_auth(`v1/blockers/${this.blocker.id}`)
@@ -48,6 +53,8 @@ export default {
this.closeModal()
} catch (error) {
this.$toast.error(error)
} finally {
this.isDeleting = false
}
}
}
app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
+10 -3
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Ste si istý, že chcete zmazať <b>{{ mastertask.name }}</b>?</h1>
@@ -12,7 +12,7 @@
></v-icon>
</div>
<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()">ÁNO</v-btn>
<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()" :disabled="isDeleting">ÁNO</v-btn>
<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
</v-card-actions>
</v-card>
@@ -26,7 +26,8 @@ export default {
data() {
return {
visible: false,
mastertask: null
mastertask: null,
isDeleting: false
}
},
@@ -41,12 +42,18 @@ export default {
},
async deleteMasterTask() {
if (this.isDeleting) return
this.isDeleting = true
try {
await this.$axios.delete_auth(`v1/mastertasks/${this.mastertask.id}`)
this.$emit('on-mastertask-deleted', this.mastertask)
this.closeModal()
} catch (error) {
this.$toast.error(error)
} finally {
this.isDeleting = false
}
}
}
app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="500" >
<v-dialog v-model="visible" max-width="500" persistent>
<v-card>
<h1 class="text-h5">
Chcete túto osobu odstrániť z tímu?
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+6 -6
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
<W-loadable :content="mastertask" class="h-100">
<v-card v-if="editMode" height="100%" class="d-flex flex-column scrolling">
<div class="d-flex justify-space-between align-center modal-header">
@@ -304,10 +304,10 @@ export default {
},
_mergeDeadlineTimeDate() {
const date = new Date(this.mastertask.deadline);
const timeParts = this.mastertask._deadline_time.split(':');
date.setHours(parseInt(timeParts[0]));
date.setMinutes(parseInt(timeParts[1]));
const date = new Date(this.mastertask.deadline)
const timeParts = this.mastertask._deadline_time.split(':')
date.setHours(parseInt(timeParts[0]))
date.setMinutes(parseInt(timeParts[1]))
this.mastertask.deadline = date
},
@@ -339,7 +339,7 @@ export default {
const hours = date.getHours()
const minutes = date.getMinutes()
this.mastertask._deadline_time = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
this.mastertask._deadline_time = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`
})
}
}
app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Vytvoriť</h1>
app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+1 -1
View File
@@ -35,7 +35,7 @@
</v-col>
</v-row>
<v-dialog max-width="750" v-model="showModal">
<v-dialog max-width="750" v-model="showModal" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Pridať odpracovaný čas</h1>
app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+1 -1
View File
@@ -25,7 +25,7 @@
</v-col>
</v-row>
<v-dialog max-width="750" v-model="showModal">
<v-dialog max-width="750" v-model="showModal" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Pridať dátum</h1>
app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Ste si istý, že chcete {{ subtask.is_finished ? 'znovu otvoriť' : 'dokončiť' }} task, z mastertasku <b>{{ subtask?.master_task?.name || subtask.master_task }}</b>?</h1>
app/src/plugins/tm@modal/task/z-delete-task-modal.vue
+10 -3
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Ste si istý, že chcete zmazať task z mastertasku <b>{{ subtask.project_code }}</b>?</h1>
@@ -12,7 +12,7 @@
></v-icon>
</div>
<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
<v-btn class="button primary half" variant="flat" @click="deleteTask()">ÁNO</v-btn>
<v-btn class="button primary half" variant="flat" @click="deleteTask()" :disabled="isDeleting">ÁNO</v-btn>
<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
</v-card-actions>
</v-card>
@@ -26,7 +26,8 @@ export default {
data() {
return {
visible: false,
subtask: null
subtask: null,
isDeleting: false
}
},
@@ -41,6 +42,10 @@ export default {
},
async deleteTask() {
if (this.isDeleting) return
this.isDeleting = true
try {
await this.$axios.delete_auth(`v1/subtasks/${this.subtask.id}`)
@@ -49,6 +54,8 @@ export default {
this.closeModal()
} catch (error) {
this.$toast.error(error)
} finally {
this.isDeleting = false
}
}
}
app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog max-width="750" v-model="visible">
<v-dialog max-width="750" v-model="visible" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>Pridať odpracovaný čas</h1>
app/src/plugins/tm@modal/task/z-task-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
<W-loadable :content="subtask" class="h-100">
<v-card v-if="editMode" height="100%" class="d-flex flex-column scrolling">
<div class="d-flex justify-space-between align-center modal-header">
app/src/plugins/tm@modal/team/z-delete-team-modal.vue
+9 -3
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750">
<v-dialog v-model="visible" max-width="750" persistent>
<v-card>
<div class="d-flex justify-space-between align-center">
<h1>
@@ -9,7 +9,7 @@
</div>
<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
<v-btn class="button primary half" variant="flat" @click="deleteTeam()">ÁNO</v-btn>
<v-btn class="button primary half" variant="flat" @click="deleteTeam()" :disabled="isDeleting">ÁNO</v-btn>
<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
</v-card-actions>
</v-card>
@@ -23,7 +23,8 @@ export default {
data() {
return {
visible: false,
team: null
team: null,
isDeleting: false
}
},
@@ -38,6 +39,9 @@ export default {
},
async deleteTeam() {
if (this.isDeleting) return
this.isDeleting = true
try {
await this.$axios.delete_auth(`v1/teams/${this.team.id}`)
this.visible = false
@@ -45,6 +49,8 @@ export default {
this.$store.commit('tm/delete_team', this.team)
} catch (error) {
this.$toast.error(error)
} finally {
this.isDeleting = false
}
}
}
app/src/plugins/tm@modal/team/z-team-modal.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
<W-loadable :content="team" class="h-100">
<v-card height="100%" class="d-flex flex-column">
<div class="d-flex justify-space-between align-center modal-header">