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

app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue

@@ -23,7 +23,11 @@
 				<template v-if="task.timesheets.length">
 					<div v-for="timesheet in task.timesheets" :key="timesheet.id" class="d-flex align-center mb-3">
 						<v-icon @click.stop="deleteTimesheet(timesheet)" class="remove-date cursor-pointer mr-2" icon="mdi-minus" size="medium" />
-						<p class="task-badge rounded-pill">{{ timesheet.time }}</p>
+						
+						<div class="d-flex align-center flex-start width-100">
+							<p class="task-badge rounded-pill">{{ timesheet.time }}</p>
+							<p class="ml-5">{{ timesheet.timestamp }}</p>
+						</div>
 					</div>
 				</template>
 			</v-sheet>
@@ -132,3 +136,8 @@ export default {
 	}
 }
 </script>
+
+<style lang="sass" scoped>
+.width-100
+	width: 100%
+</style>

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

@@ -12,7 +12,7 @@
 
 					<Z-autocomplete label="Master task" :options="mastertasks.map((masterTask) => ({ key: masterTask.id, value: masterTask.name }))" :validations="v$.task.master_task.id" :clear-on-submit="false" :value="task?.master_task?.name" :class="{ error: v$.task.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
 
-					<v-select v-model="task.employee_id" @focus="onInputFocus" class="modal-input border-select" label="Priradený" :class="{ error: v$.task.employee_id.$errors.length }" variant="solo" :items="filteredEmployees" item-value="id" item-title="_fullName"></v-select>
+					<v-select v-model="task.employee_id" ref="employee-select" @focus="onInputFocus" class="modal-input border-select" label="Priradený" :class="{ error: v$.task.employee_id.$errors.length }" variant="solo" :items="filteredEmployees" item-value="id" item-title="_fullName"></v-select>
 
 					<v-text-field v-model="task.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" label="Časový odhad" :class="{ error: v$.task.duration.$errors.length }" :hint="v$.task.duration.$errors ? errorUtils.parseErrors(v$.task.duration.$errors) : null" append-inner-icon="mdi-clock-outline"></v-text-field>
 
@@ -249,6 +249,10 @@ export default {
 		editMode() {
 			this.$nextTick(() => {
 				this.$refs["description"]?.setHTML(this.task.description || "")
+
+				const employeeSelect = this.$refs['employee-select']?.$el?.querySelector('.v-select__selection-text')
+				if (employeeSelect)
+					employeeSelect.innerHTML = this.task?.employee?._fullName || ''
 			})
 		}
 	}