mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[Task] Added description
This commit is contained in:
1 parent
50408f6286
commit
a980015565
4 files changed
+24
-5
No files matched your search
@@ -1,16 +1,26 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="px-5 py-5 border-bottom">
|
<div class="px-5 py-5 border-bottom" v-if="description" >
|
||||||
<p>Popis zadania</p>
|
<p>Popis zadania</p>
|
||||||
<section v-html="description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
|
<section v-html="description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="px-5 py-5 border-bottom" v-if="masterTaskDescription">
|
||||||
|
<p>Popis mastertasku</p>
|
||||||
|
<section v-html="masterTaskDescription" class="description-detail px-2 py-2 w-100 rounded mt-2" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
description: {
|
description: {
|
||||||
type: String,
|
type: String || null,
|
||||||
default: () => ''
|
default: () => null
|
||||||
|
},
|
||||||
|
|
||||||
|
masterTaskDescription: {
|
||||||
|
type: String || null,
|
||||||
|
default: () => null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,9 +117,14 @@ 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.$store.commit('tm/update_subtask', subtask)
|
||||||
this.$events.emit('on-subtask-edited', subtask)
|
this.$events.emit('on-subtask-edited', subtask)
|
||||||
|
|
||||||
|
this.$store.dispatch('tm/loadMastertasks')
|
||||||
|
this.$store.dispatch('tm/loadUnscheduledSubtasks')
|
||||||
|
this.$store.dispatch('tm/loadOngoingSubtasks')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$toast.error(error.message || error)
|
this.$toast.error(error.message || error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,6 +126,10 @@ export default {
|
|||||||
|
|
||||||
this.closeModal()
|
this.closeModal()
|
||||||
this.$events.emit('on-subtask-edited', subtask)
|
this.$events.emit('on-subtask-edited', subtask)
|
||||||
|
|
||||||
|
this.$store.dispatch('tm/loadMastertasks')
|
||||||
|
this.$store.dispatch('tm/loadUnscheduledSubtasks')
|
||||||
|
this.$store.dispatch('tm/loadOngoingSubtasks')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.$toast.error(error.message || error)
|
this.$toast.error(error.message || error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<A-task-planned-time :hours="task.duration" />
|
<A-task-planned-time :hours="task.duration" />
|
||||||
<A-task-remaining-time :hours="task.duration - task.spent_time" />
|
<A-task-remaining-time :hours="task.duration - task.spent_time" />
|
||||||
<A-task-spent-time :hours="task.spent_time" :task="task" />
|
<A-task-spent-time :hours="task.spent_time" :task="task" />
|
||||||
<A-task-description :description="task.description" />
|
<A-task-description :description="task.description" :master-task-description="task.master_task_description" />
|
||||||
<Z-files :files="task.files" />
|
<Z-files :files="task.files" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user