final adjustments to the field task list and the field drawer and field page using the tasks with the permissions in the correct way
This commit is contained in:
parent
8633c197ab
commit
186604dccf
11 changed files with 97 additions and 177 deletions
|
|
@ -7,6 +7,8 @@ import TaskList from "tasks/TaskList"
|
|||
import TaskSettings from "tasks/TaskSettings"
|
||||
import AddIcon from "@mui/icons-material/Add";
|
||||
import { makeStyles } from "@mui/styles";
|
||||
import { openSnackbar } from "providers/Snackbar"
|
||||
import { cloneDeep } from "lodash"
|
||||
|
||||
|
||||
|
||||
|
|
@ -70,8 +72,10 @@ export default function FieldTaskList(props: Props) {
|
|||
const [openTaskDrawer, setOpenTaskDrawer] = useState(false)
|
||||
const [opentaskSettings, setOpenTaskSettings] = useState(false)
|
||||
const [taskMap, setTaskMap] = useState<Map<string, Task>>(new Map())
|
||||
|
||||
//load the tasks
|
||||
const loadTasks = useCallback(() => {
|
||||
console.log("loading tasks")
|
||||
taskAPI.listTasks(50, 0, "asc", "start", undefined, undefined, undefined, undefined, undefined, [field], ["field"]).then(resp => {
|
||||
if(resp.data.tasks){
|
||||
let newMap: Map<string,Task> = new Map()
|
||||
|
|
@ -89,20 +93,24 @@ export default function FieldTaskList(props: Props) {
|
|||
loadTasks()
|
||||
},[loadTasks])
|
||||
|
||||
const addNewTask = (task: Task) => {
|
||||
console.log()
|
||||
const deleteTask = (task: Task) => {
|
||||
taskAPI.removeTask(task.key).then(resp => {
|
||||
openSnackbar("success", "Task has been removed")
|
||||
loadTasks()
|
||||
}).catch(err => {
|
||||
openSnackbar("error", "There was a problem removing the task")
|
||||
})
|
||||
}
|
||||
|
||||
const deleteTask = () => {
|
||||
|
||||
}
|
||||
|
||||
const markComplete = () => {
|
||||
|
||||
}
|
||||
|
||||
const updateTask = () => {
|
||||
|
||||
const markComplete = (task: Task) => {
|
||||
let settings = cloneDeep(task.settings)
|
||||
settings.complete = !task.settings.complete
|
||||
taskAPI.updateTask(task.key, settings).then(resp => {
|
||||
openSnackbar("success", "Task has been updated")
|
||||
loadTasks()
|
||||
}).catch(err => {
|
||||
openSnackbar("error", "There was a problem updating the task")
|
||||
})
|
||||
}
|
||||
//return the task list
|
||||
return (
|
||||
|
|
@ -113,9 +121,12 @@ export default function FieldTaskList(props: Props) {
|
|||
open={openTaskDrawer}
|
||||
deleteTask={deleteTask}
|
||||
completeTask={markComplete}
|
||||
closeCallback={() => {
|
||||
closeCallback={(refresh) => {
|
||||
setOpenTaskDrawer(false)
|
||||
setSelectedTask(undefined)
|
||||
if (refresh) {
|
||||
loadTasks()
|
||||
}
|
||||
}}
|
||||
keys={[field]}
|
||||
types={["field"]}
|
||||
|
|
@ -123,7 +134,6 @@ export default function FieldTaskList(props: Props) {
|
|||
}
|
||||
<TaskList
|
||||
deleteTask={deleteTask}
|
||||
editTaskMethod={updateTask}
|
||||
markComplete={markComplete}
|
||||
openTask={id => {
|
||||
let task = taskMap.get(id)
|
||||
|
|
@ -141,8 +151,11 @@ export default function FieldTaskList(props: Props) {
|
|||
/>
|
||||
<TaskSettings
|
||||
open={opentaskSettings}
|
||||
onClose={() => {
|
||||
onClose={(reload) => {
|
||||
setOpenTaskSettings(false)
|
||||
if(reload){
|
||||
loadTasks()
|
||||
}
|
||||
}}
|
||||
keys={[field]}
|
||||
types={["field"]}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue