mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
[task overview] task overlap
This commit is contained in:
1 parent
0c394fb513
commit
c1296abbdc
5 files changed
+35
-28
No files matched your search
@@ -219,8 +219,11 @@ export default {
|
||||
|
||||
eventStyles () {
|
||||
if (this.event.allDay || !this.vuecal.time || !this.event.endTimeMinutes || this.view.id === 'month' || this.allDay) return {}
|
||||
let width = 100 / Math.min(this.overlaps.length + 1, this.overlapsStreak)
|
||||
let left = (100 / (this.overlaps.length + 1)) * this.eventPosition
|
||||
// let width = 100 / Math.min(this.overlaps.length + 1, this.overlapsStreak)
|
||||
// let left = (100 - ((this.overlaps.length + 1) * 10 )) * this.eventPosition
|
||||
let width = 100 - (this.eventPosition * 10)
|
||||
let left = 10 * this.eventPosition / 2
|
||||
let zIdnex = (this.eventPosition + 1) * 10
|
||||
|
||||
if (this.vuecal.minEventWidth && width < this.vuecal.minEventWidth) {
|
||||
width = this.vuecal.minEventWidth
|
||||
@@ -230,6 +233,7 @@ export default {
|
||||
const { top, height } = this.eventDimensions
|
||||
|
||||
return {
|
||||
"z-index": `${zIdnex}`,
|
||||
top: `${top}px`,
|
||||
height: `${height}px`,
|
||||
width: `${width}%`,
|
||||
|
||||
@@ -49,7 +49,6 @@ export default {
|
||||
getWeek() {
|
||||
this.firstDay = addDays(startOfWeek(this.date), 1)
|
||||
this.lastDay = addDays(endOfWeek(this.date), 1)
|
||||
console.log()
|
||||
|
||||
this.$emit('weekChange', {firstDay: this.firstDay, lastDay: this.lastDay})
|
||||
this.selectedDate = String(this.firstDay.toLocaleDateString('sk-SK') + ' - ' + this.lastDay.toLocaleDateString('sk-SK'))
|
||||
|
||||
@@ -252,8 +252,9 @@ export default {
|
||||
img
|
||||
width: 18px
|
||||
|
||||
&:hover
|
||||
z-index: 10
|
||||
// &:hover,
|
||||
&:focus
|
||||
z-index: 100 !important
|
||||
|
||||
&.red
|
||||
background: #FFC9C9 !important
|
||||
|
||||
@@ -75,17 +75,18 @@ export default {
|
||||
},
|
||||
|
||||
async onEventMoved(event) {
|
||||
try {
|
||||
await this.$axios.post_auth_data(`v1/overview/tasks/${event.event.id}`, {start: event.event.start, end: event.event.end})
|
||||
} catch(error) {
|
||||
this.triggerToast("Nepodarilo sa presunut ulohu!")
|
||||
this.timelineData.dates.filter(e => {
|
||||
if (e.id == event.event.id) {
|
||||
e.start = new Date(event.originalEvent.start)
|
||||
e.end = new Date(event.originalEvent.end)
|
||||
}
|
||||
})
|
||||
}
|
||||
console.log(event)
|
||||
// try {
|
||||
// await this.$axios.post_auth_data(`v1/overview/tasks/${event.event.id}`, {start: event.event.start, end: event.event.end})
|
||||
// } catch(error) {
|
||||
// this.triggerToast("Nepodarilo sa presunut ulohu!")
|
||||
// this.timelineData.dates.filter(e => {
|
||||
// if (e.id == event.event.id) {
|
||||
// e.start = new Date(event.originalEvent.start)
|
||||
// e.end = new Date(event.originalEvent.end)
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user