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

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

@@ -191,7 +191,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="d-flex flex-wrap flex-column">
-									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">Tu bude vypisany nazov Timu</p>
+									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">{{ masterTask.team.name }}</p>
 									<div class="d-flex align-center flex-shrink-0 mt-2 task-badge px-4 py-2 rounded-pill" v-for="(employee, index) in masterTask.employees" :key="employee.id">
 										<p class="employee-selected-avatar d-flex justify-center align-center">
 											{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
@@ -274,17 +274,17 @@
 						<v-table class="mt-7 mb-5">
 							<tbody class="px-5 py-5">
 								<tr v-for="task in masterTask.subtasks" :key="task.id">
-									<td class="w-25">{{ task.master_task }}</td>
+									<td class="w-25">{{ task.project_code }}</td>
 									<td class="d-flex align-center">
 										<p class="employee-selected-avatar d-flex justify-center align-center">
 											{{ getFullNameByEmployeeId(task.employee_id).initials }}
 										</p>
-										<p>{{ getFullNameByEmployeeId(task.employee_id).fullName }}</p>
+										<p class="ml-2">{{ getFullNameByEmployeeId(task.employee_id).fullName }}</p>
 									</td>
 									<td class="task-action">
 										<div class="d-flex justify-start">
-											<img @click="getFullNameByEmployeeId(employee_id).fullName" class="pencil-icon" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon" :style="{opacity: 0.3}">
-											<img @click="getFullNameByEmployeeId(employee_id).initials" class="pencil-icon ml-2" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" :style="{opacity: 0.3}">
+											<img class="pencil-icon" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon" :style="{opacity: 0.3}">
+											<img class="pencil-icon ml-2" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" :style="{opacity: 0.3}">
 											<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" :style="{opacity: 0.3}">
 										</div>
 									</td>

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

@@ -179,7 +179,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<div v-for="date in task.timeblocks" :key="date.id">
+									<div v-for="(date, index) in task.timeblocks" :key="date.id">
 										<div class="d-flex align-center m-5">
 											<v-icon 
 												@click.stop="removeDate(index)"

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

@@ -26,13 +26,12 @@ export default {
 		}
 	},
 
-	async created() {
+	async mounted() {
 		await this._startLoading()
 	},
 
 	methods: {
 		async _startLoading() {
-			// Kravarik: toto hadze tie warny v konzole. Fixnut
 			this.loader = await this.$loading.show()
 		},
 
@@ -56,4 +55,4 @@ export default {
 <style lang="sass" scoped>
 div
 	height: calc( 100vh - 329px )
-</style>
+</style>