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 @@ + 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)