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

support only looping

master
Bel LaPointe 2021-08-17 11:47:10 -06:00
parent 568aa6a229
commit 2bca997483
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/mytinytodo_ajax_storage.js
View File

@ -46,7 +46,7 @@
}) })
*/ */
$.getJSON(this.mtt.mttUrl + 'ajax.php?loadTasks&list=' + params.list + '&compl=' + params.compl + '&sort=' + params.sort + q, callback); $.getJSON(this.mtt.mttUrl + 'ajax.php?loadTasks&list=' + params.list + '&compl=' + params.compl + '&looping=' + params.looping + '&sort=' + params.sort + q, callback);
}, },

11
server/ajax/storage.go
View File

@ -62,11 +62,11 @@ func (a *Ajax) storageListTasks(listID string, filters ...func(t *task.Task) boo
if err != nil { if err != nil {
return nil, err return nil, err
} }
includeComplete := true includeComplete := false
for _, f := range filters { for _, f := range filters {
t := &task.Task{Complete: true} t := &task.Task{Complete: true}
if !f(t) { if f(t) {
includeComplete = false includeComplete = true
} }
} }
if includeComplete { if includeComplete {
@ -77,11 +77,16 @@ func (a *Ajax) storageListTasks(listID string, filters ...func(t *task.Task) boo
results = append(results, completeResults...) results = append(results, completeResults...)
} }
tasks := []*task.Task{} tasks := []*task.Task{}
uuids := map[string]struct{}{}
for _, result := range results { for _, result := range results {
taskID := path.Base(result) taskID := path.Base(result)
if taskID == "" { if taskID == "" {
continue continue
} }
if _, ok := uuids[taskID]; ok {
continue
}
uuids[taskID] = struct{}{}
task, err := a.storageGetTask(taskID) task, err := a.storageGetTask(taskID)
if err != nil { if err != nil {
return nil, err return nil, err

12
server/ajax/task.go
View File

@ -20,16 +20,24 @@ type taskWithDelta struct {
func (a *Ajax) loadTasks(w http.ResponseWriter, r *http.Request) error { func (a *Ajax) loadTasks(w http.ResponseWriter, r *http.Request) error {
listID, _, _ := a.Cur(r) listID, _, _ := a.Cur(r)
filterComplete := filterComplete(form.Get(r, "compl")) filterComplete := filterComplete(form.Get(r, "compl"))
filterLooping := filterLooping(form.Get(r, "looping"))
filterTags := filterTags(form.ToStrArr(form.Get(r, "t"))) filterTags := filterTags(form.ToStrArr(form.Get(r, "t")))
filterSubstr := filterSubstr(form.Get(r, "s")) filterSubstr := filterSubstr(form.Get(r, "s"))
// TODO filter loop tasks, err := a.storageListTasks(listID, filterComplete, filterTags, filterSubstr, filterLooping)
tasks, err := a.storageListTasks(listID, filterComplete, filterTags, filterSubstr)
if err != nil { if err != nil {
return err return err
} }
return json.NewEncoder(w).Encode(map[string]interface{}{"list": tasks}) return json.NewEncoder(w).Encode(map[string]interface{}{"list": tasks})
} }
func filterLooping(looping string) func(t *task.Task) bool {
return func(t *task.Task) bool {
hasLoop := t.Loop > 0 || t.Cron != ""
onlyLooping := looping == "1"
return !onlyLooping || hasLoop
}
}
func filterComplete(compl string) func(t *task.Task) bool { func filterComplete(compl string) func(t *task.Task) bool {
return func(t *task.Task) bool { return func(t *task.Task) bool {
return compl == "" || !t.Complete || (compl == "1" && t.Complete) return compl == "" || !t.Complete || (compl == "1" && t.Complete)