From b5cc4bb977ae3e6f5ef7c7bed238a90c0fdc15ef Mon Sep 17 00:00:00 2001
From: romankko2 <romokravarik@gmail.com>
Date: Thu, 8 Jun 2023 17:29:55 +0200
Subject: [PATCH] bug fixes, vyskakovacie okno v kalendari

---
 app/src/plugins/app/_config/App.vue           |  9 +++-
 .../app/_img/icons/checkmark-double.svg       |  1 -
 app/src/plugins/app@vendor/vue-cal/cell.vue   | 13 ++++-
 .../tm@dashboard/_components/z-timeline.vue   |  1 +
 .../projects/_components/a-project-filter.vue |  2 -
 .../master-task/_mixins/selects.mixin.ts      |  4 +-
 .../tm@modal/task-cell/z-show-menu-modal.vue  | 47 +++++++++++++++++++
 .../_components/a-task-spent-time.vue         |  4 +-
 .../tm@modal/task/z-task-add-time-modal.vue   |  4 +-
 .../plugins/tm@modal/task/z-task-modal.vue    |  3 ++
 10 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue

diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index ced0bf6..c6acc71 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -18,6 +18,7 @@
 
 	<Z-master-task-modal 		ref="z-master-task-modal" 			@master-task-edited="onMasterTaskEdited" />
 	<Z-delete-team-member-modal ref="z-delete-team-member-modal" />
+	<Z-show-menu-modal 			ref="z-show-menu-modal" />
 </template>
 
 <script>
@@ -32,6 +33,7 @@ import ZBlockerModal 			from '@/plugins/tm@modal/blocker/z-blocker-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'
 import ZDeleteTeamMemberModal	from '@/plugins/tm@modal/master-task/z-delete-team-member-modal.vue'
