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
e9c70f3d9e
3 files changed
+5
-4
No files matched your search
@@ -265,7 +265,7 @@ export default {
|
|||||||
const time = moment(dateFrom).format('HH:mm')
|
const time = moment(dateFrom).format('HH:mm')
|
||||||
|
|
||||||
const isTeamCalendar = this.$route.name === 'Dashboard - Teams'
|
const isTeamCalendar = this.$route.name === 'Dashboard - Teams'
|
||||||
const employee = isTeamCalendar ? split.employee_id : this.user.id
|
const employee = isTeamCalendar ? split.employee_id : Number(localStorage.getItem('selectedEmployee') || this.user.id)
|
||||||
|
|
||||||
this.$events.emit('show-menu-modal', {
|
this.$events.emit('show-menu-modal', {
|
||||||
time,
|
time,
|
||||||
|
|||||||
@@ -211,8 +211,8 @@ export default {
|
|||||||
|
|
||||||
async eventMoved({ event, newSplit }) {
|
async eventMoved({ event, newSplit }) {
|
||||||
const date = addDays(this.calConfig.date, newSplit - 1)
|
const date = addDays(this.calConfig.date, newSplit - 1)
|
||||||
const start = date.setHours(Math.round(event.startTimeMinutes / 60), Math.round(event.startTimeMinutes % 60), 0)
|
const start = date.setHours(Math.floor(event.startTimeMinutes / 60), Math.round(event.startTimeMinutes % 60), 0)
|
||||||
const end = date.setHours(Math.round(event.endTimeMinutes / 60), Math.round(event.endTimeMinutes % 60), 0)
|
const end = date.setHours(Math.floor(event.endTimeMinutes / 60), Math.round(event.endTimeMinutes % 60), 0)
|
||||||
const split = this.splits.find(split => split.id == newSplit )
|
const split = this.splits.find(split => split.id == newSplit )
|
||||||
|
|
||||||
if(this.$route.name == 'Dashboard - Tasks') {
|
if(this.$route.name == 'Dashboard - Tasks') {
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.selectedEmployee = this.user.id
|
this.selectedEmployee = Number(localStorage.getItem('selectedEmployee') || this.user.id)
|
||||||
// this.time = this.unscheduledTime
|
// this.time = this.unscheduledTime
|
||||||
this.$nextTick(() => this._updateFilters())
|
this.$nextTick(() => this._updateFilters())
|
||||||
},
|
},
|
||||||
@@ -88,6 +88,7 @@ export default {
|
|||||||
selectedEmployee(id) {
|
selectedEmployee(id) {
|
||||||
this.filter.employee = this.enrichedEmployees.find(employee => employee.id == id)
|
this.filter.employee = this.enrichedEmployees.find(employee => employee.id == id)
|
||||||
this._emitFilterChanged()
|
this._emitFilterChanged()
|
||||||
|
localStorage.setItem('selectedEmployee', id)
|
||||||
},
|
},
|
||||||
|
|
||||||
splitDays() {
|
splitDays() {
|
||||||
|
|||||||
Reference in new issue
Block a user