mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
bug fixes, vyskakovacie okno v kalendari
This commit is contained in:
1 parent
955fdaf087
commit
b5cc4bb977
10 files changed
+77
-11
No files matched your search
@@ -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
|
||||
|
||||
@@ -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>
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in new issue
Block a user