almost there but tasks dont disappear in UI and click&drag doesnt work

This commit is contained in:
Bel LaPointe
2019-11-14 14:25:16 -07:00
parent cf1fd1dfed
commit b6397a71d4
11 changed files with 325 additions and 153 deletions

View File

@@ -53,34 +53,9 @@ func (a *Ajax) newTask(w http.ResponseWriter, r *http.Request) error {
if err != nil {
return err
}
if err := a.storageSetTask(listID, newTask.UUID, newTask); err != nil {
if err := a.storageSetTask(listID, newTask); err != nil {
return err
}
// {"total":4,"list":[
// {"id":"3455",
// "title":"redo qvolution",
// "listId":"18",
// "date":"14 Oct 2019 12:56 PM",
// "dateInt":1571079392,
// "dateInline":"14 Oct",
// "dateInlineTitle":"created at 14 Oct 2019 12:56 PM",
// "dateEditedInt":1571079401,
// "dateCompleted":"",
// "dateCompletedInline":"",
// "dateCompletedInlineTitle":"Completed at ",
// "compl":0,
// "prio":"0",
// "note":"",
// "noteText":"",
// "ow":4,
// "tags":"work",
// "tags_ids":"138",
// "duedate":"",
// "dueClass":"",
// "dueStr":"",
// "dueInt":33330000,
// "dueTitle":"Due "}
// ]}
return json.NewEncoder(w).Encode(map[string]interface{}{
"total": 1,
"list": []*task.Task{newTask},
@@ -98,28 +73,28 @@ func (a *Ajax) makeTask(r *http.Request) (string, *task.Task, error) {
}
func (a *Ajax) deleteTask(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
return a.storageDelTask(listID, taskID)
_, taskID, _ := a.Cur(r)
return a.storageDelTask(taskID)
}
func (a *Ajax) completeTask(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
task, err := a.storageGetTask(listID, taskID)
task, err := a.storageGetTask(taskID)
if err != nil {
return err
}
task.SetComplete(form.Get(r, "compl") == "1")
return a.storageSetTask(listID, taskID, task)
return a.storageSetTask(listID, task)
}
func (a *Ajax) editNote(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
task, err := a.storageGetTask(listID, taskID)
task, err := a.storageGetTask(taskID)
if err != nil {
return err
}
task.SetNote(form.Get(r, "note"))
return a.storageSetTask(listID, taskID, task)
return a.storageSetTask(listID, task)
}
func (a *Ajax) editTask(w http.ResponseWriter, r *http.Request) error {
@@ -129,29 +104,30 @@ func (a *Ajax) editTask(w http.ResponseWriter, r *http.Request) error {
}
_, taskID, _ := a.Cur(r)
task.UUID = taskID
task.ID = task.UUID
return a.storageSetTask(listID, task.UUID, task)
return a.storageSetTask(listID, task)
}
func (a *Ajax) setPrio(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
task, err := a.storageGetTask(listID, taskID)
task, err := a.storageGetTask(taskID)
if err != nil {
return err
}
task.SetPrio(form.ToInt(form.Get(r, "prio")))
return a.storageSetTask(listID, taskID, task)
return a.storageSetTask(listID, task)
}
func (a *Ajax) moveTask(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
_, taskID, _ := a.Cur(r)
toList := form.Get(r, "to")
task, err := a.storageGetTask(listID, taskID)
task, err := a.storageGetTask(taskID)
if err != nil {
return err
}
a.storageDelTask(listID, taskID)
return a.storageSetTask(toList, taskID, task)
if err := a.storageDelTask(taskID); err != nil {
return err
}
return a.storageSetTask(toList, task)
}
func (a *Ajax) parseTaskStr(w http.ResponseWriter, r *http.Request) error {