From cef1b5e733156db0ba105a2414e4bc0e1d205148 Mon Sep 17 00:00:00 2001 From: romankko2 Date: Thu, 10 Aug 2023 12:19:27 +0200 Subject: [PATCH] [projects-overview] line-clamp --- .../tm@dashboard/projects/_components/a-project-calendar.vue | 4 ++++ app/src/plugins/tm@modal/master-task/z-master-task-modal.vue | 4 ++-- app/src/plugins/tm@modal/task/z-task-add-time-modal.vue | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue index 05ed3b8..82bc51d 100644 --- a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue +++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue @@ -87,6 +87,10 @@ export default { font-size: 12px padding-left: 10px margin-top: 5px + display: -webkit-box + -webkit-line-clamp: 3 + -webkit-box-orient: vertical + overflow: hidden &:after background: unset &:deep(.fc-day-today) diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue index dcbe4e2..9a46d76 100644 --- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue +++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue @@ -70,7 +70,7 @@
- {{ mastertask.is_finished ? 'Otvoriť mastertask' : 'Ukončiť mastertask'}} + {{ mastertask.is_finished === 1 ? 'Otvoriť mastertask' : 'Ukončiť mastertask' }}
@@ -265,7 +265,7 @@ export default { }, toggleIsFinished() { - this.mastertask.is_finished = !this.mastertask.is_finished + this.mastertask.is_finished = this.mastertask.is_finished === 0 ? 1 : 0 this.save() }, 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 d7b8623..5e9c406 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 @@ -18,7 +18,8 @@ import errorUtils from '@/plugins/lib@auth/_utils/error.utils' import useVuelidate from '@vuelidate/core' import { required, numeric, minValue } from '@vuelidate/validators' -import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin' +import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin' +import tmUtils from '@/plugins/tm@_utils/tm.utils' export default { mixins: [ modalMixin ], @@ -56,6 +57,8 @@ export default { if (!await this.v$.$validate()) return + if (this.subtask.deadline) this.subtask.deadline = tmUtils.formatDateTimeForBackend(this.subtask.deadline) + this.subtask.timesheets.push({ id: null, employee_id: this.subtask.employee_id,