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

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

@@ -7,7 +7,18 @@
 		"duration": 5400000,
 		"spent_time": 3000000,
 		"is_finished": false,
-		"dates": [],
+		"timeblocks": [
+			{
+				"id": 43,
+				"start": "2023-01-31 04:02:17",
+				"end": "2023-01-31 08:23:05"
+			},
+			{
+				"id": 52,
+				"start": "2023-09-26 01:01:17",
+				"end": "2024-02-11 08:23:05"
+			}
+		],
 		"master_task": {
 			"id": 1,
 			"name": "Master task 1",

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

@@ -5,16 +5,17 @@
 		</v-main>
 	</v-app>
 
-	<Z-team-modal 			ref="z-team-modal"  @update="onTeamUpdate" />
+	<Z-team-modal 				ref="z-team-modal"  @update="onTeamUpdate" />
-	<Z-delete-team-modal 	ref="z-delete-team-modal" @update="onTeamUpdate" />
+	<Z-delete-team-modal 		ref="z-delete-team-modal" @update="onTeamUpdate" />
 
-	<Z-task-modal 			ref="z-task-modal" />
+	<Z-task-modal 				ref="z-task-modal" @on-task-edited="onTaskEdited" />
-	<Z-delete-task-modal 	ref="z-delete-task-modal" @update="onTaskDeleted" />
+	<Z-delete-task-modal 		ref="z-delete-task-modal" @on-task-deleted="onTaskDeleted" />
-	<Z-complete-task-modal 	ref="z-complete-task-modal" />
+	<Z-delete-master-task-modal ref="z-delete-master-task-modal" />
-	<Z-task-add-time-modal 	ref="z-task-add-time-modal" />
+	<Z-complete-task-modal 		ref="z-complete-task-modal" @task-completed="onTaskCompleted" />
-	<Z-blocker-modal 		ref="z-blocker-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" />
+	<Z-master-task-modal 		ref="z-master-task-modal" />
 </template>
 
 <script>
@@ -25,7 +26,7 @@ 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 ZDeleteMasterTaskModal 	from '@/plugins/tm@modal/master-task/z-delete-master-task-modal.vue'
 import ZMasterTaskModal 		from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
 
 export default {
@@ -37,7 +38,8 @@ export default {
 		ZMasterTaskModal,
 		ZCompleteTaskModal,
 		ZTaskAddTimeModal,
-		ZBlockerModal
+		ZBlockerModal,
+		ZDeleteMasterTaskModal
 	},
 
 	mounted() {
@@ -53,6 +55,10 @@ export default {
 			this.$refs['z-delete-task-modal'].showModal(task)
 		})
 
+		this.$events.on('show-delete-master-task-modal', ({masterTask}) => {
+			this.$refs['z-delete-master-task-modal'].showModal(masterTask)
+		})
+
 		this.$events.on('show-task-modal', ({task, editMode}) => {
 			this.$refs['z-task-modal'].showModal(task, editMode)
 		})
@@ -77,11 +83,23 @@ export default {
 
 	methods: {
 		onTeamUpdate(team) {
-			this.$events.emit('on-team-deleted', team)
+			this.$events.emit('on-team-update', team)
 		},
 
 		onTaskDeleted(task) {
 			this.$events.emit('on-task-deleted', task)
+		},
+
+		onTaskCompleted(task) {
+			this.$events.emit('on-task-completed', task)
+		},
+
+		onTaskEdited(task) {
+			this.$events.emit('on-task-edited', task)
+		},
+
+		onMasterTaskDeleted(masterTask){
+			this.$events.emit('on-master-task-deleted', masterTask)
 		}
 	}
 }

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

@@ -49,29 +49,14 @@
 				</v-menu>
 			</div>
 		</div>
-
+		
-		<!-- <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" /> -->
 	</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'
 
 export default {
-	// components: {
-	// 	ZTeamModal,
-	// 	ZBlockerModal,
-	// 	ZMasterTaskModal,
-	// 	ZSubTaskModal
-	// },
-
 	data() {
 		return {
 			search: ''

app/src/plugins/app/_theme/_components/modals.sass

@@ -1,19 +1,16 @@
 .modal-header
 	flex: 0 0 auto
 
-	.trash-icon
+	.icon
-		padding: 10px
-		background: rgba(0, 0, 0, 0.04)
-		margin-left: 12px
-		border-radius: 50%
-		cursor: pointer
-
-	.pencil-icon
 		padding: 10px
 		background: rgba(0, 0, 0, 0.04)
 		border-radius: 50%
-		cursor: pointer
 
+		&:hover
+			cursor: pointer
+
+		&.trash
+			margin-left: 12px
 
 .modal-input
 	width: 100% !important

app/src/plugins/app/_theme/global.sass

@@ -34,6 +34,21 @@
 	height: 24px
 	width: 24px
 
+.remove-date
+	border: 1px solid rgba(0, 0, 0, 0.2)
+	border-radius: 50%
+	padding: 13px
+	height: 24px
+	width: 24px
+
+.add-date
+	color: white
+	border-radius: 50%
+	background: #6200EE
+	padding: 13px
+	height: 24px
+	width: 24px
+
 th
 	font-size: 16px !important
 

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

@@ -71,7 +71,7 @@
 					</div>
 
 					<div class="event-footer d-flex">
-						<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" :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, 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>
@@ -190,8 +190,18 @@ export default {
 			// console.log(`Focused: ${event.task_id}`)
 		},
 
-		clickCompleteTask(event) {
+		async clickCompleteTask(event) {
-			if (event.completed) this.completeTask(event)
+			if (!event.completed) {
+				this.completeTask(event)
+			} else {
+				event.completed = !event.completed
+				try {
+					await this.$axios.patch_auth(`v1/tasks/${event.id}`, event)
+					this.$emit('reopenTask', event)
+				} catch (error) {
+					this.$toast.error(error)
+				}
+			}
 		},
 
 		completeTask(task) {

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

@@ -3,7 +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" />
+			<Z-timeline :calData="timelineData" :calConfig="config" :splits="splitDays" @reopenTask="toggleCompleteTask" />
 		</W-loadable>
 	</div>
 </template>
@@ -31,6 +31,20 @@ export default {
 		}
 	},
 
+	mounted() {
+		this.$events.on('on-task-deleted', (task) => {
+			this.deleteTask(task)
+		})
+
+		this.$events.on('on-task-completed', (task) => {
+			this.toggleCompleteTask(task)
+		})
+
+		this.$events.on('on-task-edited', (task) => {
+			this.editTask(task)
+		})
+	},
+
 	methods: {
 		async getTimelineData(data) {
 			this.config.date = data.firstDay
@@ -147,13 +161,20 @@ export default {
 			}
 		},
 
-		// deleteTask(id) {
+		deleteTask(task) {
-		// 	const task = this.timelineData.find(task => task.id == id)
+			const id = task.id
-		// 	this.$refs['z-delete-task-modal'].delete(task)
+			this.timelineData.tasks.splice(this.timelineData.tasks.findIndex(item => item.id === id), 1)
+		},
 
-		// 	// TODO: Remove after BE integration
+		toggleCompleteTask(task) {
-		// 	this.timelineData.tasks.splice(this.timelineData.tasks.findIndex(item => item.id === id), 1)
+			const taskInTasks = this.timelineData.tasks.find(e => e.id == task.id)
-		// }
+			taskInTasks.completed = !taskInTasks.completed
+		},
+
+		editTask(task) {
+			const taskIndex = this.timelineData.tasks.findIndex(item => item.id === task.id)
+			this.timelineData.tasks[taskIndex] = task
+		},
 	}
 }
 </script>

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

@@ -0,0 +1,54 @@
+<template>
+	<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 zmazať <b>{{ masterTask.name }}</b>?</h1>
+
+				<v-icon
+					@click.stop="closeModal()"
+					icon="mdi-close"
+					size="large"
+					class="mb-15"
+				></v-icon>
+			</div>
+			<v-card-actions class="mt-10 d-flex justify-start align-center">
+				<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()">ÁNO</v-btn>
+				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
+			</v-card-actions>
+		</v-card>
+	</v-dialog>
+</template>
+
+<script>
+export default {
+	emits: ['on-master-task-deleted'],
+
+	data() {
+		return {
+			visible: false,
+			masterTask: null
+		}
+	},
+
+	methods: {
+		async showModal(masterTask) {
+			this.masterTask = masterTask
+			this.visible = true
+		},
+
+		closeModal() {
+			this.visible = false
+		},
+
+		async deleteMasterTask() {
+			try {
+				await this.$axios.delete(`v1/mastertasks/${this.masterTask.id}`)
+				this.$emit('on-master-task-deleted', this.masterTask)
+				this.closeModal()
+			} catch (error) {
+				this.$toast.error(error)
+			}
+		}
+	}
+}
+</script>

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

@@ -133,8 +133,8 @@
 				<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
 					<h1>{{ masterTask.name }}</h1>
 					<div class="d-flex justify-start">
-						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
+						<img class="icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
-						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="_delete()"/>
+						<img class="icon trash" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" /> 
 					</div>
 				</div>
 
@@ -177,9 +177,9 @@
 								</v-sheet>
 							</v-col>
 						</v-row>
-						<v-row no-gutters class="align-center">
+						<v-row no-gutters>
 							<v-col cols="5">
-								<v-sheet class="pa-2 ma-2">
+								<v-sheet class="pa-2 ma-2 pt-0">
 									<div class="d-flex align-center">
 										<v-icon
 											icon="mdi-account-multiple-outline"
@@ -190,9 +190,9 @@
 								</v-sheet>
 							</v-col>
 							<v-col cols="7">
-								<v-sheet class="ma-2 d-flex scroll-employees">
+								<v-sheet class="d-flex flex-wrap flex-column">
-									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">{{ masterTask.team }}</p>
+									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">Tu bude vypisany nazov Timu</p>
-									<div class="d-flex align-center flex-shrink-0 mx-3" v-for="(employee, index) in masterTask.employees" :key="employee.id">
+									<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) }}
 										</p>
@@ -273,19 +273,18 @@
 						</div>
 						<v-table class="mt-7 mb-5">
 							<tbody class="px-5 py-5">
-								<!-- Kravarik: natiahnut toto z masterTask.tasks -->
+								<tr v-for="task in masterTask.subtasks" :key="task.id">
-								<tr v-for="(employee, index) in masterTask.employees" :key="employee.id">
+									<td class="w-25">{{ task.master_task }}</td>
-									<td class="w-25">{{ masterTask.name }}</td>
 									<td class="d-flex align-center">
 										<p class="employee-selected-avatar d-flex justify-center align-center">
-											{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
+											{{ getFullNameByEmployeeId(task.employee_id).initials }}
 										</p>
-										<p class="ml-2" v-html="`${masterTask.employees[index].name} ${masterTask.employees[index].surname}`" />
+										<p>{{ getFullNameByEmployeeId(task.employee_id).fullName }}</p>
 									</td>
 									<td class="task-action">
 										<div class="d-flex justify-start">
-											<img class="pencil-icon" :src="require('@/plugins/tm@dashboard/_components/_img/checkmark.svg')" alt="checkmark-icon" :style="{opacity: 0.3}">
+											<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 class="pencil-icon ml-2" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-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="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" :style="{opacity: 0.3}">
 										</div>
 									</td>
@@ -293,7 +292,7 @@
 							</tbody>
 						</v-table>
 						<div class="d-flex align-center ">
-							<v-btn class="subtask-btn w-100"><v-icon class="mx-1" icon="mdi-plus" />Pridať Subtask</v-btn>
+							<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať Subtask</v-btn>
 						</div>
 					</div>
 				</v-card-actions>
@@ -358,11 +357,34 @@ export default {
 		}
 	},
 
+	mounted() {
+		this.$events.on('on-master-task-deleted', (masterTask) => {
+			if (masterTask?.id == this.masterTask?.id) this.closeModal()
+		})
+	},
+
 	methods: {
 		itemSelected(x) {
 			console.log(x)
 		},
 
+		getFullNameByEmployeeId(employee_id) {
+			let fullName = ''
+			let initials = ''
+			this.employees.forEach(employee => {
+			if (employee.id === employee_id) {
+					fullName = `${employee.name} ${employee.surname}`
+					initials = employee.name.charAt(0) + employee.surname.charAt(0)
+				}
+			})
+			return {
+				fullName,
+				initials
+			}
+			
+		},
+
+
 		async showModal(masterTask, editMode = false) {
 			this.visible 		= true
 			this.masterTask 	= null
@@ -385,7 +407,6 @@ export default {
 			} catch (error) {
 				this.$toast.error(error)
 			}
-			console.log(this.masterTask)
 		},
 
 		async save() {
@@ -410,15 +431,8 @@ export default {
 			this.$emit('close', this.masterTask)
 		},
 
-		async _delete() {
+		openDeleteMasterTaskModal(masterTask) {
-			// Kravarik: Tu sa ma volat delete-master-task-modal, ak taka funkcionalita vlastne je
+			this.$events.emit('show-delete-master-task-modal', { masterTask })
-
-			// try {
-			// 	await this.$axios.delete(`v1/master-tasks/${this.masterTask.id}`)
-			// 	this.closeModal()
-			// } catch (error) {
-			// 	this.$toast.error(error)
-			// }
 		},
 
 		employeeSelected(selectedOption) {
@@ -429,7 +443,11 @@ export default {
 
 		filesUploaded(files) {
 			this.masterTask.files = files
-		}
+		},
+
+		addTask() {
+			this.$events.emit('show-task-modal', {})
+		},
 	},
 
 	computed: {
@@ -502,9 +520,6 @@ export default {
 .scrolling
 	overflow: hidden !important
 
-.scroll-employees
-	overflow-x: scroll
-
 .border-bottom
 	border-bottom: 1px solid rgba(0,0,0,.1)
 

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

@@ -8,6 +8,7 @@
 					@click.stop="closeModal()"
 					icon="mdi-close"
 					size="large"
+					class="mb-15"
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center">
@@ -20,7 +21,7 @@
 
 <script>
 export default {
-	emits: ['deleted'],
+	emits: ['on-task-deleted'],
 
 	data() {
 		return {
@@ -42,7 +43,7 @@ export default {
 		async deleteTask() {
 			try {
 				await this.$axios.delete(`v1/tasks/${this.task.id}`)
-				this.$emit('deleted', this.task)
+				this.$emit('on-task-deleted', this.task)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)

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

@@ -103,13 +103,13 @@
 					<h1>{{ task.title }}</h1>
 					<div class="d-flex justify-start">
 						<img
-							class="pencil-icon"
+							class="icon"
 							:src="require('@/plugins/tm@overview/_img/pencil-icon.svg')"
 							alt="pencil-icon"
 							@click.stop="editMode = !editMode"
 						/>
 						<img
-							class="trash-icon"
+							class="icon trash"
 							:src="require('@/plugins/tm@overview/_img/trash-icon.svg')"
 							alt="trash-icon"
 							@click.stop="openDeleteTaskModal(task)"
@@ -165,9 +165,9 @@
 								</v-sheet>
 							</v-col>
 						</v-row>
-						<v-row no-gutters class="align-center">
+						<v-row no-gutters>
 							<v-col cols="5">
-								<v-sheet class="pa-2 ma-2">
+								<v-sheet class="pa-2 ma-2 pt-5">
 									<div class="d-flex align-center">
 										<v-icon
 											icon="mdi-calendar-week"
@@ -179,11 +179,52 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p
+									<div v-for="date in task.timeblocks" :key="date.id">
-										v-html="
+										<div class="d-flex align-center m-5">
-											`${tmUtils.formatDateTime(task.starts_at)} - ${tmUtils.formatDateTime(task.ends_at)}`
+											<v-icon 
-										"
+												@click.stop="removeDate(index)"
+												class="remove-date cursor-pointer mr-2" icon="mdi-minus" size="medium" 
+											/>
+											<p
+												class="task-badge px-4 py-2 rounded-pill mt-2"
+												v-html="
+													`${tmUtils.formatDateTime(date.start)} - ${tmUtils.formatDateTime(date.end)}`
+												"
+											/>
+										</div>
+									</div>
+									<v-icon 
+										@click="showDatePicker = true"
+										class="add-date cursor-pointer mt-5" icon="mdi-plus" size="medium" 
 									/>
+									<v-dialog max-width="650" v-model="showDatePicker">
+										<v-card>
+											<div class="d-flex justify-space-between align-center">
+												<h1>Pridať dátum</h1>
+
+												<v-icon
+													@click.stop="showDatePicker = false"
+													icon="mdi-close"
+													size="large"
+												></v-icon>
+											</div>
+											<v-card-actions class="mt-10 d-flex justify-start align-center">
+												<Datepicker
+													v-model="selectedNewDate"
+													:class="{ error: v$.selectedNewDate.$errors.length }"
+													:validations="v$.selectedNewDate"
+													class="modal-input"
+													format="dd.MM.yyyy, HH:mm"
+													locale="sk"
+													select-text="Vybrať"
+													cancel-text="Zrušiť"
+													placeholder="Trvanie od - do"
+													range
+												/>
+											</v-card-actions>
+											<v-btn @click="addNewDate()" class="button primary mt-5">Potvrdiť</v-btn>
+										</v-card>
+									</v-dialog>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -232,7 +273,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p>{{ task.duration / 3600 }} h</p>
+									<p>{{ (task.duration / 3600000).toFixed(2) }} h</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -275,7 +316,7 @@
 							<v-col cols="7">
 								<v-sheet class="ma-2">
 									<p>
-										{{ (task.duration - task.spent_time) / 3600 }} h
+										{{ ((task.duration / 3600000) - (task.spent_time)).toFixed(2) }} h
 									</p>
 								</v-sheet>
 							</v-col>
@@ -355,7 +396,9 @@ export default {
 			preventInputFocus: false,
 			masterTasks: [],
 			masterTaskIdSelect: null,
-			employeeIdSelect: null
+			employeeIdSelect: null,
+			showDatePicker: false,
+			selectedNewDate: []
 		}
 	},
 
@@ -377,6 +420,7 @@ export default {
 				duration: { required },
 				employee: { required },
 			},
+			selectedNewDate: { required }
 		}
 	},
 
@@ -396,9 +440,10 @@ export default {
 				if (task?.id) {
 					const t = await this.$axios.get_auth_data(`v1/tasks/${task.id}`)
 
-					this.employeeIdSelect 	= t.employee.id
+					this.employeeIdSelect 		= t.employee.id
 					this.masterTaskIdSelect 	= t.master_task.id
 					this.task 					= t
+					this.task.spent_time = ((t.spent_time) / 3600000).toFixed(2)
 				} else {
 					this.task = {master_task: {}}
 				}
@@ -419,6 +464,7 @@ export default {
 			try {
 				if (this.task.id) {
 					await this.$axios.put_auth(`v1/mastertasks/${this.task.id}`, this.task)
+					this.$events.emit('on-task-edited', this.task)
 				} else {
 					await this.$axios.post_auth('v1/mastertasks', this.task)
 				}
@@ -429,6 +475,21 @@ export default {
 			}
 		},
 
+		async addNewDate() {
+			if (this.selectedNewDate) {
+				this.task.timeblocks.push({
+					start: this.selectedNewDate[0],
+					end: this.selectedNewDate[1]
+				})
+				this.showDatePicker = false
+				this.selectedNewDate = []
+			}
+		},
+
+		removeDate(index) {
+			this.task.timeblocks.splice(index, 1)
+		},
+
 		openDeleteTaskModal(task) {
 			this.$events.emit('show-delete-task-modal', { task })
 		},

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

@@ -23,7 +23,7 @@ export default {
 	},
 
 	mounted() {
-		this.$events.on('on-team-deleted', () => this._loadData())
+		this.$events.on('on-team-update', () => this._loadData())
 	},
 
 	methods: {