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

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

@@ -97,3 +97,7 @@ input[type="time"]::-webkit-calendar-picker-indicator
 
 .vld-overlay .vld-background
 	opacity: 1
+
+.v-row.subheader
+	.v-input
+		height: 56px !important

app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue

@@ -79,6 +79,8 @@ export default {
 	&:deep(.fc-event-end)
 		border-top-right-radius: 30px
 		border-bottom-right-radius: 30px
+	&:deep(.fc-event-main)
+		color: black
 	&:deep(.fc-event)
 		font-size: 12px
 		padding-left: 10px

app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts

@@ -3,7 +3,7 @@ export default {
 		employeesOptions() {
 			const selectedEmployees = [...this.mastertask.employees].map(employee => employee.id)
 
-			const employees = this.employees.filter(
+			const employees = this.enrichedEmployees.filter(
 				(employee) => !selectedEmployees.includes(employee.id)
 			) || []
 
@@ -30,7 +30,7 @@ export default {
 		},
 
 		onEmployeeSelected({ key }) {
-			const employee = this.employees.find(employee => employee.id == key)
+			const employee = this.enrichedEmployees.find(employee => employee.id == key)
 			this.mastertask.employees.push(employee)
 			this.showAddEmployeeInput = false
 		},

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

@@ -58,7 +58,7 @@
 						<A-mastertask-description :mastertask="mastertask" />
 
 						<div class="d-flex justify-start align-center mt-8">
-							<v-btn class="button primary" @click="save()">Ukončiť mastertask</v-btn>
+							<v-btn class="button primary" @click="toggleIsFinished()">{{ mastertask.is_finished ? 'Otvoriť mastertask' : 'Ukončiť mastertask'}}</v-btn>
 						</div>
 
 						<A-tasks-table :subtasks="mastertask.subtasks" />
@@ -125,7 +125,8 @@ export default {
 	computed: {
 		...mapGetters('tm', [
 			'teams',
-			'projects'
+			'projects',
+			'enrichedEmployees'
 		])
 	},
 
@@ -193,9 +194,15 @@ export default {
 			}
 		},
 
+		toggleIsFinished() {
+			this.mastertask.is_finished = !this.mastertask.is_finished
+			this.save()
+		},
+
 		async save() {
 			if (!(await this.v$.$validate())) return
 
+			if (this.$refs['description'])
 				this.mastertask.description = this.$refs['description'].getHTML()
 
 			// this.mastertask.subtasks = this.mastertask.subtasks.map(subtask => {

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

@@ -168,7 +168,7 @@ export default {
 			if (!(await this.v$.$validate()))
 				return
 
-			this.subtask.description = this.$refs["description"].getHTML()
+			this.subtask.description = this.$refs['description'].getHTML()
 
 			try {
 				if (this.subtask?.id) {

app/src/plugins/w/auth/refreshExpired.ts

@@ -6,7 +6,7 @@ async function _unauthorised(error: any) {
 	if (error?.response?.data?.message == 'Unauthenticated.')
 		return store.dispatch('auth/logout')
 	
-	return error
+	return Promise.reject(error)
 }
 
 axios.interceptors.response.use(