From e6198ea89f158639aab980b4dc8f0046cffb378a Mon Sep 17 00:00:00 2001
From: romankko2 <romokravarik@gmail.com>
Date: Mon, 5 Dec 2022 18:46:01 +0100
Subject: [PATCH] bloker-modal, master-task-modal, date-picker

---
 app/package-lock.json                         |  56 +++++
 app/package.json                              |   1 +
 app/public/mock/v1/teams/(id).GET.json        |  20 ++
 app/public/mock/v1/teams/(id).POST.json       |  11 +-
 .../app/_components/a-bloker-modal.vue        |  80 ++++---
 .../app/_components/a-edit-team-modal.vue     | 156 -------------
 .../app/_components/a-master-task-modal.vue   | 122 ++++++++++
 .../app/_components/a-team-form-modal.vue     | 220 ++++++++++++++++++
 .../plugins/app/_components/a-team-modal.vue  |  71 ++++--
 app/src/plugins/app/_config/main.ts           |   2 +
 .../app/_layout/app/_components/a-header.vue  |  14 +-
 .../_layout/app/_components/a-sidemenu.vue    |   7 +-
 app/src/plugins/app/_theme/date-picker.sass   |  18 ++
 app/src/plugins/app/_theme/index.sass         |   1 +
 .../plugins/lib@auth/_theme/auth.theme.sass   |   3 +
 .../_components/a-ongoing-table.vue           |   6 +-
 .../_components/a-unscheduled-table.vue       |   6 +-
 .../teams/_components/a-teams-table.vue       |  54 ++---
 18 files changed, 591 insertions(+), 257 deletions(-)
 create mode 100644 app/public/mock/v1/teams/(id).GET.json
 delete mode 100644 app/src/plugins/app/_components/a-edit-team-modal.vue
 create mode 100644 app/src/plugins/app/_components/a-master-task-modal.vue
 create mode 100644 app/src/plugins/app/_components/a-team-form-modal.vue
 create mode 100644 app/src/plugins/app/_theme/date-picker.sass

diff --git a/app/package-lock.json b/app/package-lock.json
index 1724ab6..6a62479 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -14,6 +14,7 @@
 				"@mdi/font": "5.9.55",
 				"@vuelidate/core": "^2.0.0",
 				"@vuelidate/validators": "^2.0.0",
+				"@vuepic/vue-datepicker": "^3.6.0",
 				"axios": "^1.1.3",
 				"axios-auth-refresh": "^3.3.4",
 				"core-js": "^3.8.3",
@@ -3430,6 +3431,21 @@
 				}
 			}
 		},
+		"node_modules/@vuepic/vue-datepicker": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-3.6.0.tgz",
+			"integrity": "sha512-9oYegvCSV2fssvcwL/tfzNvgExvNt2PhlSgIPhrFyEJvPACL3nv6161CU3++Aiysv5uotOjkVs4xFR/gh99P7w==",
+			"dependencies": {
+				"date-fns": "^2.29.3",
+				"date-fns-tz": "^1.3.7"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"vue": ">=3.2.0"
+			}
+		},
 		"node_modules/@vuetify/loader-shared": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/@vuetify/loader-shared/-/loader-shared-1.7.0.tgz",
@@ -5389,6 +5405,26 @@
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
 			"integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
 		},
+		"node_modules/date-fns": {
+			"version": "2.29.3",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
+			"engines": {
+				"node": ">=0.11"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/date-fns"
+			}
+		},
+		"node_modules/date-fns-tz": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.7.tgz",
+			"integrity": "sha512-1t1b8zyJo+UI8aR+g3iqr5fkUHWpd58VBx8J/ZSQ+w7YrGlw80Ag4sA86qkfCXRBLmMc4I2US+aPMd4uKvwj5g==",
+			"peerDependencies": {
+				"date-fns": ">=2.0.0"
+			}
+		},
 		"node_modules/debug": {
 			"version": "4.3.4",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -16162,6 +16198,15 @@
 				}
 			}
 		},
+		"@vuepic/vue-datepicker": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/@vuepic/vue-datepicker/-/vue-datepicker-3.6.0.tgz",
+			"integrity": "sha512-9oYegvCSV2fssvcwL/tfzNvgExvNt2PhlSgIPhrFyEJvPACL3nv6161CU3++Aiysv5uotOjkVs4xFR/gh99P7w==",
+			"requires": {
+				"date-fns": "^2.29.3",
+				"date-fns-tz": "^1.3.7"
+			}
+		},
 		"@vuetify/loader-shared": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/@vuetify/loader-shared/-/loader-shared-1.7.0.tgz",
@@ -17670,6 +17715,17 @@
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
 			"integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
 		},
