From a98001556551c272f6b08f283b17921ecaec840b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= <glasnak@wezeo.com>
Date: Thu, 23 Feb 2023 14:19:20 +0100
Subject: [PATCH] [Task] Added description

---
 .../_components/a-task-description.vue           | 16 +++++++++++++---
 .../_components/a-task-spent-time.vue            |  7 ++++++-
 .../_components/a-task-timeblocks.vue            |  4 ++++
 .../task/_components/z-task-readonly-info.vue    |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
index ec9aa94..f5f181f 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
@@ -1,16 +1,26 @@
 <template>
-	<div class="px-5 py-5 border-bottom">
+	<div class="px-5 py-5 border-bottom" v-if="description" >
 		<p>Popis zadania</p>
 		<section v-html="description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
 	</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>
 
 <script>
 export default {
 	props: {
 		description: {
-			type: String,
-			default: () => ''
+			type: String || null,
+			default: () => null
+		},
+
+		masterTaskDescription: {
+			type: String || null,
+			default: () => null
 		}
 	}
 }
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
index 3fbd5bb..19ad881 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
@@ -117,9 +117,14 @@ export default {
 		async _update(task) {
 			try {
 				const { subtask } = await this.$axios.put_auth(`v1/subtasks/${task.id}`, task)
-				this.$store.commit('tm/update_subtask', subtask)
+				
 				this.closeModal()
+				this.$store.commit('tm/update_subtask', 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) {
 				this.$toast.error(error.message || error)
 			}
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index eaca7f9..3e5044c 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -126,6 +126,10 @@ export default {
 
 				this.closeModal()
 				this.$events.emit('on-subtask-edited', subtask)
+
+				this.$store.dispatch('tm/loadMastertasks')
+				this.$store.dispatch('tm/loadUnscheduledSubtasks')
+				this.$store.dispatch('tm/loadOngoingSubtasks')
 			} catch (error) {
 				this.$toast.error(error.message || error)
 			}
diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
index 67ca42a..319ecaa 100644
--- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
@@ -6,7 +6,7 @@
     <A-task-planned-time        :hours="task.duration" />
     <A-task-remaining-time      :hours="task.duration - task.spent_time" />
     <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" />
 </template>