+import ZShowMenuModal 			from '@/plugins/tm@modal/task-cell/z-show-menu-modal.vue'
 
 export default {
 	components: {
@@ -45,10 +47,15 @@ export default {
 		ZTaskAddTimeModal,
 		ZBlockerModal,
 		ZDeleteMasterTaskModal,
-		ZDeleteTeamMemberModal
+		ZDeleteTeamMemberModal,
+		ZShowMenuModal
 	},
 
 	mounted() {
+		this.$events.on('show-menu-modal', () => {
+			this.$refs['z-show-menu-modal'].showModal()
+		})
+
 		this.$events.on('show-delete-team-modal', ({team}) => {
 			this.$refs['z-delete-team-modal'].showModal({ team })
 		})
diff --git a/app/src/plugins/app/_img/icons/checkmark-double.svg b/app/src/plugins/app/_img/icons/checkmark-double.svg
index cc0fd44..f079edd 100644
--- a/app/src/plugins/app/_img/icons/checkmark-double.svg
+++ b/app/src/plugins/app/_img/icons/checkmark-double.svg
@@ -1,5 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="16" height="16" fill="white"/>
 <path d="M2 7.82843L4.82843 10.6569L10.4853 5" stroke="black" stroke-opacity="0.87" stroke-linecap="round" stroke-linejoin="round"/>
 <rect x="7.03906" y="7.61621" width="1.09208" height="1.7726" transform="rotate(45 7.03906 7.61621)" fill="white"/>
 <path d="M6 7.82843L8.82843 10.6569L14.4853 5" stroke="black" stroke-opacity="0.87" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue
index 7961382..0b4083f 100644
--- a/app/src/plugins/app@vendor/vue-cal/cell.vue
+++ b/app/src/plugins/app@vendor/vue-cal/cell.vue
@@ -64,6 +64,7 @@ transition-group.vuecal__cell(
 <script>
 import Event from './event.vue'
 import tmUtils from '@/plugins/tm@_utils/tm.utils'
+import moment from 'moment'
 
 export default {
   inject: ['vuecal', 'utils', 'modules', 'view', 'domEvents'],
@@ -259,7 +260,17 @@ export default {
         dateFrom.setHours(Math.floor(DOMEvent.offsetY / 100), 0, 0, 0)
         const dateTo = new Date(dateFrom)
         dateTo.setHours(dateFrom.getHours() + 1)
-			  this.$events.emit('show-subtask-modal', {})
+
+        const splitDate = split.date
+
+        const time = moment(splitDate).format('hh:mm')
+        const date = moment(splitDate).format('YYYY-MM-DD') // dd.MM.yyyy
+
+        console.log(time)
+        console.log(date)
+
+			  this.$events.emit('show-menu-modal', {})
+
         setTimeout(() => {
           this.$events.emit('add-timeblock', {
             id: null, 
diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index d985f51..0750890 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -163,6 +163,7 @@ export default {
 				...event.subtask,
 				timeblocks: [...event.subtask.timeblocks, {
 					id: event._timeblock_id,
+					is_finished: 0,
 					start: tmUtils.formatDateTimeForBackend(start),
 					end: tmUtils.formatDateTimeForBackend(end)
 				}]
diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
index 88e66f4..b55184d 100644
--- a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
+++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
@@ -4,10 +4,8 @@
 
 		<v-select v-model="filter.teamId" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
 
-		<!-- <v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" /> -->
 		<v-autocomplete v-model="filter.employeeId" class="subheader-input" :items="[...enrichedEmployees]" item-title="_fullName" item-value="id" label="Zamestnanec" variant="outlined" />
 
-		<!-- <v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" /> -->
 		<v-autocomplete v-model="filter.createdById" class="subheader-input" :items="[...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
 
 		<v-select v-model="filter.month" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
index 2036b6f..5069a5a 100644
--- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
+++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
@@ -43,8 +43,8 @@ export default {
 
 			this.mastertask.employees = this.mastertask.employees.map(employee => {
 				if (typeof employee.duration == 'string') {
-					totalDuration += parseInt(employee.duration)
-					employee.duration = parseInt(employee.duration)
+					totalDuration += parseFloat(employee.duration)
+					employee.duration = parseFloat(employee.duration)
 				}
 				else if (typeof employee.duration == 'number') {
 					totalDuration += employee.duration
diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
new file mode 100644
index 0000000..a86cb79
--- /dev/null
+++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
@@ -0,0 +1,47 @@
+<template>
+	<v-dialog v-model="visible" max-width="750">
+		<v-card>
+			<div class="d-flex justify-space-between align-center">
+				<h1>
+					Vytvoriť
+				</h1>
+				<v-icon @click.stop="closeModal()" icon="mdi-close" size="large"></v-icon>
+			</div>
+
+			<v-card-actions class="mt-10 d-flex justify-start align-center">
+				<v-btn class="button primary half outline" @click.stop="createTeam()">TÍM</v-btn>
+				<v-btn class="button primary half outline" @click.stop="createBlocker()">BLOCKER</v-btn>
+			</v-card-actions>
+		</v-card>
+	</v-dialog>
+</template>
+
+<script>
+export default {
+	emits: ['update'],
+
+	data() {
+		return {
+			visible: false
+		}
+	},
+
+	methods: {
+		async showModal() {
+			this.visible = true
+		},
+
+		closeModal() {
+			this.visible = false
+		},
+
+		createTeam() {
+			this.$events.emit('show-team-modal', {})
+		},
+
+		createBlocker() {
+			this.$events.emit('show-blocker-modal', {})
+		}
+	}
+}
+</script>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
index 179f25e..e354127 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
@@ -81,7 +81,7 @@ export default {
 	validations() {
 		return {
 			form: {
-				hours: {required, numeric, minValue: minValue(1)}
+				hours: {required, numeric, minValue: minValue(0.1)}
 			}
 		}
 	},
@@ -96,7 +96,7 @@ export default {
 			subtask.timesheets.push({
 				id: null,
 				employee_id: subtask.employee_id,
-				time: typeof this.form.hours == 'string' ? parseInt(this.form.hours) : this.form.hours
+				time: typeof this.form.hours == 'string' ? parseFloat(this.form.hours) : this.form.hours
 			})
 
 			this._update(subtask)
diff --git a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
index cb9ca06..2546903 100644
--- a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
@@ -37,7 +37,7 @@ export default {
 	validations() {
 		return {
 			form: {
-				hours: {required, numeric, minValue: minValue(1)}
+				hours: {required, numeric, minValue: minValue(0.1)}
 			}
 		}
 	},
@@ -57,7 +57,7 @@ export default {
 			this.subtask.timesheets.push({
 				id: null,
 				employee_id: this.subtask.employee_id,
-				time: typeof this.form.hours == 'string' ? parseInt(this.form.hours) : this.form.hours
+				time: typeof this.form.hours == 'string' ? parseFloat(this.form.hours) : this.form.hours
 			})
 
 			try {
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index ae1c2a9..e2c35fb 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -113,6 +113,7 @@ import VuetifyFixFocusMixin from "@/plugins/tm@modal/_mixins/vuetify-fix-focus"
 import SelectsMixin from "../master-task/_mixins/selects.mixin"
 import * as FileSaver from "file-saver"
 import tmUtils from "@/plugins/tm@_utils/tm.utils"
+import moment from 'moment'
 import "@vueup/vue-quill/dist/vue-quill.snow.css"
 
 import ZTaskReadonlyInfo from "./_components/z-task-readonly-info.vue"
@@ -222,6 +223,8 @@ export default {
 			this._mergeDeadlineTimeDate()
 
 			try {
+				this.subtask.deadline = moment(this.subtask.deadline).format('YYYY-MM-DD HH:MM:SS')
+
 				if (this.subtask?.id) {
 					const { subtask } = await this.$axios.put_auth(`v1/subtasks/${this.subtask.id}`, this.subtask)