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

app/.env

@@ -1 +1 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/be/api/
+VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/

app/package.json

@@ -19,11 +19,11 @@
 		"@vuelidate/validators": "^2.0.0",
 		"@vuepic/vue-datepicker": "^3.6.0",
 		"@vueup/vue-quill": "^1.0.1",
-		"file-saver": "^2.0.5",
 		"axios": "^1.1.3",
 		"axios-auth-refresh": "^3.3.4",
 		"core-js": "^3.8.3",
 		"date-fns": "^2.29.3",
+		"file-saver": "^2.0.5",
 		"lodash-es": "^4.17.21",
 		"mitt": "^2.1.0",
 		"moment": "^2.29.4",

app/public/mock/v1/master-tasks/(id).GET.json

@@ -29,6 +29,46 @@
 				"surname": "Gajdos"
 			}
 		],
+		"tasks": [
+			{
+				"id": 1,
+				"project_code": "CO-2201",
+				"title": "Nazov tasku 1 (Ongoing)",
+				"description": "Urna vitae, suscipit suspendisse lectus arcu, imperdiet. Vulputate sit nec ut et. Urna ut a ac amet, donec orci non. Posuere elit magna consequat volutpat bibendum. Accumsan gravida elit condimentum sed. Congue non, dictum nec accumsan egestas vel. Sed molestie pretium odio morbi. Amet nunc, diam ridiculus dis condimentum arcu. Rhoncus, elementum, quis aenean neque. Faucibus leo laoreet lobortis vitae elementum. Condimentum ornare iaculis in fames in ut sit enim.",
+				"duration": 5400000,
+				"spent_time": 3000000,
+				"is_finished": false,
+				"dates": [],
+				"master_task": {
+					"id": 1,
+					"title": "Master task 1",
+					"employees": [
+						{
+							"id": 1,
+							"name": "Rastislav",
+							"surname": "Kuttner"
+						},
+						{
+							"id": 4,
+							"name": "Viliam",
+							"surname": "Sedivy"
+						},
+			
+						{
+							"id": 5,
+							"name": "Pavel",
+							"surname": "Gajdos"
+						}
+					]
+				},
+				"employee": {
+					"id": 1,
+					"duration": 1300000,
+					"name": "Viliam",
+					"surname": "Sedivy"
+				}
+			}
+		],
 		"files": [
 			{
 				"content_type": "application/png",

app/public/mock/v1/overview/projects.GET.json

@@ -1,44 +0,0 @@
-{
-	"data": [
-		{
-			"id": 1,
-			"name": "Master task 1",
-			"starts_at": "2023-01-01",
-			"deadline": "2023-01-09",
-			"is_finished": true,
-			"project_code": "CO-2201",
-			"color": "#BB86FC"
-		},
-
-		{
-			"id": 2,
-			"name": "Master task 2",
-			"starts_at": "2023-01-02",
-			"deadline": "2023-01-05",
-			"is_finished": false,
-			"project_code": "CO-2201",
-			"color": "#FF7B5E"
-		},
-
-		{
-			"id": 3,
-			"name": "Master task 3",
-			"starts_at": "2023-01-12",
-			"deadline": "2023-01-15",
-			"is_finished": false,
-			"project_code": "CO-2201",
-			"color": "#011995"
-		},
-
-		{
-			"id": 4,
-			"name": "Master task 4",
-			"starts_at": "2023-01-12",
-			"deadline": "2023-02-12",
-			"is_finished": false,
-			"project_code": "CO-2201",
-			"color": "#BABE00"
-		}
-	],
-	"status": 200
-}

app/public/mock/v1/overview/tasks.GET.json

@@ -38,8 +38,8 @@
 		"tasks": [
 			{
 				"id": 1,
-				"starts_at": "2023-01-18T08:01:00+00:00",
-				"ends_at": "2023-01-18T09:00:00+00:00",
+				"starts_at": "2023-01-26T08:01:00+00:00",
+				"ends_at": "2023-01-26T09:00:00+00:00",
 				"title": "Task DNES",
 				"project_code": "CO-2201",
 				"master_task_color": "#E9FFE6",
@@ -48,8 +48,8 @@
 
 			{
 				"id": 2,
-				"starts_at": "2023-01-19T08:30:00+00:00",
-				"ends_at": "2023-01-19T09:00:00+00:00",
+				"starts_at": "2023-01-27T08:30:00+00:00",
+				"ends_at": "2023-01-27T09:00:00+00:00",
 				"title": "Kratky 30min Lorem ipsum dolor sit amet, consectetur adipiscing e",
 				"project_code": "CO-2201",
 				"master_task_color": "#f27e57",
@@ -58,8 +58,8 @@
 
 			{
 				"id": 3,
-				"starts_at": "2023-01-19T10:30:00+00:00",
-				"ends_at": "2023-01-19T10:45:00+00:00",
+				"starts_at": "2023-01-27T10:30:00+00:00",
+				"ends_at": "2023-01-27T10:45:00+00:00",
 				"title": "Kratky 15min",
 				"project_code": "CO-2201",
 				"master_task_color": "#57e0f2",
@@ -68,8 +68,8 @@
 
 			{
 				"id": 4,
-				"starts_at": "2023-01-20T08:00:00+00:00",
-				"ends_at": "2023-01-20T10:00:00+00:00",
+				"starts_at": "2023-01-26T08:00:00+00:00",
+				"ends_at": "2023-01-26T10:00:00+00:00",
 				"title": "Task 2",
 				"project_code": "CO-2201",
 				"master_task_color": "#FDE1FF",
@@ -78,8 +78,8 @@
 
 			{
 				"id": 6,
-				"starts_at": "2023-01-20T09:00:00+00:00",
-				"ends_at": "2023-01-20T12:00:00+00:00",
+				"starts_at": "2023-01-27T09:00:00+00:00",
+				"ends_at": "2023-01-27T12:00:00+00:00",
 				"title": "Task 6",
 				"project_code": "CO-2201",
 				"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
 
 			{
 				"id": 7,
-				"starts_at": "2023-01-20T12:00:00+00:00",
-				"ends_at": "2023-01-20T16:00:00+00:00",
+				"starts_at": "2023-01-28T12:00:00+00:00",
+				"ends_at": "2023-01-28T16:00:00+00:00",
 				"title": "Task 7",
 				"project_code": "CO-2201",
 				"master_task_color": "#E7DBF8",

app/public/mock/v1/overview/teams.GET.json

@@ -10,8 +10,8 @@
 			"tasks": [
 				{
 					"id": 1,
-					"starts_at": "2023-01-19T08:01:00+00:00",
-					"ends_at": "2023-01-19T09:00:00+00:00",
+					"starts_at": "2023-01-27T08:01:00+00:00",
+					"ends_at": "2023-01-27T09:00:00+00:00",
 					"title": "Task DNES",
 					"project_code": "CO-2201",
 					"master_task_color": "#E9FFE6",
@@ -20,8 +20,8 @@
 
 				{
 					"id": 2,
-					"starts_at": "2023-01-19T08:30:00+00:00",
-					"ends_at": "2023-01-19T09:00:00+00:00",
+					"starts_at": "2023-01-27T08:30:00+00:00",
+					"ends_at": "2023-01-27T09:00:00+00:00",
 					"title": "Kratky 30min",
 					"project_code": "CO-2201",
 					"master_task_color": "#f27e57",
@@ -30,8 +30,8 @@
 
 				{
 					"id": 3,
-					"starts_at": "2023-01-20T10:30:00+00:00",
-					"ends_at": "2023-01-20T10:45:00+00:00",
+					"starts_at": "2023-01-28T10:30:00+00:00",
+					"ends_at": "2023-01-28T10:45:00+00:00",
 					"title": "Kratky 15min",
 					"project_code": "CO-2201",
 					"master_task_color": "#57e0f2",
@@ -49,8 +49,8 @@
 			"tasks": [
 				{
 					"id": 4,
-					"starts_at": "2023-01-19T08:01:00+00:00",
-					"ends_at": "2023-01-19T09:00:00+00:00",
+					"starts_at": "2023-01-27T08:01:00+00:00",
+					"ends_at": "2023-01-27T09:00:00+00:00",
 					"title": "Task DNES",
 					"project_code": "CO-2201",
 					"master_task_color": "#E9FFE6",
@@ -59,8 +59,8 @@
 
 				{
 					"id": 5,
-					"starts_at": "2023-01-19T08:30:00+00:00",
-					"ends_at": "2023-01-19T09:00:00+00:00",
+					"starts_at": "2023-01-28T08:30:00+00:00",
+					"ends_at": "2023-01-28T09:00:00+00:00",
 					"title": "Kratky 30min",
 					"project_code": "CO-2201",
 					"master_task_color": "#f27e57",
@@ -69,8 +69,8 @@
 
 				{
 					"id": 6,
-					"starts_at": "2023-01-19T10:30:00+00:00",
-					"ends_at": "2023-01-19T10:45:00+00:00",
+					"starts_at": "2023-01-28T10:30:00+00:00",
+					"ends_at": "2023-01-28T10:45:00+00:00",
 					"title": "Kratky 15min",
 					"project_code": "CO-2201",
 					"master_task_color": "#57e0f2",
@@ -88,8 +88,8 @@
 			"tasks": [
 				{
 					"id": 1,
-					"starts_at": "2023-01-20T08:01:00+00:00",
-					"ends_at": "2023-01-20T09:00:00+00:00",
+					"starts_at": "2023-01-27T08:01:00+00:00",
+					"ends_at": "2023-01-27T09:00:00+00:00",
 					"title": "Task DNES",
 					"project_code": "CO-2201",
 					"master_task_color": "#E9FFE6",
@@ -98,8 +98,8 @@
 
 				{
 					"id": 2,
-					"starts_at": "2023-01-19T08:30:00+00:00",
-					"ends_at": "2023-01-19T09:00:00+00:00",
+					"starts_at": "2023-01-27T08:30:00+00:00",
+					"ends_at": "2023-01-27T09:00:00+00:00",
 					"title": "Kratky 30min",
 					"project_code": "CO-2201",
 					"master_task_color": "#f27e57",
@@ -108,8 +108,8 @@
 
 				{
 					"id": 3,
-					"starts_at": "2023-01-20T10:30:00+00:00",
-					"ends_at": "2023-01-20T10:45:00+00:00",
+					"starts_at": "2023-01-27T10:30:00+00:00",
+					"ends_at": "2023-01-27T10:45:00+00:00",
 					"title": "Kratky 15min",
 					"project_code": "CO-2201",
 					"master_task_color": "#57e0f2",

app/public/mock/v1/tasks/(id).GET.json

@@ -1,64 +1,41 @@
 {
 	"data": {
 		"id": 1,
-		"description": "Urna vitae, suscipit suspendisse lectus arcu, imperdiet. Vulputate sit nec ut et. Urna ut a ac amet, donec orci non. Posuere elit magna consequat volutpat bibendum. Accumsan gravida elit condimentum sed. Congue non, dictum nec accumsan egestas vel. Sed molestie pretium odio morbi. Amet nunc, diam ridiculus dis condimentum arcu. Rhoncus, elementum, quis aenean neque. Faucibus leo laoreet lobortis vitae elementum. Condimentum ornare iaculis in fames in ut sit enim.",
 		"project_code": "CO-2201",
-		"master_task_id": 1,
-		"master_task": "Master task 1",
-		"team_id": 1,
-		"team": {
+		"title": "Nazov tasku 1 (Ongoing)",
+		"description": "Urna vitae, suscipit suspendisse lectus arcu, imperdiet. Vulputate sit nec ut et. Urna ut a ac amet, donec orci non. Posuere elit magna consequat volutpat bibendum. Accumsan gravida elit condimentum sed. Congue non, dictum nec accumsan egestas vel. Sed molestie pretium odio morbi. Amet nunc, diam ridiculus dis condimentum arcu. Rhoncus, elementum, quis aenean neque. Faucibus leo laoreet lobortis vitae elementum. Condimentum ornare iaculis in fames in ut sit enim.",
+		"duration": 5400000,
+		"spent_time": 3000000,
+		"is_finished": false,
+		"dates": [],
+		"master_task": {
 			"id": 1,
-			"name": "Team 1",
+			"name": "Master task 1",
 			"employees": [
 				{
 					"id": 1,
 					"name": "Rastislav",
 					"surname": "Kuttner"
 				},
-
 				{
-					"id": 2,
-					"name": "Lenka",
-					"surname": "Nemeckova"
+					"id": 4,
+					"name": "Viliam",
+					"surname": "Sedivy"
 				},
-
+	
 				{
-					"id": 3,
-					"name": "Peter",
-					"surname": "Bucan"
+					"id": 5,
+					"name": "Pavel",
+					"surname": "Gajdos"
 				}
 			]
 		},
-		"employee_id": 1,
-		"assigned_employee": {
-			"id": 14,
-			"name": "Pavel",
-			"surname": "Gajdos"
+		"employee": {
+			"id": 1,
+			"duration": 1300000,
+			"name": "Viliam",
+			"surname": "Sedivy"
 		},
-		"duration": 128,
-		"worked_time": 133,
-		"is_finished": false,
-		"starts_at": "2022-11-10T11:00:00+00:00",
-		"ends_at": "2022-11-12T16:00:00+00:00",
-		"employees": [
-			{
-				"id": 1,
-				"name": "Viliam",
-				"surname": "Sedivy"
-			},
-
-			{
-				"id": 4,
-				"name": "Pavel",
-				"surname": "Gajdos"
-			},
-
-			{
-				"id": 5,
-				"name": "Francesca",
-				"surname": "Spinelli"
-			}
-		],
 		"files": [
 			{
 				"content_type": "application/pdf",

app/public/mock/v1/tasks/(id).GET__DELETE__.json

@@ -0,0 +1,96 @@
+{
+	"data": {
+		"id": 1,
+		"description": "Urna vitae, suscipit suspendisse lectus arcu, imperdiet. Vulputate sit nec ut et. Urna ut a ac amet, donec orci non. Posuere elit magna consequat volutpat bibendum. Accumsan gravida elit condimentum sed. Congue non, dictum nec accumsan egestas vel. Sed molestie pretium odio morbi. Amet nunc, diam ridiculus dis condimentum arcu. Rhoncus, elementum, quis aenean neque. Faucibus leo laoreet lobortis vitae elementum. Condimentum ornare iaculis in fames in ut sit enim.",
+		"project_code": "CO-2201",
+		"master_task_id": 1,
+		"master_task": "Master task 1",
+		"team_id": 1,
+		"team": {
+			"id": 1,
+			"name": "Team 1",
+			"employees": [
+				{
+					"id": 1,
+					"name": "Rastislav",
+					"surname": "Kuttner"
+				},
+
+				{
+					"id": 2,
+					"name": "Lenka",
+					"surname": "Nemeckova"
+				},
+
+				{
+					"id": 3,
+					"name": "Peter",
+					"surname": "Bucan"
+				}
+			]
+		},
+		"employee_id": 1,
+		"assigned_employee": {
+			"id": 14,
+			"name": "Pavel",
+			"surname": "Gajdos"
+		},
+		"duration": 128,
+		"worked_time": 133,
+		"is_finished": false,
+		"starts_at": "2022-11-10T11:00:00+00:00",
+		"ends_at": "2022-11-12T16:00:00+00:00",
+		"employees": [
+			{
+				"id": 1,
+				"name": "Viliam",
+				"surname": "Sedivy"
+			},
+
+			{
+				"id": 4,
+				"name": "Pavel",
+				"surname": "Gajdos"
+			},
+
+			{
+				"id": 5,
+				"name": "Francesca",
+				"surname": "Spinelli"
+			}
+		],
+		"files": [
+			{
+				"content_type": "application/pdf",
+				"created_at": "2022-09-23 07:02:55",
+				"description": null,
+				"disk_name": "632d5a1924093750079385.pdf",
+				"extension": "pdf",
+				"name": "File1.pdf",
+				"file_size": 132385,
+				"google_file_id": "1TgBRHhX-JVc5mkREUmoCRO4Sta3diqjo",
+				"id": 265,
+				"path": "",
+				"sort_order": 265,
+				"title": null,
+				"updated_at": "2022-09-23 07:02:55"
+			},
+			{
+				"id":274,
+				"disk_name":"632d5a3a48955848077357.rar",
+				"name":"File2.rar",
+				"file_size":58231,
+				"content_type":"application\/x-rar",
+				"title":null,
+				"description":null,
+				"sort_order":274,
+				"created_at":"2022-09-23 07:03:29",
+				"updated_at":"2022-09-23 07:03:29",
+				"google_file_id":"1CD6P9fAmCRoZTmjc3JWi1ysVDLDSReId",
+				"path":"",
+				"extension":"rar"
+			}
+		]
+	},
+	"status": 200
+}

app/src/plugins/app/_config/App.vue

@@ -4,4 +4,85 @@
 			<router-view />
 		</v-main>
 	</v-app>
-</template>
+
+	<Z-team-modal 			ref="z-team-modal" />
+	<Z-delete-team-modal 	ref="z-delete-team-modal" @deleted="onTeamDeleted" />
+
+	<Z-task-modal 			ref="z-task-modal" />
+	<Z-delete-task-modal 	ref="z-delete-task-modal" @deleted="onTaskDeleted" />
+	<Z-complete-task-modal 	ref="z-complete-task-modal" />
+	<Z-task-add-time-modal 	ref="z-task-add-time-modal" />
+	<Z-blocker-modal 		ref="z-blocker-modal" />
+
+	<Z-master-task-modal 	ref="z-master-task-modal" />
+</template>
+
+<script>
+import ZDeleteTeamModal 		from '@/plugins/tm@modal/team/z-delete-team-modal.vue'
+import ZTeamModal				from '@/plugins/tm@modal/team/z-team-modal.vue'
+import ZDeleteTaskModal 		from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
+import ZTaskModal 				from '@/plugins/tm@modal/task/z-task-modal.vue'
+import ZCompleteTaskModal 		from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
+import ZTaskAddTimeModal 		from '@/plugins/tm@modal/task/z-task-add-time-modal.vue'
+import ZBlockerModal 			from '@/plugins/tm@modal/blocker/z-blocker-modal.vue'
+// import ZDeleteMasterTaskModal 	from '@/plugins/tm@modal/master-task/z-delete-task-modal.vue'
+import ZMasterTaskModal 		from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
+
+export default {
+	components: {
+		ZDeleteTeamModal,
+		ZTeamModal,
+		ZDeleteTaskModal,
+		ZTaskModal,
+		ZMasterTaskModal,
+		ZCompleteTaskModal,
+		ZTaskAddTimeModal,
+		ZBlockerModal
+	},
+
+	mounted() {
+		this.$events.on('show-delete-team-modal', ({team}) => {
+			this.$refs['z-delete-team-modal'].showModal(team)
+		})
+
+		this.$events.on('show-team-modal', ({team}) => {
+			this.$refs['z-team-modal'].showModal(team)
+		})
+
+		this.$events.on('show-delete-task-modal', ({task}) => {
+			this.$refs['z-delete-task-modal'].showModal(task)
+		})
+
+		this.$events.on('show-task-modal', ({task, editMode}) => {
+			this.$refs['z-task-modal'].showModal(task, editMode)
+		})
+
+		this.$events.on('show-master-task-modal', ({masterTask, editMode}) => {
+			this.$refs['z-master-task-modal'].showModal(masterTask, editMode)
+		})
+
+		this.$events.on('show-complete-task-modal', ({task}) => {
+			this.$refs['z-complete-task-modal'].showModal(task)
+		})
+
+		this.$events.on('show-blocker-modal', ({blocker}) => {
+			this.$refs['z-blocker-modal'].showModal(blocker)
+		})
+
+		this.$events.on('show-task-add-time-modal', ({task}) => {
+			this.$refs['z-task-add-time-modal'].showModal(task)
+		})
+
+	},
+
+	methods: {
+		onTeamDeleted(team) {
+			this.$events.emit('on-team-deleted', team)
+		},
+
+		onTaskDeleted(task) {
+			this.$events.emit('on-task-deleted', task)
+		}
+	}
+}
+</script>

app/src/plugins/app/_config/main.ts

@@ -63,14 +63,14 @@ const options: Options = {
 			'POST v1/tasks/(id)': true,
 			'DELETE v1/tasks/(id)': true,
 
-			'GET v1/teams/(id)': false,
+			// 'GET v1/teams/(id)': true,
 			'POST v1/teams/(id)': true,
 			'DELETE v1/teams/(id)': true,
 			// 'GET v1/teams': true,
-			'GET v1/teamsx': true,
+			// 'GET v1/teamsx': true,
 			'POST v1/teams': true,
 
-			'GET v1/employees': false,
+			// 'GET v1/employees': true,
 			'GET v1/search': true,
 			'POST v1/tasks': true,
 

app/src/plugins/app/_layout/app/_components/a-header.vue

@@ -1,13 +1,13 @@
 <template>
 	<v-app-bar class="header">
-		<v-app-bar-nav-icon @click="eventBus.emit('toggle-menu')" class="menu-icon"></v-app-bar-nav-icon>
+		<v-app-bar-nav-icon @click="$events.emit('toggle-menu')" class="menu-icon"></v-app-bar-nav-icon>
 
 		<div class="d-flex justify-space-between align-center w-100">
 			<h1>{{ $route.meta.title }}</h1>
 
 			<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" />
-				<input class="search-input mx-2" v-model="search" type="text" placeholder="Search" @click="$router.push({name: 'Search'})" @keyup="eventBus.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>
 					<template v-slot:activator="{ props }">
@@ -17,10 +17,10 @@
 					</template>
 
 					<v-list>
-						<v-list-item class="cursor-pointer hover-background" @click="createMasterTaskModal()">MASTER TASK</v-list-item>
-						<v-list-item class="cursor-pointer hover-background" @click="createSubTaskModal()">SUB TASK</v-list-item>
-						<v-list-item class="cursor-pointer hover-background" @click="createTeamModal()">TÍM</v-list-item>
-						<v-list-item class="cursor-pointer hover-background" @click="createBlockerModal()">BLOCKER</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" @click="createMasterTask()">MASTER TASK</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" @click="createTask()">SUB TASK</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" @click="createTeam()">TÍM</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" @click="createBlocker()">BLOCKER</v-list-item>
 					</v-list>
 				</v-menu>
 
@@ -50,27 +50,27 @@
 			</div>
 		</div>
 
-		<Z-master-task-modal 	ref="z-master-task-modal" />
+		<!-- <Z-master-task-modal 	ref="z-master-task-modal" />
 		<Z-sub-task-modal 		ref="z-sub-task-modal" />
 		<Z-blocker-modal 		ref="z-blocker-modal" />
-		<Z-team-modal 			ref="z-team-modal" />
+		<Z-team-modal 			ref="z-team-modal" /> -->
 	</v-app-bar>
 </template>
 
 <script>
 import { mapGetters } 	from 'vuex'
-import ZTeamModal 		from '@/plugins/tm@modal/team/z-team-modal.vue'
-import ZBlockerModal 	from  '@/plugins/tm@modal/blocker/z-blocker-modal.vue'
-import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
-import ZSubTaskModal	from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
+// import ZTeamModal 		from '@/plugins/tm@modal/team/z-team-modal.vue'
+// import ZBlockerModal 	from  '@/plugins/tm@modal/blocker/z-blocker-modal.vue'
+// import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
+// import ZSubTaskModal	from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
 
 export default {
-	components: {
-		ZTeamModal,
-		ZBlockerModal,
-		ZMasterTaskModal,
-		ZSubTaskModal
-	},
+	// components: {
+	// 	ZTeamModal,
+	// 	ZBlockerModal,
+	// 	ZMasterTaskModal,
+	// 	ZSubTaskModal
+	// },
 
 	data() {
 		return {
@@ -93,20 +93,20 @@ export default {
 			}
 		},
 
-		createTeamModal() {
-			this.$refs['z-team-modal'].create()
+		createMasterTask() {
+			this.$events.emit('show-master-task-modal', {})
 		},
 
-		createMasterTaskModal() {
-			this.$refs['z-master-task-modal'].create()
+		createTask() {
+			this.$events.emit('show-task-modal', {})
 		},
 
-		createSubTaskModal() {
-			this.$refs['z-sub-task-modal'].create()
+		createTeam() {
+			this.$events.emit('show-team-modal', {})
 		},
 
-		createBlockerModal() {
-			this.$refs['z-blocker-modal'].create()
+		createBlocker() {
+			this.$events.emit('show-blocker-modal', {})
 		}
 	}
 }

app/src/plugins/app/_layout/app/_components/a-sidemenu.vue

@@ -56,8 +56,8 @@ export default {
 	},
 
 	created() {
-		this.eventBus.on("close-menu", () => this.closeMenu())
-		this.eventBus.on("toggle-menu", () => this.toggleMenu())
+		this.$events.on("close-menu", () => this.closeMenu())
+		this.$events.on("toggle-menu", () => this.toggleMenu())
 		this.unscheduledTasks()
 	},
 

app/src/plugins/app/_layout/app/app.layout.vue

@@ -2,7 +2,7 @@
 	<ion-split-pane content-id="main-content">
 		<A-sidemenu ref="sidemenu" />
 
-		<v-app @click="eventBus.emit('close-menu')" class="split-pane-right-side">
+		<v-app @click="$events.emit('close-menu')" class="split-pane-right-side">
 			<A-header />
 
 			<div class="main-content">

app/src/plugins/lib@search/search/search.vue

@@ -29,14 +29,14 @@ export default {
 			this.$toast.error(error)
 		}
 
-		this.eventBus.on('onSearch', (search) => {
+		this.$events.on('onSearch', (search) => {
 			this.search = search
 		})
 	},
 
 	methods: {
 		debounceSearch: debounce(function () {
-			this.search
+			this.search()
 		}, 300),
 	}
 }

app/src/plugins/tm@dashboard/_components/z-timeline.vue

@@ -71,9 +71,9 @@
 					</div>
 
 					<div class="event-footer d-flex">
-						<v-btn rounded class="event-footer-button me-2" :class="{'completed': event.completed}" @click.stop="clickCompleteTask(event)"><img :src="require('./_img/checkmark.svg')" alt=""></v-btn>
-						<v-btn rounded class="event-footer-button me-2" @click.stop="editTask(event.id, true)"><img :src="require('./_img/pencil.svg')" alt=""></v-btn>
-						<v-btn rounded class="event-footer-button me-2" @click.stop="showDeleteModal = {task: event}"><img :src="require('./_img/bin.svg')" alt=""></v-btn>
+						<v-btn rounded class="event-footer-button me-2" :class="{'completed': event.completed}" @click.stop="completeTask(event)"><img :src="require('./_img/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="deleteTask(event)"><img :src="require('./_img/bin.svg')" alt=""></v-btn>
 					</div>
 				</div>
 
@@ -85,30 +85,11 @@
 				</div>
 			</template>
 		</Vue-cal>
-
-		<!-- Kravarik: Prerobit modaly na novy sposob -->
-		<Z-sub-task-modal ref="z-sub-task-modal" />
-		<Z-complete-task-modal v-if="showCompleteModal" :visible="showCompleteModal ? true : false" :task="showCompleteModal.task" @completeTask="completeTask" @close="showCompleteModal = null" />
-		<Z-delete-task-modal v-if="showDeleteModal" :visible="showDeleteModal ? true : false" :task="showDeleteModal.task" @deleteTask="deleteTask" @close="showDeleteModal = null" />
-		<Z-add-time-task-modal ref="z-add-time-task-modal" />
 	</div>
 </template>
 
 <script>
-import ZCompleteTaskModal 	from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
-import ZDeleteTaskModal 	from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-import ZAddTimeTaskModal 	from '@/plugins/tm@modal/sub-task/z-add-time-task-modal.vue'
-import ZSubTaskModal 		from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
-
 export default {
-	components: {
-		ZCompleteTaskModal,
-		ZDeleteTaskModal,
-		ZAddTimeTaskModal,
-		ZSubTaskModal
-	},
-
 	props: {
 		calData: {
 			type: Object,
@@ -145,8 +126,6 @@ export default {
 				}
 			},
 			focusedEventId: null,
-			showCompleteModal: null,
-			showDeleteModal: null,
 			timeCellHeight: 100,
 		}
 	},
@@ -200,9 +179,9 @@ export default {
 
 		taskClicked(task) {
 			if (task.nonWorking) return
-			console.log("task", task)
+			// console.log("task", task)
 			if (task.end.getTime() - task.start.getTime() <= 3600000) {
-				console.log("ShortTask")
+				// console.log("ShortTask")
 			}
 		},
 
@@ -212,37 +191,24 @@ export default {
 		},
 
 		clickCompleteTask(event) {
-			if (event.completed) this.completeTask(event.id)
-			else this.showCompleteModal = {task: event}
+			if (event.completed) this.completeTask(event)
 		},
 
-		completeTask(id) {
-			this.$emit('completeTask', id)
+		completeTask(task) {
+			this.$events.emit('show-complete-task-modal', {task})
 		},
 
-		editTask(subTask, editMode) {
-			this.$refs['z-sub-task-modal'].create(subTask, editMode)
+		editTask(task, editMode) {
+			this.$events.emit('show-task-modal', {task, editMode})
 		},
 
-		addTimeModal() {
-			this.$refs['z-add-time-task-modal'].showModal()
+		addTimeModal(task) {
+			this.$events.emit('show-task-add-time-modal', {task})
 		},
 
-		deleteTask(id) {
-			this.$emit('deleteTask', id)
-		},
-
-		// completeTask(id) {
-		// 	this.$emit('completeTask', id)
-		// },
-
-		// editTask(id) {
-		// 	this.$emit('edit-task', id)
-		// },
-
-		// deleteTask(id) {
-		// 	this.$emit('deleteTask', id)
-		// },
+		deleteTask(task) {
+			this.$events.emit('show-delete-task-modal', {task})
+		}
 	}
 }
 </script>

app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue

@@ -1,18 +1,17 @@
 <template>
 	<div id="calendar" class="mb-12">
 		<V-full-calendar ref="fullCalendar" :options="calendarOptions" />
-		<Z-master-task-modal ref="z-master-task-modal" />
 	</div>
 </template>
 <script>
 import VFullCalendar 	from '@fullcalendar/vue3'
 import dayGridPlugin 	from '@fullcalendar/daygrid'
-import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
 
 export default {
+	emits: ['open-detail'],
+
 	components: {
-		VFullCalendar,
-		ZMasterTaskModal
+		VFullCalendar
 	},
 
 	props: {
@@ -39,9 +38,7 @@ export default {
 				eventContent: (eventInfo) => {
 					return { html: eventInfo.event.extendedProps.title_html }
 				},
-				eventClick: (info) => {
-					return this.editTask(info.event._def.publicId, false)
-				}
+				eventClick: (info) => this.$emit('open-detail', info.event._def.publicId)
 			}
 		}
 	},
@@ -52,12 +49,6 @@ export default {
 		this.$refs.fullCalendar?.getApi().gotoDate(new Date(currentYear, this.month, 1))
 	},
 
-	methods: {
-		editTask(masterTask, editMode) {
-			this.$refs['z-master-task-modal'].create(masterTask, editMode)
-		}
-	},
-
 	watch: {
 		month(selectedMonth) {
 			const currentYear = new Date().getFullYear()
@@ -109,4 +100,6 @@ export default {
 			border: none
 			top: 2px
 			right: 4px
+	&:deep(.fc-daygrid-day-frame)
+		min-height: 100px
 	</style>

app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue

@@ -1,12 +1,12 @@
 <template>
 	<v-row class="px-10 py-8 subheader">
-		<v-select v-model="filter.selectedProject" class="subheader-input" :items="projects" label="Projekt" variant="outlined"></v-select>
+		<v-select v-model="filter.selectedProject" class="subheader-input" :items="[null, projects]" label="Projekt" variant="outlined" :disabled="true" />
 
-		<v-select v-model="filter.selectedTeam" class="subheader-input" :items="teams" label="Tím" variant="outlined"></v-select>
+		<v-select v-model="filter.selectedTeam" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
 
-		<v-select v-model="filter.selectedEmployee" class="subheader-input" :items="employees" label="Zamestnanec" variant="outlined"></v-select>
+		<v-select v-model="filter.selectedEmployee" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" />
 
-		<v-select v-model="filter.selectedMonth" class="subheader-input" :items="months" label="Mesiac" variant="outlined"></v-select>
+		<v-select v-model="filter.selectedMonth" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
 
 		<div class="subheader-input switch">
 			<p class="switch-label">Zobraziť ukončené</p>
@@ -19,7 +19,22 @@
 export default {
 	emits: ['filterChanged'],
 
-	props: ['projects', 'teams', 'employees'],
+	props: {
+		projects: {
+			type: Array,
+			required: true
+		},
+
+		teams: {
+			type: Array,
+			required: true
+		},
+
+		employees: {
+			type: Array,
+			required: true
+		}
+	},
 
 	data() {
 		return {
@@ -37,6 +52,7 @@ export default {
 				{ title: 'November', value: 10 },
 				{ title: 'December', value: 11 }
 			],
+
 			filter: {
 				selectedProject: null,
 				selectedTeam: null,
@@ -47,6 +63,17 @@ export default {
 		}
 	},
 
+	computed: {
+		enrichedEmployees() {
+			const employees = this.employees
+
+			return employees.map(employee => {
+				employee._fullName = `${employee.name} ${employee.surname}`
+				return employee
+			})
+		}
+	},
+
 	watch: {
 		filter: {
 			handler() {

app/src/plugins/tm@dashboard/projects/projects.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
-		<W-loadable :content="events" empty-message="Nepodarilo sa nacitat data!">
-			<A-project-filter :projects="projects" @filterChanged="onFilterChanged" />
-			<A-project-calendar :events="filteredEvents" :month="filterSettings.selectedMonth" />
+		<W-loadable :content="masterTasks" empty-message="Nepodarilo sa nacitat data!">
+			<A-project-filter :projects="projects" :teams="teams" :employees="employees" @filterChanged="onFilterChanged" />
+			<A-project-calendar :events="filteredEvents" :month="filter.selectedMonth" @open-detail="openMasterTaskModal" />
 		</W-loadable>
 	</div>
 </template>
@@ -10,6 +10,7 @@
 <script>
 import AProjectCalendar from './_components/a-project-calendar.vue'
 import AProjectFilter 	from './_components/a-project-filter.vue'
+import moment from 'moment'
 
 export default {
 	components: {
@@ -18,47 +19,97 @@ export default {
 	},
 	data() {
 		return {
-			filterSettings: {
-				selectedEmployee: null,
-				selectedMonth: new Date().getMonth(),
-				selectedProject: null,
-				selectedTeam: null,
-				showFinishedTasks: false
-			},
 			// Kravarik: Toto je preco hardcodenute?
 			projects: ['Projekt1', 'Projekt2', 'Projekt3', 'Projekt4'],
+			masterTasks: null,
+			teams: null,
+			employees: null,
 			selectedProject: null,
-			events: [],
-			filteredEvents: []
+			filter: {
+				selectedMonth: new Date().getMonth()
+			}
 		}
 	},
+
+	computed: {
+		filteredEvents() {
+			if (!this.masterTasks || this.masterTasks.error)
+				return []
+
+			// duplicate all tasks
+			let events = this.masterTasks
+
+			// show/hide finished tasks
+			if (!this.filter.showFinishedTasks)
+				events = events.filter(event => !event.is_finished)
+
+			// filter by team_id
+			if (this.filter.selectedTeam)
+				events = events.filter(event => event.team_id == this.filter.selectedTeam)
+
+			// filter by employee_id
+			if (this.filter.selectedEmployee)
+				events = events.filter(event => event.employees.find(employee => employee.id == this.filter.selectedEmployee))
+
+			// format masterTasks to event format for calendar
+			events = events.map(event => {
+				const color = this._stringToHexColor(`${event.project_code}${event.name}`)
+
+				return {
+					id: event.id,
+					title: `${event.project_code} - ${event.name}`,
+					title_html: `${event.project_code} - <b>${event.name}</b>`,
+					start: new Date(event.starts_at),
+					end: new Date(event.deadline),
+					is_finished: event.is_finished,
+					project_code: event.project_code,
+					backgroundColor: `${color}CC`,
+					borderColor: color
+				}
+			})
+
+			return events
+		}
+	},
+
 	created() {
 		this._getData()
 	},
+
 	methods: {
 		async _getData() {
 			try {
-				const events = await this.$axios.get_auth_data('v1/overview/projects')
-				this.events = events.map((item) => ({
-					id: item.id,
-					title: `${item.project_code} - ${item.name}`,
-					title_html: `${item.project_code} - <b>${item.name}</b>`,
-					start: item.starts_at,
-					end: item.deadline,
-					is_finished: item.is_finished,
-					project_code: item.project_code,
-					backgroundColor: item.color,
-					borderColor: item.color
-				}))
-			this.filteredEvents = this.events.filter((item) => !item.is_finished)
+				this.teams 			= await this.$axios.get_auth_data('v1/teams')
+				this.employees 		= await this.$axios.get_auth_data('v1/employees')
+				this.masterTasks 	= await this.$axios.get_auth_data('v1/master-tasks')
 			} catch (error) {
-				this.$toast.error(error)
+				this.masterTasks = {error}
 			}
 		},
 
 		onFilterChanged(filterValues) {
 			this.filter = filterValues
-			this.filteredEvents = this.events.filter((item) => this.filter.showFinishedTasks || item.is_finished == false)
+		},
+
+		openMasterTaskModal(masterTaskId) {
+			const masterTask = this.masterTasks.find(masterTask => masterTask.id == masterTaskId)
+			console.log(masterTask)
+			this.$events.emit('show-master-task-modal', {masterTask, editMode: false})
+		},
+
+		_stringToHexColor(string) {
+			let hash = 0;
+
+			for (let i = 0; i < string.length; i++) {
+				hash = string.charCodeAt(i) + ((hash << 5) - hash);
+			}
+
+			let color = '#';
+			for (let i = 0; i < 3; i++) {
+				let value = (hash >> (i * 8)) & 0xFF;
+				color += ('00' + value.toString(16)).substr(-2);
+			}
+			return color;
 		}
 	}
 }

app/src/plugins/tm@dashboard/tasks/tasks.vue

@@ -3,12 +3,7 @@
 		<A-task-filter :unscheduledTime="unscheduledTime" @dataChanged="getTimelineData" />
 
 		<W-loadable :content="timelineData" class="w-loadable" empty-message="Nepodarilo sa nacitat data!">
-			<Z-timeline :calData="timelineData" :calConfig="config" :splits="splitDays" 
-				@eventMoved="onEventMoved" @completeTask="completeTask" @deleteTask="deleteTask" />
-
-				<!-- <Z-complete-task-modal 	ref="z-complete-task-modal" />
-				<Z-delete-task-modal 	ref="z-delete-task-modal" />
-				<Z-sub-task-modal 		ref="z-sub-task-modal" /> -->
+			<Z-timeline :calData="timelineData" :calConfig="config" :splits="splitDays" />
 		</W-loadable>
 	</div>
 </template>
@@ -16,19 +11,12 @@
 <script>
 import ATaskFilter 			from './_components/a-tasks-filter.vue'
 import ZTimeline 			from '@/plugins/tm@dashboard/_components/z-timeline.vue'
-// import ZCompleteTaskModal 	from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
-// import ZDeleteTaskModal 	from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-// import ZSubTaskModal 		from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
 import { addDays, setHours, setMinutes, setSeconds, differenceInCalendarDays } from 'date-fns'
 
 export default {
 	components: {
 		ATaskFilter,
-		ZTimeline,
-		// ZDeleteTaskModal,
-		// ZCompleteTaskModal,
-		// ZSubTaskModal
+		ZTimeline
 	},
 
 	data() {
@@ -137,7 +125,7 @@ export default {
 		},
 
 		async onEventMoved(event) {
-			console.log("drag", event)
+			// console.log("drag", event)
 			const task = this.timelineData.tasks.find(task => task.id == event.event.id)
 
 			try {
@@ -150,26 +138,13 @@ export default {
 				task.split = event.newSplit
 			} catch(error) {
 				this.$toast.error(error)
-				
+
 				task.start = new Date(event.originalEvent.start)
 				task.end = new Date(event.originalEvent.end)
 				task.split = event.oldSplit
 			}
 		},
 
-		completeTask(id) {
-			const task = this.timelineData.tasks.find(task => task.id == id)
-			task.completed = !task.completed
-		},
-
-		deleteTask(id) {
-			this.timelineData.tasks.splice(this.timelineData.tasks.findIndex(item => item.id === id), 1)
-		}
-
-		// editTask(subTask, editMode) {
-		// 	this.$refs['z-sub-task-modal'].create(subTask, editMode)
-		// },
-
 		// deleteTask(id) {
 		// 	const task = this.timelineData.find(task => task.id == id)
 		// 	this.$refs['z-delete-task-modal'].delete(task)

app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue

@@ -74,7 +74,7 @@ export default {
 		},
 
 		async _getTeams() {
-			this.teams =  await this.$axios.get_auth_data('v1/teamsx')
+			this.teams =  await this.$axios.get_auth_data('v1/teams')
 			this.selectedTeam = this.teams[0]
 		},
 

app/src/plugins/tm@dashboard/teams/teams.vue

@@ -56,7 +56,7 @@ export default {
 				this.timelineData[i].splitId = i + 1
 				this.splitDays.push({
 					id: i + 1,
-					employeeId: this.timelineData[i].id, 
+					employeeId: this.timelineData[i].id,
 					firstName: this.timelineData[i].name,
 					name: this.timelineData[i].name + " " + this.timelineData[i].surname,
 					initials: this.timelineData[i].name.charAt(0).toUpperCase() + this.timelineData[i].surname.charAt(0).toUpperCase(),
@@ -121,7 +121,7 @@ export default {
 		},
 
 		async onEventMoved(event) {
-			console.log("drag", event)
+			// console.log("drag", event)
 			const task = this.timelineData.tasks.find(task => task.id == event.event.id)
 			const newEmployeeId = this.splitDays.find(split => split.id == event.newSplit).employeeId
 

app/src/plugins/tm@modal/blocker/z-blocker-modal.vue

@@ -127,22 +127,20 @@ export default {
 		}
 	},
 
-	async created() {
-		try {
-			const allEmployees = await this.$axios.get_auth_data('v1/employees')
-			this.allEmployees  = this._enrichEmployeesByFullName(allEmployees)
-		} catch (error) {
-			this.$toast.error(error)
-		}
-	},
-
 	methods: {
-		async create(blocker = null) {
+		async showModal(blocker = null) {
 			this.visible = true
 			this.blocker = null
 
-			if (blocker) {
-				await this._load()
+			try {
+				const allEmployees = await this.$axios.get_auth_data('v1/employees')
+				this.allEmployees  = this._enrichEmployeesByFullName(allEmployees)
+			} catch (error) {
+				this.$toast.error(error)
+			}
+
+			if (blocker?.id) {
+				await this._load(blocker.id)
 			} else {
 				const blocker = {
 					name: '',

app/src/plugins/tm@modal/master-task/z-master-task-modal.vue

@@ -106,9 +106,9 @@
 					</v-btn>
 
 					<div class="w-100 modal-input">
-						<QuillEditor 
+						<QuillEditor
 							v-model="masterTask.description"
-							placeholder="Popis" 
+							placeholder="Popis"
 							theme="snow"
 							class="rich-text-editor"
 						/>
@@ -273,6 +273,7 @@
 						</div>
 						<v-table class="mt-7 mb-5">
 							<tbody class="px-5 py-5">
+								<!-- Kravarik: natiahnut toto z masterTask.tasks -->
 								<tr v-for="(employee, index) in masterTask.employees" :key="employee.id">
 									<td class="w-25">{{ masterTask.name }}</td>
 									<td class="d-flex align-center">
@@ -352,17 +353,6 @@ export default {
 		}
 	},
 
-	async created() {
-		try {
-			this.teams 		= await this.$axios.get_auth_data('v1/teamsx')
-			this.employees 	= await this.$axios.get_auth_data('v1/employees')
-			// this.masterTask = await this.$axios.get_auth_data(`v1/master-task/${this.masterTaksId}`)
-			// this.selectedTeam = `${this.masterTask.team.name} - ${this.masterTask.team.id}`)
-		} catch (error) {
-			this.$toast.error(error)
-		}
-	},
-
 	methods: {
 		// async downloadFile() {
 		// 	try {
@@ -375,13 +365,20 @@ export default {
 		// 	}
 		// },
 
-		async create(masterTaskId = null, editMode = false) {
+		async showModal(masterTask, editMode = false) {
 			this.visible = true
 			this.masterTask = null
 
-			if (masterTaskId) {
-				await this._load(masterTaskId)
-				this.editMode = editMode || (!this.masterTask?.id)
+			try {
+				this.teams 		= await this.$axios.get_auth_data('v1/teams')
+				this.employees 	= await this.$axios.get_auth_data('v1/employees')
+			} catch (error) {
+				this.$toast.error(error)
+			}
+
+			if (masterTask?.id) {
+				await this._load(masterTask.id)
+				this.editMode = editMode || !masterTask?.id
 			} else {
 				const masterTask = {
 					project_code: null,
@@ -396,7 +393,7 @@ export default {
 
 				setTimeout(() => {
 					this.masterTask = masterTask
-					this.editMode = editMode || (!this.masterTask.id)
+					this.editMode = editMode || !this.masterTask.id
 				})
 			}
 		},
@@ -408,7 +405,7 @@ export default {
 			try {
 				if (this.masterTask.id)
 					await this._update()
-					
+
 				else
 					await this._create()
 
@@ -434,7 +431,7 @@ export default {
 
 		async _create() {
 			try {
-				await this.$axios.post_auth('v1/master-tasks')
+				await this.$axios.post_auth('v1/mastertasks')
 			} catch (error) {
 				this.$toast.error(error)
 			}

app/src/plugins/tm@modal/task/z-complete-task-modal.vue

@@ -1,18 +1,18 @@
 <template>
-	<v-dialog v-model="show" max-width="650">
+	<v-dialog v-model="visible" max-width="650">
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete ukončiť <b>{{ task.title }}</b>?</h1>
 
 				<v-icon
-					@click.stop="show = false"
+					@click.stop="visible = false"
 					icon="mdi-close"
 					size="large"
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center">
 				<v-btn class="z-btn" variant="flat" @click="complete()">ÁNO</v-btn>
-				<v-btn class="ml-7 cancel-btn" @click.stop="show = false">ZRUŠIŤ</v-btn>
+				<v-btn class="ml-7 cancel-btn" @click.stop="visible = false">ZRUŠIŤ</v-btn>
 			</v-card-actions>
 		</v-card>
 	</v-dialog>
@@ -22,31 +22,19 @@
 export default {
 	emits: ['close'],
 
-	props: {
-		visible: {
-			type: Boolean,
-			required: true
-		},
-
-		task: {
-			type: Object,
-			required: true
+	data() {
+		return {
+			visible: false,
+			task: null
 		}
 	},
 
-	computed: {
-		show: {
-			get() {
-				return this.visible
-			},
-
-			set(value) {
-				if (!value) this.$emit('close')
-			}
-		},
-	},
-
 	methods: {
+		async showModal(task) {
+			this.task = task
+			this.visible = true
+		},
+
 		async complete() {
 			try {
 				const task = {
@@ -55,7 +43,7 @@ export default {
 				}
 
 				await this.$axios.post(`v1/tasks/${task.id}`, task)
-				this.show = false
+				this.visible = false
 				this.$emit('completeTask', task.id)
 			} catch (error) {
 				this.$toast.error(error)

app/src/plugins/tm@modal/task/z-delete-task-modal.vue

@@ -30,7 +30,7 @@ export default {
 	},
 
 	methods: {
-		async delete(task) {
+		async showModal(task) {
 			this.task = task
 			this.visible = true
 		},

app/src/plugins/tm@modal/task/z-task-add-time-modal.vue

@@ -49,6 +49,9 @@ export default {
 
 	methods: {
 		showModal() {
+			// Kravarik: Dorobit logiku
+			// 1. Save na be
+			// 2. this.$events.emit('task-time-updated', task)
 			this.visible = true
 		},
 

app/src/plugins/tm@modal/task/z-task-modal.vue

@@ -17,8 +17,9 @@
 						disabled
 					></v-text-field>
 
+					<!-- Toto treba fixnut -->
 					<v-select
-						v-model="selectedMasterTask"
+						v-model="selectedMasterTaskId"
 						@focus="onInputFocus"
 						class="modal-input border-select"
 						label="MasterTask"
@@ -29,12 +30,12 @@
 					></v-select>
 
 					<v-select
-						v-model="selectedEmployee"
+						v-model="selectedEmployeeId"
 						@focus="onInputFocus"
 						class="modal-input border-select"
 						label="Priradený"
 						variant="solo"
-						:items="task.team.employees"
+						:items="employees"
 						item-value="id"
 						item-title="_fullName"
 					></v-select>
@@ -70,9 +71,9 @@
 					></v-text-field>
 
 					<div class="w-100 modal-input">
-						<QuillEditor 
+						<QuillEditor
 							v-model="task.description"
-							placeholder="Popis" 
+							placeholder="Popis"
 							theme="snow"
 							class="rich-text-editor"
 						/>
@@ -99,7 +100,7 @@
 				<div
 					class="d-flex justify-space-between align-center modal-header border-bottom pb-4"
 				>
-					<h1>{{ task.master_task }}</h1>
+					<h1>{{ task.title }}</h1>
 					<div class="d-flex justify-start">
 						<img
 							class="pencil-icon"
@@ -130,7 +131,7 @@
 							<v-col cols="7">
 								<v-sheet class="ma-2">
 									<p class="task-badge px-4 py-2 rounded-pill">
-										{{ task.master_task }}
+										{{ task.master_task.name }}
 									</p>
 								</v-sheet>
 							</v-col>
@@ -200,10 +201,20 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2 d-flex align-center">
-									<p class="employee-selected-avatar d-flex justify-center align-center">
-										{{ task.assigned_employee.name.charAt(0) + task.assigned_employee.surname.charAt(0)}}
+									<p
+										class="employee-selected-avatar d-flex justify-center align-center"
+									>
+										{{
+											task.employee.name.charAt(0) +
+											task.employee.surname.charAt(0)
+										}}
 									</p>
-									<p class="ml-2" v-html="`${task.assigned_employee.name} ${task.assigned_employee.surname}`" />
+									<p
+										class="ml-2"
+										v-html="
+											`${task.employee.name} ${task.employee.surname}`
+										"
+									/>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -221,7 +232,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p>{{ task.duration }} h</p>
+									<p>{{ task.duration / 3600 }} h</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -240,7 +251,7 @@
 							<v-col cols="7">
 								<v-sheet class="ma-2">
 									<v-text-field
-										v-model="task.worked_time"
+										v-model="task.spent_time"
 										class="modal-input"
 										variant="solo"
 										type="number"
@@ -263,13 +274,18 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p>{{ task.duration - task.worked_time }} h</p>
+									<p>
+										{{ (task.duration - task.spent_time) / 3600 }} h
+									</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
 						<div class="px-5 py-5 border-bottom">
 							<p>Popis zadania</p>
-							<section v-html="task.description" class="description-detail px-2 py-2 w-100 rounded mt-2"/>
+							<section
+								v-html="task.description"
+								class="description-detail px-2 py-2 w-100 rounded mt-2"
+							/>
 							<p class="mt-5">Prílohy</p>
 							<div class="w-100 d-flex align-center">
 								<div
@@ -279,7 +295,9 @@
 									:class="[index === 0 ? 'ml-0' : 'ml-2']"
 								>
 									<v-chip class="mt-2">
-										<p @click="downloadFile" class="cursor-pointer" >{{ file.name }}</p>
+										<p @click="downloadFile" class="cursor-pointer">
+											{{ file.name }}
+										</p>
 										<v-icon
 											class="mx-1"
 											icon="mdi-paperclip"
@@ -289,14 +307,15 @@
 							</div>
 						</div>
 						<div class="d-flex justify-start align-center mt-8">
-							<v-btn class="done-btn" @click.stop="clickCompleteTask()">Dokončené</v-btn>
+							<v-btn class="done-btn" @click.stop="clickCompleteTask()"
+								>Dokončené</v-btn
+							>
 							<v-btn class="add-employee-btn" @click="save()"
 								>Uložiť zmeny</v-btn
 							>
 						</div>
 					</div>
 				</v-card-actions>
-				<Z-delete-task-modal ref="z-delete-task-modal" @deleted="onTaskDeleted" />
 			</v-card>
 		</W-loadable>
 	</v-dialog>
@@ -309,9 +328,8 @@ import useVuelidate 	from '@vuelidate/core'
 import { required } 	from '@vuelidate/validators'
 import errorUtils 		from '@/plugins/lib@auth/_utils/error.utils'
 import moment 			from 'moment'
-import ZDeleteTaskModal from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
 import { QuillEditor } 	from '@vueup/vue-quill'
-import * as FileSaver	from 'file-saver'
+import * as FileSaver 	from 'file-saver'
 import '@vueup/vue-quill/dist/vue-quill.snow.css'
 
 export default {
@@ -321,7 +339,6 @@ export default {
 		Datepicker,
 		ZFilesUpload,
 		QuillEditor,
-		ZDeleteTaskModal
 	},
 
 	data() {
@@ -332,11 +349,9 @@ export default {
 			errorUtils,
 			v$: useVuelidate(),
 			preventInputFocus: false,
-			employees: null,
-			selectedMasterTask: '',
-			showAddEmployeeInput: false,
-			masterTasks: null,
-			selectedEmployee: null,
+			masterTasks: [],
+			selectedMasterTaskId: null,
+			selectedEmployeeId: null
 		}
 	},
 
@@ -352,13 +367,10 @@ export default {
 		}
 	},
 
-	async created() {
-		try {
-			this.masterTasks = await this.$axios.get_auth_data('v1/master-tasks')
-			this.employees = await this.$axios.get_auth_data('v1/employees')
-		} catch (error) {
-			this.$toast.error(error)
-		}
+	mounted() {
+		this.$events.on('on-task-deleted', (task) => {
+			if (task?.id == this.task?.id) this.close()
+		})
 	},
 
 	methods: {
@@ -373,12 +385,18 @@ export default {
 		// 	}
 		// },
 
-		async create(taskId = null, editMode = false) {
+		async showModal(task, editMode = false) {
 			this.visible = true
 			this.task = null
 
-			if (taskId) {
-				await this._load(taskId)
+			try {
+				this.masterTasks = await this.$axios.get_auth_data('v1/mastertasks')
+			} catch (error) {
+				this.$toast.error(error)
+			}
+
+			if (task?.id) {
+				await this._load(task.id)
 				this.editMode = editMode || !this.task?.id
 			} else {
 				const task = {
@@ -415,9 +433,8 @@ export default {
 				if (this.task.id) {
 					await this._update()
 					this.close()
-				}
-				else await this._create()
-				
+				} else await this._create()
+
 				this.close()
 				this.$router.push({ name: 'Dashboard - Tasks' })
 			} catch (error) {
@@ -432,7 +449,17 @@ export default {
 
 		async _load(taskId) {
 			try {
-				this.task = await this.$axios.get_auth_data(`v1/tasks/${taskId}`)
+				const task = await this.$axios.get_auth_data(`v1/tasks/${taskId}`)
+
+				// const employees = task.master_task.employees.map(employee => {
+				// 	employee._fullName = `${employee.name} ${employee.surname}`
+				// 	return employee
+				// })
+
+				// this.employees 				= employees
+				this.task 					= task
+				this.selectedEmployeeId 	= this.task.employee.id
+				this.selectedMasterTaskId 	= this.task.master_task.id
 			} catch (error) {
 				this.$toast.error(error)
 			}
@@ -440,7 +467,7 @@ export default {
 
 		async _create() {
 			try {
-				await this.$axios.post_auth('v1/master-tasks')
+				await this.$axios.post_auth('v1/mastertasks')
 			} catch (error) {
 				this.$toast.error(error)
 			}
@@ -455,7 +482,7 @@ export default {
 		},
 
 		deleteTask(task) {
-			this.$refs['z-delete-task-modal'].delete(task)
+			this.$events.emit('show-delete-task-modal', { task })
 		},
 
 		onTaskDeleted() {
@@ -463,9 +490,8 @@ export default {
 		},
 
 		employeeSelected(selectedOption) {
-			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
-			this.task.employees.push(employee)
-			this.showAddEmployeeInput = false
+			const employee = this.task.master_task.employees.find(employee => employee.id == selectedOption.key)
+			this.task.employee = employee
 		},
 
 		// Vuetify input was automatically focus after date input was clicked. This will prevent this unwanted behavior
@@ -488,20 +514,13 @@ export default {
 	},
 
 	computed: {
-		employeesOptions() {
-			const selectedEmployeesIds = this.task.employees.map(
-				(employee) => employee.id
-			)
-			const employees =
-				this.employees.filter(
-					(employee) => !selectedEmployeesIds.includes(employee.id)
-				) || []
+		employees() {
+			if (!this.task?.master_task?.employees)
+				return []
 
-			return employees.map((employee) => {
-				return {
-					key: employee.id,
-					value: `${employee.name} ${employee.surname}`,
-				}
+			return this.task.master_task.employees.map(employee => {
+				employee._fullName = `${employee.name} ${employee.surname}`
+				return employee
 			})
 		},
 
@@ -519,25 +538,19 @@ export default {
 	},
 
 	watch: {
-		selectedMasterTask() {
-			this.task.team = this.masterTasks.find(
-				(masterTask) => masterTask.id == this.selectedMasterTask
+		selectedMasterTaskId() {
+			this.task.master_task = this.masterTasks.find(
+				(masterTask) => masterTask.id == this.selectedMasterTaskId
 			)
-			console.log(this.task.team.employees)
-			this.task.team.employees.forEach(
-				(employee) => {
-					employee._fullName = `${employee.name} ${employee.surname}`
-				})
-			console.log(this.task.team.employees)
-			this.task.employee = null
-			this.task.project_code = this.masterTasks.filter(
-				(x) => x.id == this.selectedMasterTask
-			)[0].project_code
+
+			// Kravarik: Tu bude treba vymsliet logiku resetovania, ale ked dam toto sa to trigeruje aj pri otvarani existujuceho tasku a hned to vymaze
+			// this.selectedEmployeeId 	= null
+			// this.task.employee 			= {}
 		},
 
-		selectedEmployee() {
-			this.task.employee = this.task.team.employees.find(
-				(employee) => employee.id == this.selectedEmployee
+		selectedEmployeeId() {
+			this.task.employee = this.task.master_task.employees.find(
+				(employee) => employee.id == this.selectedEmployeeId
 			)
 		},
 	},

app/src/plugins/tm@modal/team/z-delete-team-modal.vue

@@ -28,7 +28,7 @@ export default {
 	},
 
 	methods: {
-		async delete(team) {
+		async showModal(team) {
 			this.team = team
 			this.visible = true
 		},

app/src/plugins/tm@modal/team/z-team-modal.vue

@@ -94,15 +94,6 @@ export default {
 		}
 	},
 
-	async created() {
-		try {
-			const allEmployees = await this.$axios.get_auth_data('v1/employees')
-			this.allEmployees = this._enrichEmployeesByFullName(allEmployees)
-		} catch (error) {
-			this.$toast.error(error)
-		}
-	},
-
 	methods: {
 		async save() {
 			if (!(await this.v$.$validate()))
@@ -120,12 +111,19 @@ export default {
 			}
 		},
 
-		async create(id = null) {
+		async showModal(team = null) {
 			this.visible = true
 			this.team = null
 
-			if (id) {
-				await this._load()
+			try {
+				const allEmployees = await this.$axios.get_auth_data('v1/employees')
+				this.allEmployees = this._enrichEmployeesByFullName(allEmployees)
+			} catch (error) {
+				this.$toast.error(error)
+			}
+
+			if (team?.id) {
+				await this._load(team.id)
 			} else {
 				const team = {
 					name: '',
@@ -145,7 +143,7 @@ export default {
 
 		async _create() {
 			try {
-				await this.$axios.post_auth('v1/teams', this.team)
+				await this.$axios.post_auth(`v1/teams`, this.team)
 			} catch (error) {
 				this.$toast.error(error)
 			}

app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue

@@ -25,23 +25,12 @@
 			</tr>
 		</tbody>
 
-		<Z-sub-task-modal ref="z-sub-task-modal" />
-		<Z-delete-task-modal ref="z-delete-task-modal" @deleted="onTaskDeleted" />
+		
 	</v-table>
 </template>
 
 <script>
-import ZDeleteTaskModal from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-import ZSubTaskModal 	from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
 export default {
-	emits: ['refresh'],
-
-	components: {
-		ZDeleteTaskModal,
-		ZSubTaskModal
-	},
-
 	props: {
 		tasks: {
 			type: Array,
@@ -50,16 +39,12 @@ export default {
 	},
 
 	methods: {
+		editTask(task, editMode = false) {
+			this.$events.emit('show-task-modal', {task, editMode})
+		},
+
 		deleteTask(task) {
-			this.$refs['z-delete-task-modal'].delete(task)
-		},
-
-		onTaskDeleted() {
-			this.$emit('refresh')
-		},
-
-		editTask(task, editMode) {
-			this.$refs['z-sub-task-modal'].create(task, editMode)
+			this.$events.emit('show-delete-task-modal', {task})
 		}
 	}
 }

app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue

@@ -42,14 +42,23 @@ export default {
 	},
 
 	async created() {
-		try {
-			this.ongoingTasks = await this.$axios.get_auth_data('v1/overview/ongoing-tasks')
-		} catch (error) {
-			this.ongoingTasks = {error}
-		}
+		await this._loadData()
+	},
+
+	mounted() {
+		this.$events.on('on-task-deleted', () => this._loadData())
 	},
 
 	methods: {
+		async _loadData() {
+			this.ongoingTasks = null
+			try {
+				this.ongoingTasks = await this.$axios.get_auth_data('v1/overview/ongoing-tasks')
+			} catch (error) {
+				this.ongoingTasks = {error}
+			}
+		},
+
 		onSearch(searchQuery) {
 			this.searchQuery = searchQuery
 		},

app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue

@@ -22,24 +22,11 @@
 				</td>
 			</tr>
 		</tbody>
-
-		<Z-sub-task-modal ref="z-sub-task-modal" />
-		<Z-delete-task-modal ref="z-delete-task-modal" @deleted="onTaskDeleted"/>
 	</v-table>
 </template>
 
 <script>
-import ZDeleteTaskModal from '@/plugins/tm@modal/task/z-delete-task-modal.vue'
-import ZSubTaskModal 	from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
-
 export default {
-	emits: ['refresh'],
-
-	components: {
-		ZDeleteTaskModal,
-		ZSubTaskModal
-	},
-
 	props: {
 		tasks: {
 			type: Array,
@@ -48,16 +35,12 @@ export default {
 	},
 
 	methods: {
-		deleteTask(task) {
-			this.$refs['z-delete-task-modal'].delete(task)
-		},
-
-		onTaskDeleted() {
-			this.$emit('refresh')
-		},
-
 		editTask(task, editMode) {
-			this.$refs['z-sub-task-modal'].create(task, editMode)
+			this.$events.emit('show-task-modal', {task, editMode})
+		},
+
+		deleteTask(task) {
+			this.$events.emit('show-delete-task-modal', {task})
 		}
 	}
 }

app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue

@@ -5,12 +5,6 @@
 
 		<W-loadable :content="filteredUnscheduledTasks" :emptyMessage="searchQuery.length ? 'Neboli nájdené žiadne úlohy' : 'Nenašli sa žiadne záznamy'">
 			<A-unscheduled-table :tasks="filteredUnscheduledTasks" />
-			<h6
-				v-if="filteredUnscheduledTasks && !filteredUnscheduledTasks.length"
-				class="px-4"
-			>
-				Aktuálnemu hľadaniu nevyhovujú žiadne nenaplánované úlohy
-			</h6>
 		</W-loadable>
 
 	</div>
@@ -19,7 +13,6 @@
 <script>
 import ZTasksSearch 		from '@/plugins/tm@overview/_components/z-tasks-search.vue'
 import AUnscheduledTable 	from './_components/a-unscheduled-table.vue'
-
 export default {
 	components: {
 		ZTasksSearch,
@@ -48,14 +41,23 @@ export default {
 	},
 
 	async created() {
-		try {
-			this.unscheduledTasks = await this.$axios.get_auth_data('v1/overview/unscheduled-tasks')
-		} catch (error) {
-			this.unscheduledTasks = {error}
-		}
+		await this._loadData()
+	},
+
+	mounted() {
+		this.$events.on('on-task-deleted', () => this._loadData())
 	},
 
 	methods: {
+		async _loadData() {
+			this.unscheduledTasks = null
+			try {
+				this.unscheduledTasks = await this.$axios.get_auth_data('v1/overview/unscheduled-tasks')
+			} catch (error) {
+				this.unscheduledTasks = {error}
+			}
+		},
+
 		onSearch(searchQuery) {
 			this.searchQuery = searchQuery
 		},	

app/src/plugins/tm@overview/teams/_components/a-teams-table.vue

@@ -20,24 +20,11 @@
 				</tr>
 			</tbody>
 		</v-table>
-
-		<Z-team-modal ref="z-team-modal" />
-		<Z-delete-team-modal ref="z-delete-team-modal" @deleted="onTeamDeleted" />
 	</div>
 </template>
 
 <script>
-import ZDeleteTeamModal from '@/plugins/tm@modal/team/z-delete-team-modal.vue'
-import ZTeamModal		from '@/plugins/tm@modal/team/z-team-modal.vue'
-
 export default {
-	emits: ['refresh'],
-
-	components: {
-		ZDeleteTeamModal,
-		ZTeamModal
-	},
-
 	props: {
 		teams: {
 			type: Array,
@@ -47,15 +34,11 @@ export default {
 
 	methods: {
 		editTeam(team) {
-			this.$refs['z-team-modal'].create(team.id)
+			this.$events.emit('show-team-modal', {team})
 		},
 
 		deleteTeam(team) {
-			this.$refs['z-delete-team-modal'].delete(team)
-		},
-
-		onTeamDeleted() {
-			this.$emit('refresh')
+			this.$events.emit('show-delete-team-modal', {team})
 		}
 	}
 }

app/src/plugins/tm@overview/teams/teams.vue

@@ -1,6 +1,6 @@
 <template>
 	<W-loadable :content="teams">
-		<A-teams-table :teams="teams" @refresh="loadData" />
+		<A-teams-table :teams="teams" />
 	</W-loadable>
 </template>
 
@@ -19,15 +19,19 @@ export default {
 	},
 
 	async created() {
-		await this.loadData()
+		await this._loadData()
+	},
+
+	mounted() {
+		this.$events.on('on-team-deleted', () => this._loadData())
 	},
 
 	methods: {
-		async loadData() {
+		async _loadData() {
 			this.teams = null
 			
 			try {
-				this.teams = await this.$axios.get_auth_data('v1/teamsx')
+				this.teams = await this.$axios.get_auth_data('v1/teams')
 			} catch (error) {
 				this.teams = {error}
 			}

app/src/plugins/w/auth/auth.store.ts

@@ -18,8 +18,6 @@ export default {
 				state.user = data.user
 				localStorage.setItem('wzo_vue_user_user', JSON.stringify(data.user))
 			}
-
-			console.log(state)
 		},
 		auth_error(state: any) {
 			state.token = ''

app/src/plugins/w/events/README.md

@@ -14,22 +14,22 @@ const app = createApp(App)
 # Examples
 1. Listen for event
 ```javascript
-this.eventBus.on('eventname', (optionalData) => ...do something)
+this.$events.on('eventname', (optionalData) => ...do something)
 ```
 
 2. Listen for all events
 ```javascript
-this.eventBus.on('*', (optionalData) => ...do something)
+this.$events.on('*', (optionalData) => ...do something)
 ```
 
 3. Fire event
 ```javascript
-this.eventBus.emit('eventname', optionalData)
+this.$events.emit('eventname', optionalData)
 ```
 
 4. Clear all event listeners
 ```javascript
-this.eventBus.all.clear()
+this.$events.all.clear()
 ```
 
 5. More on https://www.npmjs.com/package/mitt

app/src/plugins/w/events/index.ts

@@ -5,7 +5,7 @@ export default {
 	install: (app, options: Options) => {
 		if (options && options.disabled === true) return
 
-		const eventBus = mitt()
-		app.config.globalProperties.eventBus = eventBus
+		const events = mitt()
+		app.config.globalProperties.$events = events
 	}
 }

app/src/plugins/w/i18n/components/a-language-popover.vue

@@ -22,7 +22,7 @@ export default {
 	methods: {
 		languageSelected(language) {
 			this.$w18n.changeLanguage(language)
-			// this.eventBus.emit("language-changed", language)
+			// this.$events.emit("language-changed", language)
 			popoverController.dismiss()
 		}
 	}

app/src/plugins/w/i18n/index.ts

@@ -10,7 +10,7 @@ export default {
 		if (!options || !options.languages || !options.defaultLanguage)
 			return console.warn('[@wezeo/i18n] Could not initialize i18n. Missing configuration options.')
 
-		if (!app.config.globalProperties.eventBus) {
+		if (!app.config.globalProperties.$events) {
 			app.use(events)
 		}
 

app/src/plugins/w/loadable/_components/w-loadable.vue

@@ -42,11 +42,8 @@ export default {
 
 	watch: {
 		content(value) {
-			console.log(`XX: ${value}`)
-			
 			if (value) {
 				this._stopLoading()
-				console.log(' STOP LOADING')
 			}
 			else
 				this._startLoading()