+		"date-fns": {
+			"version": "2.29.3",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
+		},
+		"date-fns-tz": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.7.tgz",
+			"integrity": "sha512-1t1b8zyJo+UI8aR+g3iqr5fkUHWpd58VBx8J/ZSQ+w7YrGlw80Ag4sA86qkfCXRBLmMc4I2US+aPMd4uKvwj5g==",
+			"requires": {}
+		},
 		"debug": {
 			"version": "4.3.4",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
diff --git a/app/package.json b/app/package.json
index 48d3704..1b74941 100644
--- a/app/package.json
+++ b/app/package.json
@@ -14,6 +14,7 @@
 		"@mdi/font": "5.9.55",
 		"@vuelidate/core": "^2.0.0",
 		"@vuelidate/validators": "^2.0.0",
+		"@vuepic/vue-datepicker": "^3.6.0",
 		"axios": "^1.1.3",
 		"axios-auth-refresh": "^3.3.4",
 		"core-js": "^3.8.3",
diff --git a/app/public/mock/v1/teams/(id).GET.json b/app/public/mock/v1/teams/(id).GET.json
new file mode 100644
index 0000000..78ba4d8
--- /dev/null
+++ b/app/public/mock/v1/teams/(id).GET.json
@@ -0,0 +1,20 @@
+{
+	"data": {
+		"id": 1,
+		"name": "Team 1",
+		"employees": [
+			{
+				"id": 1,
+				"name": "Matej",
+				"surname": "Glasnak"
+			},
+	
+			{
+				"id": 2,
+				"name": "Mate",
+				"surname": "Klempa"
+			}
+		]
+	},
+	"status": 200
+}
\ No newline at end of file
diff --git a/app/public/mock/v1/teams/(id).POST.json b/app/public/mock/v1/teams/(id).POST.json
index 9343dad..2db7b58 100644
--- a/app/public/mock/v1/teams/(id).POST.json
+++ b/app/public/mock/v1/teams/(id).POST.json
@@ -4,13 +4,14 @@
 		"name": "Team 1",
 		"employees": [
 			{
-				"id": 1
+				"id": 1,
+				"name": "Matej",
+				"surname": "Glasnak"
 			},
 			{
-				"id": 4
-			},
-			{
-				"id": 5
+				"id": 2,
+				"name": "Mate",
+				"surname": "Klempa"
 			}
 		]
 	},
diff --git a/app/src/plugins/app/_components/a-bloker-modal.vue b/app/src/plugins/app/_components/a-bloker-modal.vue
index 77ededf..20c8467 100644
--- a/app/src/plugins/app/_components/a-bloker-modal.vue
+++ b/app/src/plugins/app/_components/a-bloker-modal.vue
@@ -11,14 +11,27 @@
 					></v-icon>
 				</div>
 
-				<v-card-actions class="d-flex flex-column modal-content">
-					<v-text-field
+				<v-card-actions class="d-flex flex-column-reverse modal-content">
+					<Datepicker
 						class="modal-input"
-						label="Názov blokeru"
-						variant="outlined"
-					></v-text-field>
-
-					<div class="employee-position w-100" v-for="(employee, index) in selectedEmployees" :key="employee.id">
+						v-model="date"
+						:format="dateFormat"
+						locale="sk"
+						select-text="Vybrať"
+						cancel-text="Zrušiť"
+						placeholder="02.12.2022,10:17  -  18.12.2022,10:17"
+						range
+					/>
+					<W-autocomplete
+						:options="employeesOptions"
+						class="modal-input"
+						@option-selected="employeeSelected"
+					/>
+					<div
+						class="employee-position w-100"
+						v-for="(employee, index) in selectedEmployees"
+						:key="employee.id"
+					>
 						<v-text-field
 							class="modal-input"
 							disabled
@@ -32,12 +45,13 @@
 							@click.stop="removeInput(index)"
 							icon="mdi-close"
 							size="small"
-						></v-icon
-						>
+						></v-icon>
 					</div>
-
-					<W-autocomplete :options="employeesOptions" class="modal-input" @option-selected="employeeSelected" />
-
+					<v-text-field
+						class="modal-input"
+						label="Názov blokeru"
+						variant="outlined"
+					></v-text-field>
 				</v-card-actions>
 
 				<v-btn class="z-btn" @click="createBloker()">VYTVORIŤ</v-btn>
@@ -47,27 +61,24 @@
 </template>
 
 <script>
