mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-22 14:59:34 +00:00
[Search] Fixed search refresh after action
This commit is contained in:
1 parent
66e6b84bd9
commit
750f3dd59a
6 files changed
+54
-26
No files matched your search
@@ -117,6 +117,8 @@ export default {
|
||||
})
|
||||
}
|
||||
|
||||
console.log(events)
|
||||
|
||||
return events
|
||||
},
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ export default {
|
||||
|
||||
try {
|
||||
const { subtasks, blockers } = await this.$axios.get_auth(`v1/subtasks?${queryParameters}`)
|
||||
this.config.scrollHour = this.filter?.employee.work_start - 1
|
||||
this.config.scrollHour = (this.filter?.employee.work_start / 60) - 1
|
||||
this.config.date = this.filter.start
|
||||
this.subtasks = [...subtasks, ...blockers.map(blocker => ({...blocker, type: 'blocker'}))]
|
||||
} catch (error) {
|
||||
|
||||
@@ -43,14 +43,14 @@ export default {
|
||||
_generateNonWorking() {
|
||||
const nonWorkingHours = []
|
||||
const date = new Date(this.filter.start)
|
||||
let earliestStartHour = null
|
||||
let earliestStartMinutes = null
|
||||
this.calendarConfig.date = date
|
||||
|
||||
const { start: dayStart, end: dayEnd } = this._getDayStartEnd()
|
||||
|
||||
this.filter.team.employees.forEach((employee, index) => {
|
||||
if (!earliestStartHour || employee.work_start < earliestStartHour)
|
||||
earliestStartHour = employee.work_start
|
||||
if (!earliestStartMinutes || (employee.work_start) < earliestStartMinutes)
|
||||
earliestStartMinutes = employee.work_start
|
||||
|
||||
|
||||
nonWorkingHours.push({
|
||||
@@ -72,7 +72,7 @@ export default {
|
||||
})
|
||||
})
|
||||
|
||||
this.calendarConfig.scrollHour = earliestStartHour - 1
|
||||
this.calendarConfig.scrollHour = (earliestStartMinutes) - 1
|
||||
return nonWorkingHours
|
||||
},
|
||||
|
||||
|
||||
Reference in new issue
Block a user