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
+9
-6
No files matched your search
@@ -257,17 +257,20 @@ export default {
|
|||||||
|
|
||||||
onCellClick(DOMEvent, split) {
|
onCellClick(DOMEvent, split) {
|
||||||
if (DOMEvent.offsetY > 950 && DOMEvent.offsetY < 1700) {
|
if (DOMEvent.offsetY > 950 && DOMEvent.offsetY < 1700) {
|
||||||
const dateFrom = split.date
|
const dateFrom = split.date
|
||||||
dateFrom.setHours(Math.floor(DOMEvent.offsetY / 100), 0, 0, 0)
|
dateFrom.setHours(Math.floor(DOMEvent.offsetY / 100), 0, 0, 0)
|
||||||
const dateTo = new Date(dateFrom)
|
const dateTo = new Date(dateFrom)
|
||||||
dateTo.setHours(dateFrom.getHours() + 1)
|
dateTo.setHours(dateFrom.getHours() + 1)
|
||||||
|
|
||||||
const time = moment(dateFrom).format('HH:mm')
|
const time = moment(dateFrom).format('HH:mm')
|
||||||
|
|
||||||
this.$events.emit('show-menu-modal', {
|
const isTeamCalendar = this.$route.name === 'Dashboard - Teams'
|
||||||
time: time,
|
const employee = isTeamCalendar ? split.employee_id : this.user.id
|
||||||
date: tmUtils.formatDateTimeForBackend(dateFrom),
|
|
||||||
employee: this.user.id
|
this.$events.emit('show-menu-modal', {
|
||||||
|
time,
|
||||||
|
date: tmUtils.formatDateTimeForBackend(dateFrom),
|
||||||
|
employee
|
||||||
})
|
})
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
createTask() {
|
createTask() {
|
||||||
|
console.log(this.localData.date, this.localData.time, this.localData.employees)
|
||||||
this.$events.emit('show-subtask-modal', {
|
this.$events.emit('show-subtask-modal', {
|
||||||
subtask: {
|
subtask: {
|
||||||
deadline: this.localData.date,
|
deadline: this.localData.date,
|
||||||
|
|||||||
@@ -241,7 +241,6 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async showModal({ subtask, editMode = false, mastertask = {} }) {
|
async showModal({ subtask, editMode = false, mastertask = {} }) {
|
||||||
console.log(subtask)
|
|
||||||
this.isSaving = false
|
this.isSaving = false
|
||||||
this.subtask = null
|
this.subtask = null
|
||||||
this.visible = true
|
this.visible = true
|
||||||
|
|||||||
Reference in new issue
Block a user