local
/
todo-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

master v0.1
bel 2020-01-21 06:34:26 +00:00
parent c457cb1daf
commit 39ca01c3e8
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/ajax/task.go
View File

@ -95,7 +95,7 @@ func (a *Ajax) deleteTask(w http.ResponseWriter, r *http.Request) error {
if err := a.storageDelTask(taskID); err != nil {
return err
}
return json.NewEncoder(w).Encode(map[string]int{"total": 1})
return json.NewEncoder(w).Encode(map[string]interface{}{"total": 0})
}
func (a *Ajax) completeTask(w http.ResponseWriter, r *http.Request) error {
@ -119,57 +119,57 @@ func (a *Ajax) completeTask(w http.ResponseWriter, r *http.Request) error {
func (a *Ajax) editNote(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
task, err := a.storageGetTask(taskID)
editedTask, err := a.storageGetTask(taskID)
if err != nil {
return err
}
task.SetNote(form.Get(r, "note"))
if err := a.storageSetTask(listID, task); err != nil {
editedTask.SetNote(form.Get(r, "note"))
if err := a.storageSetTask(listID, editedTask); err != nil {
return err
}
return json.NewEncoder(w).Encode(map[string]int{"total": 1})
return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
}
func (a *Ajax) editTask(w http.ResponseWriter, r *http.Request) error {
listID, task, err := a.makeTask(r)
listID, editedTask, err := a.makeTask(r)
if err != nil {
return err
}
_, taskID, _ := a.Cur(r)
task.UUID = taskID
if err := a.storageSetTask(listID, task); err != nil {
editedTask.UUID = taskID
if err := a.storageSetTask(listID, editedTask); err != nil {
return err
}
return json.NewEncoder(w).Encode(map[string]int{"total": 1})
return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
}
func (a *Ajax) setPrio(w http.ResponseWriter, r *http.Request) error {
listID, taskID, _ := a.Cur(r)
task, err := a.storageGetTask(taskID)
editedTask, err := a.storageGetTask(taskID)
if err != nil {
return err
}
task.SetPrio(form.ToInt(form.Get(r, "prio")))
if err := a.storageSetTask(listID, task); err != nil {
editedTask.SetPrio(form.ToInt(form.Get(r, "prio")))
if err := a.storageSetTask(listID, editedTask); err != nil {
return err
}
return json.NewEncoder(w).Encode(map[string]int{"total": 1})
return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{editedTask}})
}
func (a *Ajax) moveTask(w http.ResponseWriter, r *http.Request) error {
_, taskID, _ := a.Cur(r)
toList := form.Get(r, "to")
task, err := a.storageGetTask(taskID)
movedTask, err := a.storageGetTask(taskID)
if err != nil {
return err
}
if err := a.storageDelTask(taskID); err != nil {
return err
}
if err := a.storageSetTask(toList, task); err != nil {
if err := a.storageSetTask(toList, movedTask); err != nil {
return err
}
return json.NewEncoder(w).Encode(map[string]int{"total": 1})
return json.NewEncoder(w).Encode(map[string]interface{}{"total": 1, "list": []*task.Task{movedTask}})
}
func (a *Ajax) parseTaskStr(w http.ResponseWriter, r *http.Request) error {

9
server/ajax/task_test.go
View File

@ -210,17 +210,18 @@ func TestAjaxChangeOrder(t *testing.T) {
}
func TestFilterComplete(t *testing.T) {
task := &task.Task{Complete: false}
cases := []struct {
query string
task bool
out bool
}{
{query: "", out: true},
{query: "0", out: true},
{query: "1", out: false},
{query: "", out: true, task: false},
{query: "0", out: true, task: false},
{query: "1", out: true, task: false},
}
for name, c := range cases {
task := &task.Task{Complete: c.task}
out := filterComplete(c.query)
if out(task) != c.out {
t.Errorf("[%d] want %v, got %v", name, c.out, out(task))