-import WAutocomplete from './w-autocomplete.vue'
+import WAutocomplete 	from './w-autocomplete.vue'
+import Datepicker	 	from '@vuepic/vue-datepicker'
 
 export default {
 	components: {
-		WAutocomplete
+		WAutocomplete,
+		Datepicker,
 	},
 
-	props: [
-		'visible'
-	],
+	props: ['visible'],
 
 	data() {
 		return {
-			selectedEmployee: "",
+			selectedEmployee: '',
 			selectedEmployees: [],
 			employees: null,
-			menu: [],
-			foos: [
-				{ id: 1, date: new Date() },
-				{ id: 2, date: new Date() },
-			]	
+			date: '',
+			dateFormat: 'dd.MM.yyyy, HH:mm'
 		}
 	},
 
@@ -85,21 +96,21 @@ export default {
 		},
 
 		employeeSelected(selectedOption) {
-			const employee 		= this.employees.find(empl => empl.id == selectedOption.key)
-			employee._fullName 	= `${employee.name} ${employee.surname}`
+			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
+			employee._fullName = `${employee.name} ${employee.surname}`
 
 			this.selectedEmployees.push(employee)
 		},
 
 		async createBloker() {
-			try{
+			try {
 				await this.$axios.post_auth('v1/blockers')
 				this.$router.push({ name: 'Dashboard - Tasks' })
 				this.show = false
 			} catch (error) {
 				this.$toast.error(error.response.data.error)
 			}
-		}
+		},
 	},
 
 	computed: {
@@ -111,10 +122,10 @@ export default {
 				(employee) => !selectedEmployeesIds.includes(employee.id)
 			)
 
-			return employees.map(employee => {
+			return employees.map((employee) => {
 				return {
 					key: employee.id,
-					value: `${employee.name} ${employee.surname}`
+					value: `${employee.name} ${employee.surname}`,
 				}
 			})
 		},
@@ -125,19 +136,17 @@ export default {
 			},
 
 			set(value) {
-				if (!value) this.$emit("close")
+				if (!value) this.$emit('close')
 			},
 		},
 	},
 
 	watch: {
 		selectedEmployee() {
-			const selectedEmployee = this.selectedEmployee.split(" ")
+			const selectedEmployee = this.selectedEmployee.split(' ')
 
 			const employee = this.employees.find(
-				(e) =>
-					e.name == selectedEmployee[0] &&
-					e.surname == selectedEmployee[1]
+				(e) => e.name == selectedEmployee[0] && e.surname == selectedEmployee[1]
 			)
 
 			this.selectedEmployees.push(JSON.parse(JSON.stringify(employee)))
@@ -157,6 +166,7 @@ export default {
 	flex: 1 1 100%
 	margin: 10px 0
 	overflow-y: scroll
+	justify-content: flex-end
 
 .z-btn
 	height: 50px
@@ -172,4 +182,4 @@ export default {
 
 .employee-position
 	position: relative
-</style>
+</style>
\ No newline at end of file
diff --git a/app/src/plugins/app/_components/a-edit-team-modal.vue b/app/src/plugins/app/_components/a-edit-team-modal.vue
deleted file mode 100644
index 616cef5..0000000
--- a/app/src/plugins/app/_components/a-edit-team-modal.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-	<v-dialog v-model="showModal" max-width="650" max-height="90%" height="700px">
-		<W-loadable :content="employees" class="h-100">
-			<v-card v-if="employees" height="100%" class="d-flex flex-column">
-				<div class="d-flex justify-space-between align-center modal-header">
-					<h1>Editovať tím</h1>
-					<v-icon
-						@click.stop="$emit('close-modal')"
-						icon="mdi-close"
-						size="large"
-					></v-icon>
-				</div>
-
-				<v-card-actions class="d-flex flex-column modal-content">
-					<v-text-field
-						class="modal-input"
-						label="Názov tímu"
-						variant="outlined"
-						v-model="teamName"
-					></v-text-field>
-
-					<div class="employee-position w-100" v-for="(employee, index) in selectedEmployees" :key="employee.id">
-						<v-text-field
-							class="modal-input"
-							disabled
-							label="Zamestanec"
-							variant="outlined"
-							v-model="selectedEmployees[index]._fullName"
-						>
-						</v-text-field>
-						<v-icon
-							class="remove-input"
-							@click="removeInput(index)"
-							icon="mdi-close"
-							size="small"
-							></v-icon
-						>
-					</div>
-
-					<W-autocomplete :options="employeesOptions" class="modal-input" @option-selected="employeeSelected" />
-
-				</v-card-actions>
-
-				<v-btn class="z-btn" @click="editTeam()">EDITOVAŤ</v-btn>
-			</v-card>
-		</W-loadable>
-	</v-dialog>
-</template>
-
-<script>
-import WAutocomplete from './w-autocomplete.vue'
-
-export default {
-	emits: ['close-modal'],
-
-	components: {
-		WAutocomplete
-	},
-
-	props: {
-		show: {
-			type: Boolean,
-			required: true
-		},
-
-		team: {
-			type: Object,
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			selectedEmployees: [],
-			employees: null,
-			teamName: this.team.name
-		}
-	},
-
-	async created() {
-		try {
-			this.employees = await this.$axios.get_auth_data('v1/employees')
-		} catch (error) {
-			console.log(error)
-		}
-	},
-
-	methods: {
-		removeInput(index) {
-			this.selectedEmployees.splice(index, 1)
-		},
-
-		employeeSelected(selectedOption) {
-			const employee 		= this.employees.find(empl => empl.id == selectedOption.key)
-			employee._fullName 	= `${employee.name} ${employee.surname}`
-
-			this.selectedEmployees.push(employee)
-		},
-
-		async editTeam() {
-			try{
-				await this.$axios.post_auth('v1/teams')
-				this.$router.push({ name: 'Overview - Teams' })
-				this.showModal = false
-			} catch (error) {
-				this.$toast.error(error.response.data.error)
-			}
-		}
-	},
-
-	computed: {
-		employeesOptions() {
-			const unselectedEmployees = this.employees.filter(employee => this.selectedEmployees.find(e => e.id == employee.od))
-
-			return unselectedEmployees.map(employee => {
-				return {
-					key: employee.id,
-					value: `${employee.name} ${employee.surname}`
-				}
-			})
-		},
-
-		showModal() {
-			return this.show
-		}
-	}
-}
-</script>
-
-<style lang="sass" scoped>
-.modal-input
-	width: 100%
-	flex: 0 0 auto
-.modal-header
-	flex: 0 0 auto
-
-.modal-content
-	flex: 1 1 100%
-	margin: 10px 0
-	overflow-y: scroll
-
-.z-btn
-	height: 50px
-	width: 100%
-	flex: 0 0 auto
-
-.remove-input
-	pointer-events: auto
-	opacity: 2
-	position: absolute
-	left: 92%
-	top: 25%
-
-.employee-position
-	position: relative
-</style>
diff --git a/app/src/plugins/app/_components/a-master-task-modal.vue b/app/src/plugins/app/_components/a-master-task-modal.vue
new file mode 100644
index 0000000..c7f0b0a
--- /dev/null
+++ b/app/src/plugins/app/_components/a-master-task-modal.vue
@@ -0,0 +1,122 @@
+<template>
+	<v-dialog v-model="show" max-width="650" max-height="90%" height="700px">
+		<v-card height="100%" class="d-flex flex-column">
+			<div class="d-flex justify-space-between align-center modal-header">
+				<h1>Vytvoriť master task</h1>
+				<v-icon
+					@click.stop="show = false"
+					icon="mdi-close"
+					size="large"
+				></v-icon>
+			</div>
+
+			<v-card-actions class="d-flex flex-column-reverse modal-content">
+				<v-select
+					class="modal-input"
+					label="Tím"
+					variant="outlined"
+				></v-select>
+				<v-text-field
+					class="modal-input mt-5"
+					label="Celkový odhad"
+					variant="outlined"
+					type="number"
+					placeholder="h"
+				></v-text-field>
+				<Datepicker
+					class="modal-input"
+					v-model="date"
+					:format="dateFormat"
+					locale="sk"
+					select-text="Vybrať"
+					cancel-text="Zrušiť"
+					placeholder="Deadline"
+				/>
+				<v-text-field
+					class="modal-input"
+					label="Názov mastertasku"
+					variant="outlined"
+				></v-text-field>
+				<v-text-field
+					class="modal-input"
+					label="Kód projektu"
+					variant="outlined"
+				></v-text-field>
+			</v-card-actions>
+
+			<v-btn class="z-btn" @click="createMasterTask()">VYTVORIŤ</v-btn>
+		</v-card>
+	</v-dialog>
+</template>
+
+<script>
+import Datepicker from '@vuepic/vue-datepicker'
+
+export default {
+	props: ['visible'],
+
+	components: {
+		Datepicker
+	},	
+
+	data() {
+		return {
+			date: '',
+			dateFormat: 'dd.MM.yyyy, HH:mm'
+		}
+	},
+
+	methods: {
+		async createMasterTask() {
+			try {
+				await this.$axios.post_auth('v1/master-tasks')
+				this.$router.push({ name: 'Dashboard - Tasks' })
+				this.show = false
+			} catch (error) {
+				this.$toast.error(error.response.data.error)
+			}
+		},
+	},
+
+	computed: {
+		show: {
+			get() {
+				return this.visible
+			},
+
+			set(value) {
+				if (!value) this.$emit('close')
+			},
+		},
+	}
+}
+</script>
+
+<style lang="sass" scoped>
+.modal-input
+	width: 100% !important
+	flex: 0 0 auto
+.modal-header
+	flex: 0 0 auto
+
+.modal-content
+	flex: 1 1 100%
+	margin: 10px 0
+	overflow-y: scroll
+	justify-content: flex-end
+
+.z-btn
+	height: 50px
+	width: 100%
+	flex: 0 0 auto
+
+.remove-input
+	pointer-events: auto
+	opacity: 2
+	position: absolute
+	left: 92%
+	top: 25%
+
+.employee-position
+	position: relative
+</style>
\ No newline at end of file
diff --git a/app/src/plugins/app/_components/a-team-form-modal.vue b/app/src/plugins/app/_components/a-team-form-modal.vue
new file mode 100644
index 0000000..3869431
--- /dev/null
+++ b/app/src/plugins/app/_components/a-team-form-modal.vue
@@ -0,0 +1,220 @@
+<template>
+	<v-dialog v-model="showModal" max-width="650" max-height="90%" height="700px">
+		<W-loadable :content="team" class="h-100">
+			<v-card v-if="employees" height="100%" class="d-flex flex-column">
+				<div class="d-flex justify-space-between align-center modal-header">
+					<h1>Editovať tím</h1>
+					<v-icon
+						@click.stop="$emit('close-modal')"
+						icon="mdi-close"
+						size="large"
+					></v-icon>
+				</div>
+
+				<v-card-actions class="d-flex flex-column modal-content">
+					<v-text-field
+						class="modal-input"
+						label="Názov tímu"
+						:class="{ error: v$.team.name.$errors.length }"
+						:hint="
+							v$.team.name.$errors
+								? errorUtils.parseErrors(v$.team.name.$errors)
+								: null
+						"
+						variant="solo"
+						v-model="team.name"
+					></v-text-field>
+
+					<div
+						class="employee-position w-100"
+						v-for="(employee, index) in team.employees"
+						:key="employee.id"
+					>
+						<v-text-field
+							class="modal-input"
+							disabled
+							label="Zamestanec"
+							variant="outlined"
+							v-model="team.employees[index]._fullName"
+						>
+						</v-text-field>
+						<v-icon
+							class="remove-input"
+							@click="removeInput(index)"
+							icon="mdi-close"
+							size="small"
+						></v-icon>
+					</div>
+
+					<W-autocomplete
+						:options="employeesOptions"
+						class="modal-input"
+						@option-selected="employeeSelected"
+					/>
+				</v-card-actions>
+
+				<v-btn class="z-btn" @click="editTeam()">EDITOVAŤ</v-btn>
+			</v-card>
+		</W-loadable>
+	</v-dialog>
+</template>
+
+<script>
+import WAutocomplete 	from './w-autocomplete.vue'
+import useVuelidate 	from '@vuelidate/core'
+import { required } 	from '@vuelidate/validators'
+import errorUtils 		from '@/plugins/lib@auth/_utils/error.utils'
+
+export default {
+	emits: ['close-modal'],
+
+	components: {
+		WAutocomplete,
+	},
+
+	props: {
+		show: {
+			type: Boolean,
+			required: true,
+		},
+
+		teamId: {
+			type: Number,
+			required: false,
+			default: null,
+		},
+	},
+
+	data() {
+		return {
+			team: null,
+			selectedEmployees: [],
+			employees: null,
+			v$: useVuelidate(),
+			errorUtils,
+			teams: null,
+		}
+	},
+
+	validations() {
+		return {
+			team: {
+				name: { required },
+			},
+		}
+	},
+
+	async created() {
+		try {
+			this.employees = await this.$axios.get_auth_data('v1/employees')
+		} catch (error) {
+			console.log(error)
+		}
+
+		if (!this.teamId) {
+			return (this.team = {
+				name: '',
+				employees: [],
+			})
+		}
+
+		try {
+			const team = await this.$axios.get_auth_data(`v1/teams/${this.teamId}`)
+
+			team.employees = team.employees.map((employee) => {
+				employee._fullName = `${employee.name} ${employee.surname}`
+
+				return employee
+			})
+
+			this.team = team
+		} catch (error) {
+			console.log(error)
+		}
+	},
+
+	methods: {
+		removeInput(index) {
+			this.team.employees.splice(index, 1)
+		},
+
+		async _loadTeams() {
+			try {
+				this.teams = await this.$axios.get_auth_data('v1/teams')
+			} catch (error) {
+				this.teams = { error: error.data.error }
+				this.$toast.error(error.data.error)
+			}
+		},
+
+		employeeSelected(selectedOption) {
+			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
+			employee._fullName = `${employee.name} ${employee.surname}`
+
+			this.team.employees.push(employee)
+		},
+
+		async editTeam() {
+			if (!(await this.v$.$validate())) return console.log(this.v$)
+
+			try {
+				await this.$axios.post_auth('v1/teams')
+				// do close modal listeneru pridaj ze ak pride true refreshne teamy
+				this.$emit('close-modal', true)
+				this._loadTeams()
+			} catch (error) {
+				this.$toast.error(error.response.data.error)
+			}
+		},
+	},
+
+	computed: {
+		employeesOptions() {
+			const unselectedEmployees = this.employees.filter((employee) =>
+				this.team.employees.find((e) => e.id == employee.id) ? false : true
+			)
+
+			console.log(unselectedEmployees)
+
+			return unselectedEmployees.map((employee) => {
+				return {
+					key: employee.id,
+					value: `${employee.name} ${employee.surname}`,
+				}
+			})
+		},
+
+		showModal() {
+			return this.show
+		},
+	},
+}
+</script>
+
+<style lang="sass" scoped>
+.modal-input
+	width: 100%
+	flex: 0 0 auto
+.modal-header
+	flex: 0 0 auto
+
+.modal-content
+	flex: 1 1 100%
+	margin: 10px 0
+	overflow-y: scroll
+
+.z-btn
+	height: 50px
+	width: 100%
+	flex: 0 0 auto
+
+.remove-input
+	pointer-events: auto
+	opacity: 2
+	position: absolute
+	left: 92%
+	top: 25%
+
+.employee-position
+	position: relative
+</style>
diff --git a/app/src/plugins/app/_components/a-team-modal.vue b/app/src/plugins/app/_components/a-team-modal.vue
index f3e769d..b4312d3 100644
--- a/app/src/plugins/app/_components/a-team-modal.vue
+++ b/app/src/plugins/app/_components/a-team-modal.vue
@@ -15,10 +15,21 @@
 					<v-text-field
 						class="modal-input"
 						label="Názov tímu"
-						variant="outlined"
+						variant="solo"
+						:class="{ error: v$.team.name.$errors.length }"
+						:hint="
+							v$.team.name.$errors
+								? errorUtils.parseErrors(v$.team.name.$errors)
+								: null
+						"
+						v-model="team.name"
 					></v-text-field>
 
-					<div class="employee-position w-100" v-for="(employee, index) in selectedEmployees" :key="employee.id">
+					<div
+						class="employee-position w-100"
+						v-for="(employee, index) in selectedEmployees"
+						:key="employee.id"
+					>
 						<v-text-field
 							class="modal-input"
 							disabled
@@ -32,12 +43,14 @@
 							@click.stop="removeInput(index)"
 							icon="mdi-close"
 							size="small"
-						></v-icon
-						>
+						></v-icon>
 					</div>
 
-					<W-autocomplete :options="employeesOptions" class="modal-input" @option-selected="employeeSelected" />
-
+					<W-autocomplete
+						:options="employeesOptions"
+						class="modal-input"
+						@option-selected="employeeSelected"
+					/>
 				</v-card-actions>
 
 				<v-btn class="z-btn" @click="createTeam()">VYTVORIŤ</v-btn>
@@ -47,22 +60,34 @@
 </template>
 
 <script>
-import WAutocomplete from './w-autocomplete.vue'
+import WAutocomplete 	from './w-autocomplete.vue'
+import useVuelidate		from '@vuelidate/core'
+import { required } 	from '@vuelidate/validators'
+import errorUtils 		from '@/plugins/lib@auth/_utils/error.utils'
 
 export default {
 	components: {
-		WAutocomplete
+		WAutocomplete,
 	},
 
-	props: [
-		'visible'
-	],
+	props: ['visible'],
 
 	data() {
 		return {
-			selectedEmployee: "",
+			selectedEmployee: '',
 			selectedEmployees: [],
 			employees: null,
+			v$: useVuelidate(),
+			errorUtils,
+			team: {},
+		}
+	},
+
+	validations() {
+		return {
+			team: {
+				name: { required },
+			},
 		}
 	},
 
@@ -80,21 +105,23 @@ export default {
 		},
 
 		employeeSelected(selectedOption) {
-			const employee 		= this.employees.find(empl => empl.id == selectedOption.key)
-			employee._fullName 	= `${employee.name} ${employee.surname}`
+			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
+			employee._fullName = `${employee.name} ${employee.surname}`
 
 			this.selectedEmployees.push(employee)
 		},
 
 		async createTeam() {
-			try{
+			if (!(await this.v$.$validate())) return console.log(this.v$)
+
+			try {
 				await this.$axios.post_auth('v1/teams')
 				this.$router.push({ name: 'Overview - Teams' })
 				this.show = false
 			} catch (error) {
 				this.$toast.error(error.response.data.error)
 			}
-		}
+		},
 	},
 
 	computed: {
@@ -106,10 +133,10 @@ export default {
 				(employee) => !selectedEmployeesIds.includes(employee.id)
 			)
 
-			return employees.map(employee => {
+			return employees.map((employee) => {
 				return {
 					key: employee.id,
-					value: `${employee.name} ${employee.surname}`
+					value: `${employee.name} ${employee.surname}`,
 				}
 			})
 		},
@@ -120,19 +147,17 @@ export default {
 			},
 
 			set(value) {
-				if (!value) this.$emit("close")
+				if (!value) this.$emit('close')
 			},
 		},
 	},
 
 	watch: {
 		selectedEmployee() {
-			const selectedEmployee = this.selectedEmployee.split(" ")
+			const selectedEmployee = this.selectedEmployee.split(' ')
 
 			const employee = this.employees.find(
-				(e) =>
-					e.name == selectedEmployee[0] &&
-					e.surname == selectedEmployee[1]
+				(e) => e.name == selectedEmployee[0] && e.surname == selectedEmployee[1]
 			)
 
 			this.selectedEmployees.push(JSON.parse(JSON.stringify(employee)))
diff --git a/app/src/plugins/app/_config/main.ts b/app/src/plugins/app/_config/main.ts
index 55428b3..09762de 100644
--- a/app/src/plugins/app/_config/main.ts
+++ b/app/src/plugins/app/_config/main.ts
@@ -24,6 +24,7 @@ import '@ionic/vue/css/display.css'
 
 import '@/plugins/app/_theme/index.sass'
 import 'vue-loading-overlay/dist/vue-loading.css'
+import '@vuepic/vue-datepicker/dist/main.css'
 
 loadFonts()
 
@@ -61,6 +62,7 @@ const options: Options = {
 			'POST v1/tasks/(id)': true,
 			'DELETE v1/tasks/(id)': true,
 
+			'GET v1/teams/(id)': true,
 			'POST v1/teams/(id)': true,
 			'DELETE v1/teams/(id)': true,
 			'GET v1/teams': true,
diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue
index 356af90..6fde6ed 100644
--- a/app/src/plugins/app/_layout/app/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-header.vue
@@ -17,7 +17,7 @@
 					</template>
 
 					<v-list>
-						<v-list-item class="cursor-pointer hover-background">MASTER TASK</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" @click="createMasterTaskDialog = true">MASTER TASK</v-list-item>
 						<v-list-item class="cursor-pointer hover-background">SUB TASK</v-list-item>
 						<v-list-item class="cursor-pointer hover-background" @click="createTeamDialog = true">TÍM</v-list-item>
 						<v-list-item class="cursor-pointer hover-background" @click="createBlokerDialog = true">BLOKER</v-list-item>
@@ -50,26 +50,30 @@
 			</div>
 		</div>
 
+		<A-master-task-modal :visible="createMasterTaskDialog" @close="createMasterTaskDialog = false"/>
 		<A-bloker-modal :visible="createBlokerDialog" @close="createBlokerDialog = false" />
 		<A-team-modal :visible="createTeamDialog" @close="createTeamDialog = false" />
 	</v-app-bar>
 </template>
 
 <script>
-import ATeamModal 	from '@/plugins/app/_components/a-team-modal.vue'
-import ABlokerModal from  '@/plugins/app/_components/a-bloker-modal.vue'
+import ATeamModal 		from '@/plugins/app/_components/a-team-modal.vue'
+import ABlokerModal 	from  '@/plugins/app/_components/a-bloker-modal.vue'
+import AMasterTaskModal from '@/plugins/app/_components/a-master-task-modal.vue'
 
 export default {
 	components: {
 		ATeamModal,
-		ABlokerModal
+		ABlokerModal,
+		AMasterTaskModal
 	},
 
 	data() {
 		return {
 			user: null,
 			createTeamDialog: false,
-			createBlokerDialog: false
+			createBlokerDialog: false,
+			createMasterTaskDialog: false
 		}
 	},
 
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 ed779fa..525be16 100644
--- a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
@@ -2,9 +2,10 @@
 	<ion-menu ref="menu" content-id="main-content">
 		<ion-content>
 			<img
-				class="py-5 px-5"
+				class="py-5 px-5 cursor-pointer"
 				:src="require('@/plugins/app/_layout/_img/jandl-logo.svg')"
 				alt="jandl-logo"
+				@click="refreshPage()"
 			/>
 
 			<ion-list lines="none" id="labels-list">
@@ -77,6 +78,10 @@ export default {
 		toggleMenu() {
 			this.$refs.menu.$el.toggle()
 		},
+
+		refreshPage() {
+			window.location = '/app/dashboard/tasks'
+		}
 	},
 }
 </script>
diff --git a/app/src/plugins/app/_theme/date-picker.sass b/app/src/plugins/app/_theme/date-picker.sass
new file mode 100644
index 0000000..3a651b3
--- /dev/null
+++ b/app/src/plugins/app/_theme/date-picker.sass
@@ -0,0 +1,18 @@
+.dp__input
+	height: 56px
+	border: 1px solid #ABABAB !important
+
+.dp__range_end, .dp__range_start, .dp__active_date
+	background: #7F39FB !important
+
+.dp__select
+	color: #7F39FB !important
+
+.dp__today
+	border: 1px solid #7F39FB !important
+
+.dp__range_between
+	background: #F4E8FF !important
+
+.dp__action
+	font-weight: 500 !important
\ No newline at end of file
diff --git a/app/src/plugins/app/_theme/index.sass b/app/src/plugins/app/_theme/index.sass
index 2b74bf9..2631e0f 100644
--- a/app/src/plugins/app/_theme/index.sass
+++ b/app/src/plugins/app/_theme/index.sass
@@ -3,6 +3,7 @@
 @import './vuetify/v-dialog'
 @import './_components/z-default-btn'
 @import './_components/z-cancel-btn'
+@import './date-picker'
 
 @import './global'
 @import '@/plugins/lib@auth/_theme/auth.theme'
diff --git a/app/src/plugins/lib@auth/_theme/auth.theme.sass b/app/src/plugins/lib@auth/_theme/auth.theme.sass
index 2e65e70..42aa389 100644
--- a/app/src/plugins/lib@auth/_theme/auth.theme.sass
+++ b/app/src/plugins/lib@auth/_theme/auth.theme.sass
@@ -51,6 +51,9 @@
 .auth-card .error .v-field
 	border: .5px solid red !important
 
+.error .v-field
+	border: .5px solid red !important
+
 .v-input__append
 	margin: 0 !important
 
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index a2bff42..8df10b2 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -19,9 +19,9 @@
 				<td class="task-action">
 					<div class="d-flex justify-start">
 						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" />
-						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = true" />
+						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = { task }" />
 
-						<A-delete-task-modal :show="showDeleteModal" :task="task" @delete-task="deleteTask" @close-modal="showDeleteModal = false" />
+						<A-delete-task-modal v-if="showDeleteModal" :show="showDeleteModal" :task="showDeleteModal.task" @delete-task="deleteTask(showDeleteModal.task.id)" @close-modal="(showDeleteModal = null)" />
 					</div>
 				</td>
 			</tr>
@@ -46,7 +46,7 @@ export default {
 
 	data() {
 		return {
-			showDeleteModal: false
+			showDeleteModal: null
 		}
 	},
 
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index a9eb9ec..c5fb0cd 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -17,9 +17,9 @@
 				<td class="task-action">
 					<div class="d-flex justify-start">
 						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon">
-						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = true">
+						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = { task }">
 
-						<A-delete-task-modal :show="showDeleteModal" :task="task" @delete-task="deleteTask" @close-modal="showDeleteModal = false" />
+						<A-delete-task-modal v-if="showDeleteModal" :show="showDeleteModal" :task="showDeleteModal.task" @delete-task="deleteTask(showDeleteModal.task.id)" @close-modal="(showDeleteModal = null)" />
 					</div>
 				</td>
 			</tr>
@@ -44,7 +44,7 @@ export default {
 
 	data() {
 		return {
-			showDeleteModal: false
+			showDeleteModal: null
 		}
 	},
 
diff --git a/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue b/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
index 698df24..b2e5ad5 100644
--- a/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
+++ b/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
@@ -1,37 +1,39 @@
 <template>
-	<v-table>
-		<thead>
-			<tr>
-				<th class="text-left">Názov</th>
-				<th class="text-left">Akcia</th>
-			</tr>
-		</thead>
+	<div>
+		<v-table>
+			<thead>
+				<tr>
+					<th class="text-left">Názov</th>
+					<th class="text-left">Akcia</th>
+				</tr>
+			</thead>
 
-		<tbody>
-			<tr v-for="team in teams" :key="team.id">
-				<td>{{ team.name }}</td>
-				<td class="task-action">
-					<div class="d-flex justify-start">
-						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="showEditModal = true" />
-						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = true" />
+			<tbody>
+				<tr v-for="team in teams" :key="team.id">
+					<td>{{ team.name }}</td>
+					<td class="task-action">
+						<div class="d-flex justify-start">
+							<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editModal = { team }" />
+							<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="deleteModal = { team }" />
+						</div>
+					</td>
+				</tr>
+			</tbody>
+		</v-table>
 
-						<A-edit-team-modal :show="showEditModal" :team="team" @close-modal="showEditModal = false" />
-						<A-delete-team-modal :show="showDeleteModal" :team="team" @delete-team="deleteTeam" @close-modal="showDeleteModal = false" />
-					</div>
-				</td>
-			</tr>
-		</tbody>
-	</v-table>
+		<A-team-form-modal 		v-if="editModal" :show="editModal" :teamId="editModal.team.id" @close-modal="(editModal = null)" />
+		<A-delete-team-modal 	v-if="deleteModal" :show="deleteModal" :team="deleteModal.team" @delete-team="deleteTeam" @close-modal="(deleteModal = null)" />
+	</div>
 </template>
 
 <script>
 import ADeleteTeamModal from '@/plugins/app/_components/a-delete-team-modal.vue'
-import AEditTeamModal	from '@/plugins/app/_components/a-edit-team-modal.vue'
+import ATeamFormModal	from '@/plugins/app/_components/a-team-form-modal.vue'
 
 export default {
 	components: {
 		ADeleteTeamModal,
-		AEditTeamModal
+		ATeamFormModal
 	},
 
 	props: {
@@ -43,8 +45,8 @@ export default {
 
 	data() {
 		return {
-			showDeleteModal: false,
-			showEditModal: false
+			editModal: null,
+			deleteModal: null
 		}
 	},
 
@@ -52,7 +54,7 @@ export default {
 		async deleteTeam(id) {
 			try {
 				await this.$axios.delete(`v1/teams/${id}`)
-				this.showDeleteModal = false
+				this.deleteModal = null
 			} catch (error) {
 				this.$toast.error(error)
 			}