From 5c8daca94f885d7f89f7789d53ef773074592c4c Mon Sep 17 00:00:00 2001
From: romankko2 <romokravarik@gmail.com>
Date: Tue, 5 Sep 2023 00:31:31 +0200
Subject: [PATCH] bugy + CR

---
 app/src/plugins/app/_config/router.ts         |  6 ++---
 .../_layout/app/_components/a-sidemenu.vue    |  8 +++---
 .../_components/a-search-result-subtasks.vue  |  2 +-
 .../tm@dashboard/_components/z-timeline.vue   | 14 +++++-----
 .../master-task/z-master-task-modal.vue       |  2 +-
 .../_components/a-task-deadline.vue           | 26 ++++++++++++++++---
 .../task/_components/z-task-readonly-info.vue |  2 +-
 .../tm@modal/task/z-complete-task-modal.vue   |  2 +-
 .../tm@modal/task/z-delete-task-modal.vue     |  2 +-
 .../plugins/tm@modal/task/z-task-modal.vue    |  2 +-
 .../plugins/tm@modal/team/z-team-modal.vue    |  8 ++++--
 11 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/app/src/plugins/app/_config/router.ts b/app/src/plugins/app/_config/router.ts
index d62d3d1..d00d9ad 100644
--- a/app/src/plugins/app/_config/router.ts
+++ b/app/src/plugins/app/_config/router.ts
@@ -55,7 +55,7 @@ const routes: Array<RouteRecordRaw> = [
 					{
 						path: '/app/dashboard/tasks',
 						name: 'Dashboard - Tasks',
-						meta: { title: 'Tasks', requiresAuth: true },
+						meta: { title: 'Sub Tasks', requiresAuth: true },
 						component: () => import('@/plugins/tm@dashboard/tasks/tasks.vue')
 					},
 					{
@@ -74,13 +74,13 @@ const routes: Array<RouteRecordRaw> = [
 					{
 						path: '/app/overview/unscheduled',
 						name: 'Overview - Unscheduled tasks',
-						meta: { title: 'Unscheduled tasks', requiresAuth: true },
+						meta: { title: 'Unscheduled Sub Tasks', requiresAuth: true },
 						component: () => import('@/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue')
 					},
 					{
 						path: '/app/overview/ongoing',
 						name: 'Overview - Ongoing tasks',
-						meta: { title: 'Ongoing tasks', requiresAuth: true },
+						meta: { title: 'Ongoing Sub Tasks', requiresAuth: true },
 						component: () => import('@/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue')
 					},
 					{
diff --git a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
index 1f25dbb..9d5ada5 100644
--- a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
@@ -30,7 +30,7 @@ export default {
 	data() {
 		return {
 			pages: [{
-				title: 'Tasks',
+				title: 'Sub Tasks',
 				pageName: 'Dashboard - Tasks'
 			},
 			{
@@ -42,11 +42,11 @@ export default {
 				pageName: 'Dashboard - Projects'
 			},
 			{
-				title: 'Unscheduled tasks',
+				title: 'Unscheduled Sub Tasks',
 				pageName: 'Overview - Unscheduled tasks'
 			},
 			{
-				title: 'Ongoing tasks',
+				title: 'Ongoing Sub Tasks',
 				pageName: 'Overview - Ongoing tasks'
 			},
 			{
@@ -88,7 +88,7 @@ export default {
 <style lang="sass" scoped>
 ion-item
 	font-weight: 500 !important
-	font-size: 15px
+	font-size: 13.5px
 	--background: #fff
 
 	&:hover
diff --git a/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue b/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
index a6de3cf..62656ab 100644
--- a/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
+++ b/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="Array.isArray(subtasks) && subtasks.length">
-		<h1 class="px-3 py-3">Tasks</h1>
+		<h1 class="px-3 py-3">Subtasks</h1>
 		<v-table>
 			<tbody>
 				<tr v-for="subtask in enrichedtasks" :key="subtask.id">
diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index 2143118..b95db4a 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -83,7 +83,7 @@
 							<small class="event-initials-date">{{ event.date?.toLocaleDateString('sk-SK') }}</small>
 						</div>
 
-						<div class="d-flex align-center">
+						<div v-if="event.type == 'subtask'" class="d-flex align-center">
 							<v-icon icon="mdi-skull-outline" size="small" />
 							<small v-if="event?.subtask.deadline" class="ml-1">{{ getDeadline(event?.subtask) }}</small>
 							<v-tooltip v-else text="Deadline z Mastertasku" location="bottom">
@@ -453,7 +453,6 @@ export default {
 
 				.vuecal__event
 					border-radius: 16px
-					// padding: 20px 10px
 					min-height: 70px !important
 					text-align: left
 					background: rgba(248, 248, 248, 1)
@@ -503,14 +502,15 @@ export default {
 
 						.mini-event
 							.event-content
-								display: flex
-								align-items: center
-								flex-wrap: nowrap
-								justify-content: space-between
+								// display: flex
+								// align-items: center
+								// flex-wrap: nowrap
+								// justify-content: space-between
 								width: 100%
+								padding: 5px 10px
 
 							.event-initials-wrapper
-								margin-bottom: 0
+								// margin-bottom: 0
 								.event-initials
 									margin-right: 0
 
diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
index e5b4a34..f1ab6c6 100644
--- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
@@ -76,7 +76,7 @@
 						<A-tasks-table :subtasks="mastertask.subtasks" />
 
 						<div class="d-flex align-center ">
-							<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať task</v-btn>
+							<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať sub task</v-btn>
 						</div>
 					</div>
 				</v-card-actions>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
index 02f081a..7b72387 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
@@ -10,28 +10,46 @@
 		</v-col>
 		<v-col cols="7">
 			<v-sheet class="py-3">
-				<p v-if="deadline" :class="`${tmUtils.isAfter(deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(deadline) }}</p>
-				<p v-else>Tento task nema určený deadline</p>
+				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }}</p>
+				<v-tooltip v-else text="Deadline z Mastertasku" location="end">
+					<template v-slot:activator="{ props }">
+						<span class="cursor-pointer" v-bind="props">{{ getMasterTaskDeadline(subtask) }}*</span>
+					</template>
+				</v-tooltip>
 			</v-sheet>
 		</v-col>
 	</v-row>
 </template>
 
 <script>
-import tmUtils from '@/plugins/tm@_utils/tm.utils'
+import tmUtils 			from '@/plugins/tm@_utils/tm.utils'
+import moment 			from 'moment'
+import { mapGetters } 	from 'vuex'
 
 export default {
 	props: {
-		deadline: {
+		subtask: {
 			type: [String, Object, null],
 			required: true
 		}
 	},
 
+	computed: {
+		...mapGetters('tm', ['mastertasks'])
+	},
+
 	data() {
 		return {
 			tmUtils
 		}
+	},
+
+	methods: {
+		getMasterTaskDeadline(subtask) {
+			if(!this.mastertasks) return ''
+			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
+			return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
+		}
 	}
 }
 </script>
\ No newline at end of file
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 43fe465..e32c62c 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
@@ -1,7 +1,7 @@
 <template>
 	<A-mastertask-name      	:name="subtask._master_task.name" :id="subtask.master_task_id" :color="subtask._master_task.color" @close-modal="$emit('close-modal')" />
     <A-mastertask-status    	:isFinished="subtask.is_finished" />
-	<A-task-deadline 			:deadline="subtask.deadline" />
+	<A-task-deadline 			:subtask="subtask" />
 	<A-task-timeblocks			:timeblocks="subtask.timeblocks" :subtask="subtask" @update-subtask="$emit('update-subtask', $event)" />
     <Z-created-by 				:employee-id="subtask.created_by" />
     <A-task-assigned-employee  	:employee="subtask._employee" />
diff --git a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
index 8c957f4..5fb9b78 100644
--- a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
@@ -2,7 +2,7 @@
 	<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>
+				<h1>Ste si istý, že chcete {{ subtask.is_finished ? 'znovu otvoriť' : 'dokončiť' }} sub task, z mastertasku <b>{{ subtask?.master_task?.name || subtask.master_task }}</b>?</h1>
 				<v-icon
 					@click.stop="closeModal()"
 					icon="mdi-close"
diff --git a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
index 78009d8..8c6779d 100644
--- a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
@@ -2,7 +2,7 @@
 	<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>
+				<h1>Ste si istý, že chcete zmazať sub task z mastertasku <b>{{ subtask.project_code }}</b>?</h1>
 
 				<v-icon
 					@click.stop="closeModal()"
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index a7323c5..4237200 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -3,7 +3,7 @@
 		<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">
-					<h1>{{ subtask?.id ? 'Upraviť task' : 'Vytvoriť task' }}</h1>
+					<h1>{{ subtask?.id ? 'Upraviť sub task' : 'Vytvoriť sub task' }}</h1>
 					<v-icon @click.stop="closeModal()" icon="mdi-close" size="large"></v-icon>
 				</div>
 
diff --git a/app/src/plugins/tm@modal/team/z-team-modal.vue b/app/src/plugins/tm@modal/team/z-team-modal.vue
index f80a836..a00cae7 100644
--- a/app/src/plugins/tm@modal/team/z-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-team-modal.vue
@@ -113,10 +113,14 @@ export default {
 			try {
 				if (this.team.id) {
 					const { team } = await this.$axios.put_auth(`v1/teams/${this.team.id}`, this.team)
-					this.$store.commit('tm/update_team', team)
+					
+					const fullTeamResource = await this.$axios.get_auth_data(`v1/teams/${team.id}`)
+					this.$store.commit('tm/update_team', fullTeamResource)
 				} else {
 					const { team } = await this.$axios.post_auth(`v1/teams`, this.team)
-					this.$store.commit('tm/save_team', team)
+
+					const fullTeamResource = await this.$axios.get_auth_data(`v1/teams/${team.id}`)
+					this.$store.commit('tm/save_team', fullTeamResource)
 				}
 
 				this.closeModal()