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

app/src/plugins/app@vendor/vue-cal/cell.vue

@@ -257,17 +257,20 @@ export default {
 
     onCellClick(DOMEvent, split) {
       if (DOMEvent.offsetY > 950 && DOMEvent.offsetY < 1700) {
-		const dateFrom = split.date
+		    const dateFrom = split.date
         dateFrom.setHours(Math.floor(DOMEvent.offsetY / 100), 0, 0, 0)
         const dateTo = new Date(dateFrom)
         dateTo.setHours(dateFrom.getHours() + 1)
 
         const time = moment(dateFrom).format('HH:mm')
 
-		this.$events.emit('show-menu-modal', {
-			time: time,
-			date: tmUtils.formatDateTimeForBackend(dateFrom),
-			employee: this.user.id
+        const isTeamCalendar = this.$route.name === 'Dashboard - Teams'
+        const employee = isTeamCalendar ? split.employee_id : this.user.id
+
+        this.$events.emit('show-menu-modal', {
+          time,
+          date: tmUtils.formatDateTimeForBackend(dateFrom),
+          employee
         })
 
         setTimeout(() => {

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

@@ -54,6 +54,7 @@ export default {
 		},
 
 		createTask() {
+			console.log(this.localData.date, this.localData.time, this.localData.employees)
 			this.$events.emit('show-subtask-modal', {
 				subtask: {
 					deadline: this.localData.date,

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

@@ -241,7 +241,6 @@ export default {
 		},
 
 		async showModal({ subtask, editMode = false, mastertask = {} }) {
-			console.log(subtask)
 			this.isSaving = false
 			this.subtask = null
 			this.visible = true