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

app/src/plugins/app@vendor/vue-cal/styles.scss

@@ -178,8 +178,10 @@ $splits-headers-height: 1.5em;
     .vuecal__time-cell {
       color: #999;
       text-align: right;
-      padding-right: 2px;
       font-size: 0.9em;
+		// background: white;
+		// remove -v
+		padding-right: 2px;
     }
 
     .vuecal__time-cell-line:before {
@@ -187,8 +189,15 @@ $splits-headers-height: 1.5em;
       position: absolute;
       left: 0;
       right: 0;
-      border-top: 1px solid rgba(196, 196, 196, 0.3);
+	  // remove -v
+	  border-top: 1px solid rgba(196, 196, 196, 0.3);
+    //   border-top: 1px solid #F5F5F5;
+      z-index: -1;
     }
+	//add -v
+    // .vuecal__time-cell-line.hour:before {
+    //   border-top: 1px solid #e0e0e0;
+    // }
   }
 
   // Calendar cells.

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

@@ -55,6 +55,17 @@
 					<p>{{hours}}:{{String(minutes).padStart(2, '0')}}</p>
 					<div class="time-column-line"></div>
 				</span>
+				<!-- <span class="d-flex justify-center">
+					<span class="d-flex justify-center">
+						<p style="margin-top: -9px">{{hours}}:{{String(minutes).padStart(2, '0')}}</p>
+						<div class="time-column-line"></div>
+						<span class="vuecal__time-cell-line hour"></span>
+					</span>
+
+					<span class="vuecal__time-cell-line" style="margin-top: 25px"></span>
+					<span class="vuecal__time-cell-line" style="margin-top: 50px"></span>
+					<span class="vuecal__time-cell-line" style="margin-top: 75px"></span>
+				</span> -->
 			</template>
 
 			<template v-slot:event="{ event }">
@@ -511,7 +522,7 @@ export default {
 				.vuecal__cell--today,
 				.vuecal__cell--highlighted,
 				.vuecal__cell--selected
-					background-color: white
+					// background-color: white
 					border-radius: 16px
 
 				.vuecal__cell-split--weekend

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

@@ -224,7 +224,8 @@ export default {
 					this.subtask = { master_task: mastertask, employees: [{}], _deadline_time: '17:00' }
 
 					if (subtask?.deadline && subtask._deadline_time && subtask.employee_id) {
-						this.subtask.employee_id = subtask.employee_id
+						const employee = this.enrichedEmployees.find(employee => employee.id == subtask.employee_id)
+						this.subtask.employees = [employee]
 						this.subtask.deadline = subtask.deadline
 						this.subtask._deadline_time = subtask._deadline_time
 					}