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

[Task] Delete fix

Browse Source
This commit is contained in:
Matej Glasnák committed 2023-02-22 16:44:20 +01:00
1 parent 388466db98
commit ef6369714b
35 files changed
+93 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/plugins/tm@dashboard/_components/_img/bin.svg → app/src/plugins/app/_img/icons/bin.svg
View File
File renamed without changes.
app/src/plugins/tm@dashboard/_components/_img/checkmark.svg → app/src/plugins/app/_img/icons/checkmark.svg
View File
File renamed without changes.
app/src/plugins/app/_img/icons/eye.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512"><title>Eye</title><path d="M255.66 112c-77.94 0-157.89 45.11-220.83 135.33a16 16 0 00-.27 17.77C82.92 340.8 161.8 400 255.66 400c92.84 0 173.34-59.38 221.79-135.25a16.14 16.14 0 000-17.47C428.89 172.28 347.8 112 255.66 112z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><circle cx="256" cy="256" r="80" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 518 B

app/src/plugins/tm@dashboard/_components/_img/home-icon.svg → app/src/plugins/app/_img/icons/home.svg
View File
File renamed without changes.
app/src/plugins/tm@dashboard/_components/_img/icon-next.svg → app/src/plugins/app/_img/icons/icon-next.svg
View File
File renamed without changes.
app/src/plugins/tm@dashboard/_components/_img/icon-prev.svg → app/src/plugins/app/_img/icons/icon-prev.svg
View File
File renamed without changes.
app/src/plugins/tm@dashboard/_components/_img/pencil.svg → app/src/plugins/app/_img/icons/pencil.svg
View File
File renamed without changes.
app/src/plugins/app/_layout/app/_img/search-icon.svg → app/src/plugins/app/_img/icons/search.svg
View File
File renamed without changes.
app/src/plugins/app/_layout/_img/jandl-logo.svg → app/src/plugins/app/_img/jandl-logo.svg
View File
File renamed without changes.
app/src/plugins/app/_layout/app/_components/a-header.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<h1>{{ $route.meta.title }}</h1> <h1>{{ $route.meta.title }}</h1>
<div class="d-flex justify-end align-center w-100 header-sm"> <div class="d-flex justify-end align-center w-100 header-sm">
<img class="search-icon" :src="require('@/plugins/app/_layout/app/_img/search-icon.svg')" alt="search-icon" /> <img class="search-icon" :src="require('@/plugins/app/_img/icons/search.svg')" alt="search-icon" />
<input class="search-input mx-2" v-model="search" type="text" placeholder="Search" @click="$router.push({name: 'Search'})" @keyup="$events.emit('onSearch', search)" /> <input class="search-input mx-2" v-model="search" type="text" placeholder="Search" @click="$router.push({name: 'Search'})" @keyup="$events.emit('onSearch', search)" />
<v-menu> <v-menu>
app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<ion-content> <ion-content>
<img <img
class="py-5 px-5 cursor-pointer" class="py-5 px-5 cursor-pointer"
:src="require('@/plugins/app/_layout/_img/jandl-logo.svg')" :src="require('@/plugins/app/_img/jandl-logo.svg')"
alt="jandl-logo" alt="jandl-logo"
@click="refreshPage()" @click="refreshPage()"
/> />
app/src/plugins/app/_layout/auth/_components/a-header.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template> <template>
<header class="login-header-border "> <header class="login-header-border ">
<v-container> <v-container>
<img :src="require('@/plugins/app/_layout/_img/jandl-logo.svg')" alt="jandl-logo"> <img :src="require('@/plugins/app/_img/jandl-logo.svg')" alt="jandl-logo">
</v-container> </v-container>
</header> </header>
</template> </template>
app/src/plugins/app/_theme/global.sass
+7
View File
@@ -5,17 +5,24 @@
margin-left: 12px margin-left: 12px
border-radius: 50% border-radius: 50%
cursor: pointer cursor: pointer
max-height: 32px
max-width: 32px
.pencil-icon .pencil-icon
padding: 10px padding: 10px
background: rgba(0, 0, 0, 0.04) background: rgba(0, 0, 0, 0.04)
border-radius: 50% border-radius: 50%
cursor: pointer cursor: pointer
max-height: 32px
max-width: 32px
.status-badge .status-badge
background: #F2E7FE background: #F2E7FE
color: #7F39FB color: #7F39FB
width: fit-content width: fit-content
.hover
cursor: pointer !important
.task-badge .task-badge
background: rgba(0, 0, 0, 0.04) background: rgba(0, 0, 0, 0.04)
width: fit-content width: fit-content
app/src/plugins/lib@search/search/_components/a-seach-result-task.vue
+3 -3
View File
@@ -14,9 +14,9 @@
</td> </td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="pencil-icon" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon"> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon">
<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon"> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon">
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon"> <img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon">
</div> </div>
</td> </td>
</tr> </tr>
app/src/plugins/lib@search/search/_components/a-search-result-team.vue
+2 -2
View File
@@ -7,8 +7,8 @@
<td>{{ team.name }}</td> <td>{{ team.name }}</td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editTeam(team)" /> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTeam(team)" />
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteTeam(team)" /> <img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTeam(team)" />
</div> </div>
</td> </td>
</tr> </tr>
app/src/plugins/tm@_store/store/index.ts
+6 -6
View File
@@ -1,8 +1,6 @@
import axios from '@/plugins/w@custom/axios/models/axios' import axios from '@/plugins/w@custom/axios/models/axios'
import store from '@/store' import store from '@/store'
import ax from 'axios'
export default { export default {
namespaced: true, namespaced: true,
@@ -25,10 +23,10 @@ export default {
state.employees = employees state.employees = employees
// TODO: Remove // TODO: Remove
const employee = employees.find(employee => employee.email == 'zachariah.vonrueden@jandl.sk') // const employee = employees.find(employee => employee.email == 'zachariah.vonrueden@jandl.sk')
store.commit('auth/auth_success', { // store.commit('auth/auth_success', {
user: employee // user: employee
}) // })
}, },
set_teams(state: any, teams: any) { set_teams(state: any, teams: any) {
@@ -67,6 +65,7 @@ export default {
update_subtask(state: any, subtask: any) { update_subtask(state: any, subtask: any) {
state.unscheduledSubtasks = state.unscheduledSubtasks.map(st => st.id == subtask.id ? subtask : st) state.unscheduledSubtasks = state.unscheduledSubtasks.map(st => st.id == subtask.id ? subtask : st)
state.ongoingSubtasks = state.ongoingSubtasks.map(st => st.id == subtask.id ? subtask : st) state.ongoingSubtasks = state.ongoingSubtasks.map(st => st.id == subtask.id ? subtask : st)
state.mastertasks = state.mastertasks.map(mastertask => { state.mastertasks = state.mastertasks.map(mastertask => {
mastertask.subtasks = mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st) mastertask.subtasks = mastertask.subtasks.map(st => st.id == subtask.id ? subtask : st)
return mastertask return mastertask
@@ -76,6 +75,7 @@ export default {
delete_subtask(state: any, subtask: any) { delete_subtask(state: any, subtask: any) {
state.unscheduledSubtasks = state.unscheduledSubtasks.filter(st => st.id != subtask.id) state.unscheduledSubtasks = state.unscheduledSubtasks.filter(st => st.id != subtask.id)
state.ongoingSubtasks = state.ongoingSubtasks.filter(st => st.id != subtask.id) state.ongoingSubtasks = state.ongoingSubtasks.filter(st => st.id != subtask.id)
state.mastertasks = state.mastertasks.map(mastertask => { state.mastertasks = state.mastertasks.map(mastertask => {
mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id) mastertask.subtasks = mastertask.subtasks.filter(st => st.id != subtask.id)
return mastertask return mastertask
app/src/plugins/tm@dashboard/_components/z-timeline.vue
+10 -7
View File
@@ -26,7 +26,7 @@
<template v-slot:split-label="{ split }"> <template v-slot:split-label="{ split }">
<div class="w-100 h-100 d-flex flex-column"> <div class="w-100 h-100 d-flex flex-column">
<span v-if="split.date" class="d-flex align-center"> <span v-if="split.date" class="d-flex align-center">
<img v-if="getHeadingDate(split.date) == 'Dnes'" :src="require('./_img/home-icon.svg')" class="mr-2"> <img v-if="getHeadingDate(split.date) == 'Dnes'" :src="require('@/plugins/app/_img/icons/home.svg')" class="mr-2">
<p class="weekday-label">{{ getHeadingDate(split.date) }}</p> <p class="weekday-label">{{ getHeadingDate(split.date) }}</p>
</span> </span>
<span v-else class="d-flex align-center"> <span v-else class="d-flex align-center">
@@ -58,7 +58,7 @@
<template v-slot:event="{ event }"> <template v-slot:event="{ event }">
<!-- <div v-if="!event.nonWorking" @click.stop="editTask(event.id)" class="w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLenght(event) <= 9000000, 'mini-event' : getEventLenght(event) <= 5400000, 'micro-event' : getEventLenght(event) <= 3600000}"> --> <!-- <div v-if="!event.nonWorking" @click.stop="editTask(event.id)" class="w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLenght(event) <= 9000000, 'mini-event' : getEventLenght(event) <= 5400000, 'micro-event' : getEventLenght(event) <= 3600000}"> -->
<div v-if="!event.nonWorking" class="w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLenght(event) <= 9000000, 'mini-event' : getEventLenght(event) <= 5400000, 'micro-event' : getEventLenght(event) <= 3600000}"> <div v-if="!event.nonWorking" class="custom-event-body w-100 h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLenght(event) <= 9000000, 'mini-event' : getEventLenght(event) <= 5400000, 'micro-event' : getEventLenght(event) <= 3600000}" :style="{backgroundColor: event.subtask.color}">
<div class="event-content"> <div class="event-content">
<small v-if="(event.subtask.project_code && !event.is_blocker)" class="project-code">{{ event.subtask.project_code }}</small> <small v-if="(event.subtask.project_code && !event.is_blocker)" class="project-code">{{ event.subtask.project_code }}</small>
<h3>{{ event.subtask.master_task?.name || event.subtask.master_task }}</h3> <h3>{{ event.subtask.master_task?.name || event.subtask.master_task }}</h3>
@@ -71,13 +71,13 @@
</div> </div>
<div class="event-footer d-flex"> <div class="event-footer d-flex">
<v-btn rounded class="event-footer-button me-2" :class="{'completed': event.subtask.is_finished}" @click.stop="completeTask(event)"><img :src="require('./_img/checkmark.svg')" alt=""></v-btn> <v-btn rounded class="event-footer-button me-2" :class="{'completed': event.subtask.is_finished}" @click.stop="completeTask(event)"><img :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt=""></v-btn>
<v-btn rounded class="event-footer-button me-2" @click.stop="editTask(event, true)"><img :src="require('./_img/pencil.svg')" alt=""></v-btn> <v-btn rounded class="event-footer-button me-2" @click.stop="editTask(event)"><img :src="require('@/plugins/app/_img/icons/eye.svg')" alt=""></v-btn>
<v-btn rounded class="event-footer-button me-2" @click.stop="deleteTask(event)"><img :src="require('./_img/bin.svg')" alt=""></v-btn> <v-btn rounded class="event-footer-button me-2" @click.stop="deleteTask(event)"><img :src="require('@/plugins/app/_img/icons/bin.svg')" alt=""></v-btn>
</div> </div>
</div> </div>
<div v-else class="non-working-event w-100 h-100 d-flex flex-column justify-center"> <div v-else class="custom-event-body non-working-event w-100 h-100 d-flex flex-column justify-center">
<div class="d-flex justify-center align-center"> <div class="d-flex justify-center align-center">
<v-icon icon="mdi-cancel" color="black"></v-icon> <v-icon icon="mdi-cancel" color="black"></v-icon>
<h3 class="mb-0 ms-2">{{ event.title }}</h3> <h3 class="mb-0 ms-2">{{ event.title }}</h3>
@@ -352,12 +352,15 @@ export default {
.vuecal__event .vuecal__event
border-radius: 16px border-radius: 16px
padding: 20px 10px // padding: 20px 10px
text-align: left text-align: left
background: rgba(248, 248, 248, 1) background: rgba(248, 248, 248, 1)
min-height: 40px min-height: 40px
transition: min-height .4s, height .4s, box-shadow .4s, width .4s, left .4s transition: min-height .4s, height .4s, box-shadow .4s, width .4s, left .4s
.custom-event-body
padding: 20px 10px
&:has(.completed) &:has(.completed)
background: rgb(251, 251, 251) !important background: rgb(251, 251, 251) !important
border: 1px solid #cccccc !important border: 1px solid #cccccc !important
app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
+2 -2
View File
@@ -10,7 +10,7 @@
variant="outlined" variant="outlined"
></v-select> ></v-select>
<div class="d-flex date-wrapper"> <div class="d-flex date-wrapper">
<v-btn class="subheader-icon-button prev" variant="outlined" @click="prevWeek()"><img :src="require('@/plugins/tm@dashboard/_components/_img/icon-prev.svg')" alt=""></v-btn> <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 <v-text-field
class="subheader-input disabled" class="subheader-input disabled"
label="Dátum" label="Dátum"
@@ -18,7 +18,7 @@
variant="outlined" variant="outlined"
append-inner-icon="mdi-calendar-blank-outline" append-inner-icon="mdi-calendar-blank-outline"
></v-text-field> ></v-text-field>
<v-btn class="subheader-icon-button next" variant="outlined" @click="nextWeek()"><img :src="require('@/plugins/tm@dashboard/_components/_img/icon-next.svg')" alt=""></v-btn> <v-btn class="subheader-icon-button next" variant="outlined" @click="nextWeek()"><img :src="require('@/plugins/app/_img/icons/icon-next.svg')" alt=""></v-btn>
</div> </div>
<v-text-field <v-text-field
class="subheader-input disabled" class="subheader-input disabled"
app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue
+2 -2
View File
@@ -10,7 +10,7 @@
variant="outlined" variant="outlined"
></v-select> ></v-select>
<div class="d-flex date-wrapper"> <div class="d-flex date-wrapper">
<v-btn class="subheader-icon-button prev" variant="outlined" @click="prevDay()"><img :src="require('@/plugins/tm@dashboard/_components/_img/icon-prev.svg')" alt=""></v-btn> <v-btn class="subheader-icon-button prev" variant="outlined" @click="prevDay()"><img :src="require('@/plugins/app/_img/icons/icon-prev.svg')" alt=""></v-btn>
<v-text-field <v-text-field
class="subheader-input disabled" class="subheader-input disabled"
label="Dátum" label="Dátum"
@@ -18,7 +18,7 @@
variant="outlined" variant="outlined"
append-inner-icon="mdi-calendar-blank-outline" append-inner-icon="mdi-calendar-blank-outline"
></v-text-field> ></v-text-field>
<v-btn class="subheader-icon-button next" variant="outlined" @click="nextDay()"><img :src="require('@/plugins/tm@dashboard/_components/_img/icon-next.svg')" alt=""></v-btn> <v-btn class="subheader-icon-button next" variant="outlined" @click="nextDay()"><img :src="require('@/plugins/app/_img/icons/icon-next.svg')" alt=""></v-btn>
</div> </div>
<v-text-field <v-text-field
class="subheader-input disabled" class="subheader-input disabled"
app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
+7 -21
View File
@@ -15,10 +15,10 @@
</td> </td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img v-if="task.is_finished" class="pencil-icon is-finished" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(task)"> <img v-if="task.is_finished" class="pencil-icon is-finished" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(task)">
<img v-if="!task.is_finished" class="pencil-icon" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(task)"> <img v-if="!task.is_finished" class="pencil-icon" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(task)">
<img class="pencil-icon ml-2" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="openEditTaskModal(task)"> <img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="openTaskModal(task)">
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(task)"> <img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(task)">
</div> </div>
</td> </td>
</tr> </tr>
@@ -59,26 +59,12 @@ export default {
this.$events.emit('show-delete-task-modal', { task }) this.$events.emit('show-delete-task-modal', { task })
}, },
openEditTaskModal(task) { openTaskModal(task) {
this.$events.emit('show-task-modal', { task, editMode: false }) this.$events.emit('show-task-modal', { task, editMode: false })
}, },
async clickCompleteTask(task) { async clickCompleteTask(subtask) {
if (!task.is_finished) { this.$events.emit('show-complete-task-modal', { subtask })
this.openCompleteTaskModal(task)
} else {
task.is_finished = !task.is_finished
try {
await this.$axios.patch_auth(`v1/subtasks/${task.id}`, task)
this.$emit('reopenTask', task)
} catch (error) {
this.$toast.error(error)
}
}
},
openCompleteTaskModal(task) {
this.$events.emit('show-complete-task-modal', { task })
} }
} }
} }
app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
+1 -1
View File
@@ -42,7 +42,7 @@ export default {
async deleteMasterTask() { async deleteMasterTask() {
try { try {
await this.$axios.delete(`v1/mastertasks/${this.masterTask.id}`) await this.$axios.delete_auth(`v1/mastertasks/${this.masterTask.id}`)
this.$emit('on-master-task-deleted', this.masterTask) this.$emit('on-master-task-deleted', this.masterTask)
this.closeModal() this.closeModal()
} catch (error) { } catch (error) {
app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+2 -2
View File
@@ -48,8 +48,8 @@
<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4"> <div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
<h1>{{ masterTask.name }}</h1> <h1>{{ masterTask.name }}</h1>
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" /> <img class="icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
<img class="icon trash" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" /> <img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" />
</div> </div>
</div> </div>
app/src/plugins/tm@modal/task/_components/_components/a-mastertask-name.vue
+20 -1
View File
@@ -10,7 +10,7 @@
</v-col> </v-col>
<v-col cols="7"> <v-col cols="7">
<v-sheet class="py-3"> <v-sheet class="py-3">
<p class="task-badge px-4 py-2 rounded-pill"> <p class="task-badge px-4 py-2 rounded-pill hover" @click="openMastertask()" :style="{backgroundColor: color}">
{{ name }} {{ name }}
</p> </p>
</v-sheet> </v-sheet>
@@ -20,10 +20,29 @@
<script> <script>
export default { export default {
emits: ['close-modal'],
props: { props: {
name: { name: {
type: String, type: String,
required: true required: true
},
id: {
type: Number,
required: true
},
color: {
type: String,
required: true
}
},
methods: {
openMastertask() {
this.$emit('close-modal')
this.$events.emit('show-master-task-modal', {masterTask: {id: this.id}, editMode: false})
} }
} }
} }
app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+1 -1
View File
@@ -117,7 +117,7 @@ export default {
async _update(task) { async _update(task) {
try { try {
const { subtask } = await this.$axios.put_auth(`v1/subtasks/${task.id}`, task) const { subtask } = await this.$axios.put_auth(`v1/subtasks/${task.id}`, task)
this.$store.commit('tm/update_subtask', subtask)
this.closeModal() this.closeModal()
this.$events.emit('on-subtask-edited', subtask) this.$events.emit('on-subtask-edited', subtask)
} catch (error) { } catch (error) {
app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+3 -1
View File
@@ -1,5 +1,5 @@
<template> <template>
<A-mastertask-name :name="task.master_task.name" /> <A-mastertask-name :name="task.master_task?.name || task.master_task" :id="task.master_task.id" :color="task.master_task.color" @close-modal="$emit('close-modal')" />
<A-mastertask-status :status="task.is_finished" /> <A-mastertask-status :status="task.is_finished" />
<A-task-timeblocks :timeblocks="task.timeblocks" :task="task" /> <A-task-timeblocks :timeblocks="task.timeblocks" :task="task" />
<A-task-assigned-employee :employee="task.employee" /> <A-task-assigned-employee :employee="task.employee" />
@@ -22,6 +22,8 @@ import ATaskDescription from './_components/a-task-description.vue'
import ZFiles from '@/plugins/tm@modal/_components/z-files.vue' import ZFiles from '@/plugins/tm@modal/_components/z-files.vue'
export default { export default {
emits: ['close-modal'],
components: { components: {
ZFiles, ZFiles,
AMastertaskName, AMastertaskName,
app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<v-dialog v-model="visible" max-width="750"> <v-dialog v-model="visible" max-width="750">
<v-card> <v-card>
<div class="d-flex justify-space-between align-center"> <div class="d-flex justify-space-between align-center">
<h1>Ste si istý, že chcete {{ this.subtask.is_finished ? 'dokončiť' : 'otvoriť' }} task, z masterTasku <b>{{ subtask?.master_task }}</b>?</h1> <h1>Ste si istý, že chcete {{ this.subtask.is_finished ? 'znovu otvoriť' : 'dokončiť' }} task, z masterTasku <b>{{ subtask?.master_task?.name || subtask.master_task }}</b>?</h1>
<v-icon <v-icon
@click.stop="visible = false" @click.stop="visible = false"
icon="mdi-close" icon="mdi-close"
app/src/plugins/tm@modal/task/z-delete-task-modal.vue
+1 -1
View File
@@ -42,7 +42,7 @@ export default {
async deleteTask() { async deleteTask() {
try { try {
await this.$axios.delete(`v1/subtasks/${this.task.id}`) await this.$axios.delete_auth(`v1/subtasks/${this.task.id}`)
this.$store.commit('tm/delete_subtask', this.task) this.$store.commit('tm/delete_subtask', this.task)
this.$emit('on-task-deleted', this.task) this.$emit('on-task-deleted', this.task)
app/src/plugins/tm@modal/task/z-task-modal.vue
+9 -4
View File
@@ -34,17 +34,18 @@
<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4"> <div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
<h1>{{ task.title }}</h1> <h1>{{ task.title }}</h1>
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" /> <img class="icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
<img class="icon trash" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(task)" /> <img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(task)" />
</div> </div>
</div> </div>
<v-card-actions class="d-flex flex-column modal-content"> <v-card-actions class="d-flex flex-column modal-content">
<div class="w-100"> <div class="w-100">
<Z-task-readonly-info :task="task" /> <Z-task-readonly-info :task="task" @close-modal="closeModal" />
<div class="d-flex justify-start align-center mt-8"> <div class="d-flex justify-start align-center mt-8">
<v-btn class="done-btn" @click.stop="task.is_finished = 1; save()">Dokončené</v-btn> <v-btn class="done-btn" v-if="!task.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="save()">Uložiť zmeny</v-btn>
</div> </div>
</div> </div>
@@ -214,6 +215,10 @@ export default {
this.$events.emit("show-delete-task-modal", { task }) this.$events.emit("show-delete-task-modal", { task })
}, },
showCompleteTaskModal() {
this.$events.emit('show-complete-task-modal', { subtask: this.task })
},
filesUploaded(files) { filesUploaded(files) {
this.task.files = files this.task.files = files
}, },
app/src/plugins/tm@overview/_img/pencil-icon.svg
-4
View File
@@ -1,4 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.33329 13.3334V13.8334C5.4659 13.8334 5.59308 13.7807 5.68685 13.6869L5.33329 13.3334ZM2.66663 13.3334H2.16663C2.16663 13.6095 2.39048 13.8334 2.66663 13.8334V13.3334ZM2.66663 10.6667L2.31307 10.3132C2.2193 10.4069 2.16663 10.5341 2.16663 10.6667H2.66663ZM10.1952 3.13813L10.5488 3.49169V3.49169L10.1952 3.13813ZM11.138 3.13813L10.7845 3.49169V3.49169L11.138 3.13813ZM12.8619 4.86199L13.2154 4.50844V4.50844L12.8619 4.86199ZM12.8619 5.8048L12.5083 5.45125L12.8619 5.8048ZM5.33329 12.8334H2.66663V13.8334H5.33329V12.8334ZM3.16663 13.3334V10.6667H2.16663V13.3334H3.16663ZM3.02018 11.0203L10.5488 3.49169L9.84167 2.78458L2.31307 10.3132L3.02018 11.0203ZM10.7845 3.49169L12.5083 5.21554L13.2154 4.50844L11.4916 2.78458L10.7845 3.49169ZM12.5083 5.45125L4.97974 12.9798L5.68685 13.6869L13.2154 6.15835L12.5083 5.45125ZM12.5083 5.21554C12.5734 5.28063 12.5734 5.38616 12.5083 5.45125L13.2154 6.15835C13.6711 5.70274 13.6711 4.96405 13.2154 4.50844L12.5083 5.21554ZM10.5488 3.49169C10.6139 3.4266 10.7194 3.4266 10.7845 3.49169L11.4916 2.78458C11.036 2.32897 10.2973 2.32897 9.84167 2.78458L10.5488 3.49169Z" fill="#14181F"/>
<path d="M8 5.33325L10.6667 7.99992" stroke="#14181F" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

app/src/plugins/tm@overview/_img/trash-icon.svg
-7
View File
@@ -1,7 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.33337 6.66675L9.33337 11.3334" stroke="#14181F" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M6.66663 6.66675L6.66663 11.3334" stroke="#14181F" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4 4V3.5C3.72386 3.5 3.5 3.72386 3.5 4H4ZM12 4H12.5C12.5 3.72386 12.2761 3.5 12 3.5V4ZM4 4.5H12V3.5H4V4.5ZM11.5 4V13.3333H12.5V4H11.5ZM11.3333 13.5H4.66667V14.5H11.3333V13.5ZM4.5 13.3333V4H3.5V13.3333H4.5ZM4.66667 13.5C4.57462 13.5 4.5 13.4254 4.5 13.3333H3.5C3.5 13.9777 4.02233 14.5 4.66667 14.5V13.5ZM11.5 13.3333C11.5 13.4254 11.4254 13.5 11.3333 13.5V14.5C11.9777 14.5 12.5 13.9777 12.5 13.3333H11.5Z" fill="#14181F"/>
<path d="M2.66663 4H13.3333" stroke="#14181F" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M10.6667 4V4.5C10.9429 4.5 11.1667 4.27614 11.1667 4H10.6667ZM5.33337 4H4.83337C4.83337 4.27614 5.05723 4.5 5.33337 4.5V4ZM6.00004 2.5H10V1.5H6.00004V2.5ZM10.1667 2.66667V4H11.1667V2.66667H10.1667ZM10.6667 3.5H5.33337V4.5H10.6667V3.5ZM5.83337 4V2.66667H4.83337V4H5.83337ZM10 2.5C10.0921 2.5 10.1667 2.57462 10.1667 2.66667H11.1667C11.1667 2.02233 10.6444 1.5 10 1.5V2.5ZM6.00004 1.5C5.35571 1.5 4.83337 2.02233 4.83337 2.66667H5.83337C5.83337 2.57462 5.90799 2.5 6.00004 2.5V1.5Z" fill="#14181F"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+4 -3
View File
@@ -13,13 +13,14 @@
<tbody> <tbody>
<tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)"> <tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)">
<td>{{ task.project_code }}</td> <td>{{ task.project_code }}</td>
<td>{{ task.master_task }}</td> <td>{{ task.master_task?.name || task.master_task }}</td>
<td>{{ task.duration }} h</td> <td>{{ task.duration }} h</td>
<td>{{ task.duration - task.spent_time }} h</td> <td>{{ task.duration - task.spent_time }} h</td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editTask(task, true)" /> <img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(task, false)">
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteTask(task)" /> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(task, true)" />
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(task)" />
</div> </div>
</td> </td>
</tr> </tr>
app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
+1 -1
View File
@@ -39,7 +39,7 @@ export default {
return null return null
return this.ongoingSubtasks.filter(subtask => { return this.ongoingSubtasks.filter(subtask => {
return this.filterParams(this.searchQuery, subtask.master_task) || this.filterParams(this.searchQuery, subtask.project_code) return this.filterParams(this.searchQuery, subtask.master_task?.name || subtask.master_task) || this.filterParams(this.searchQuery, subtask.project_code)
}) })
} }
}, },
app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+4 -3
View File
@@ -13,12 +13,13 @@
<tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)"> <tr class="cursor-pointer" v-for="task in tasks" :key="task.id" @click.stop="editTask(task, false)">
<td>{{ task.project_code }}</td> <td>{{ task.project_code }}</td>
<td>{{ task.master_task }}</td> <td>{{ task.master_task?.name || task.master_task }}</td>
<td>{{ task.spent_time }} h</td> <td>{{ task.spent_time }} h</td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editTask(task, true)"> <img class="pencil-icon mr-3" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(task, false)">
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteTask(task)"> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTask(task, true)">
<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTask(task)">
</div> </div>
</td> </td>
</tr> </tr>
app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
+1 -1
View File
@@ -39,7 +39,7 @@ export default {
return null return null
return this.unscheduledSubtasks.filter(subtask => { return this.unscheduledSubtasks.filter(subtask => {
return this.filterParams(this.searchQuery, subtask.master_task) || this.filterParams(this.searchQuery, subtask.project_code) return this.filterParams(this.searchQuery, subtask.master_task?.name || subtask.master_task) || this.filterParams(this.searchQuery, subtask.project_code)
}) })
} }
}, },
app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
+2 -2
View File
@@ -13,8 +13,8 @@
<td>{{ team.name }}</td> <td>{{ team.name }}</td>
<td class="task-action"> <td class="task-action">
<div class="d-flex justify-start"> <div class="d-flex justify-start">
<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editTeam(team)" /> <img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editTeam(team)" />
<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteTeam(team)" /> <img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="deleteTeam(team)" />
</div> </div>
</td> </td>
</tr> </tr>