mirror of
https://bitbucket.org/studiotem/jandl-taskmanager-app.git
synced 2026-10-21 14:29:34 +00:00
fix(): fixed refresh in ongoing subtasks table after task edit, fixed expanding of focused task in safari
This commit is contained in:
1 parent
6b967d9c69
commit
13960f0045
4 files changed
+42
-8
No files matched your search
@@ -11,7 +11,9 @@ export default {
|
||||
projects: null,
|
||||
unscheduledSubtasks: null,
|
||||
ongoingSubtasks: null,
|
||||
initialized: false
|
||||
initialized: false,
|
||||
ongoingSubtasksEmployeeId: null,
|
||||
unscheduledSubtasksEmployeeId: null
|
||||
},
|
||||
|
||||
mutations: {
|
||||
@@ -86,6 +88,14 @@ export default {
|
||||
// })
|
||||
},
|
||||
|
||||
set_ongoing_subtasks_employee_id(state: any, employeeId: any) {
|
||||
state.ongoingSubtasksEmployeeId = employeeId
|
||||
},
|
||||
|
||||
set_unscheduled_subtasks_employee_id(state: any, employeeId: any) {
|
||||
state.unscheduledSubtasksEmployeeId = employeeId
|
||||
},
|
||||
|
||||
initialized(state: any) {
|
||||
state.initialized = true
|
||||
}
|
||||
@@ -177,9 +187,20 @@ export default {
|
||||
|
||||
},
|
||||
|
||||
loadUnscheduledSubtasks({commit}: {commit: any}, employeeId = store.getters['auth/user']?.id) {
|
||||
loadUnscheduledSubtasks({commit, state}: {commit: any, state: any}, employeeId = undefined) {
|
||||
let employeeIdToUse = undefined
|
||||
|
||||
if (employeeId) {
|
||||
employeeIdToUse = employeeId
|
||||
commit('set_unscheduled_subtasks_employee_id', employeeId)
|
||||
} else if (state.unscheduledSubtasksEmployeeId) {
|
||||
employeeIdToUse = state.unscheduledSubtasksEmployeeId
|
||||
} else {
|
||||
employeeIdToUse = store.getters['auth/user']?.id
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
axios.get_auth(`v1/subtasks?type=unscheduled&employee_id=${employeeId}`)
|
||||
axios.get_auth(`v1/subtasks?type=unscheduled&employee_id=${employeeIdToUse}`)
|
||||
.then(({subtasks}) => {
|
||||
commit('set_unscheduled_subtasks', subtasks)
|
||||
resolve(subtasks)
|
||||
@@ -191,9 +212,21 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
loadOngoingSubtasks({commit}: {commit: any}, employeeId = store.getters['auth/user']?.id) {
|
||||
loadOngoingSubtasks({commit, state}: {commit: any, state: any}, employeeId = undefined) {
|
||||
let employeeIdToUse = undefined
|
||||
|
||||
if (employeeId) {
|
||||
employeeIdToUse = employeeId
|
||||
commit('set_ongoing_subtasks_employee_id', employeeId)
|
||||
} else if (state.ongoingSubtasksEmployeeId) {
|
||||
employeeIdToUse = state.ongoingSubtasksEmployeeId
|
||||
} else {
|
||||
employeeIdToUse = store.getters['auth/user']?.id
|
||||
commit('set_ongoing_subtasks_employee_id', employeeIdToUse)
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
axios.get_auth(`v1/subtasks?type=ongoing&employee_id=${employeeId}`)
|
||||
axios.get_auth(`v1/subtasks?type=ongoing&employee_id=${employeeIdToUse}`)
|
||||
.then(({subtasks}) => {
|
||||
commit('set_ongoing_subtasks', subtasks)
|
||||
resolve(subtasks)
|
||||
|
||||
@@ -566,7 +566,8 @@ export default {
|
||||
|
||||
&.vuecal__event--focus
|
||||
z-index: 100 !important
|
||||
height: fit-content !important
|
||||
height: auto !important // Fix to work with safari as well
|
||||
max-height: fit-content !important // Fix to work with safari as well
|
||||
width: 100% !important
|
||||
left: 0 !important
|
||||
|
||||
|
||||
Reference in new issue
Block a user