mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
Merge branch 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app into production
This commit is contained in:
commit
ed6ba59bb5
3 files changed
+6
-3
No files matched your search
@@ -264,10 +264,13 @@ export default {
|
||||
|
||||
const time = moment(dateFrom).format('HH:mm')
|
||||
|
||||
const isTeamCalendar = this.$route.name === 'Dashboard - Teams'
|
||||
const employee = isTeamCalendar ? split.employee_id : this.user.id
|
||||
|
||||
this.$events.emit('show-menu-modal', {
|
||||
time: time,
|
||||
time,
|
||||
date: tmUtils.formatDateTimeForBackend(dateFrom),
|
||||
employee: this.user.id
|
||||
employee
|
||||
})
|
||||
|
||||
setTimeout(() => {
|
||||
|
||||
@@ -54,6 +54,7 @@ export default {
|
||||
},
|
||||
|
||||
createTask() {
|
||||
console.log(this.localData.date, this.localData.time, this.localData.employees)
|
||||
this.$events.emit('show-subtask-modal', {
|
||||
subtask: {
|
||||
deadline: this.localData.date,
|
||||
|
||||
@@ -241,7 +241,6 @@ export default {
|
||||
},
|
||||
|
||||
async showModal({ subtask, editMode = false, mastertask = {} }) {
|
||||
console.log(subtask)
|
||||
this.isSaving = false
|
||||
this.subtask = null
|
||||
this.visible = true
|
||||
|
||||
Reference in new issue
Block a user