fix tags and duedates

master
bel 2020-01-26 18:34:41 +00:00
parent 2f0c09ff72
commit 6733ccd4b8
4 changed files with 34 additions and 2 deletions

View File

@ -61,6 +61,18 @@ func ToStrArr(k string) []string {
} }
func ToTime(s string) time.Time { func ToTime(s string) time.Time {
v, _ := time.Parse("2006-01-02 15:04:05", s) v, err := time.Parse("2006-01-02 15:04:05", s)
if err != nil || v.IsZero() {
v, err = time.Parse("2006-01-02", s)
}
if err != nil || v.IsZero() {
v, err = time.Parse("1/2/06", s)
}
if err != nil || v.IsZero() {
v, err = time.Parse("02 Jan 2006 3:04 PM", s)
}
if err != nil || v.IsZero() {
v, err = time.Parse("02 Jan 2006 3:04 PM", strings.ReplaceAll(s, "+", " "))
}
return v return v
} }

View File

@ -79,6 +79,18 @@ func TestToTime(t *testing.T) {
in: "5", in: "5",
out: "0001-01-01 00:00:00", out: "0001-01-01 00:00:00",
}, },
{
in: "1/2/03",
out: "2003-01-02 00:00:00",
},
{
in: "11/12/03",
out: "2003-11-12 00:00:00",
},
{
in: "01+Jan+2020+12:00+PM",
out: "2020-01-01 12:00:00",
},
} }
for _, c := range cases { for _, c := range cases {

View File

@ -94,6 +94,7 @@ func (a *Ajax) storageListTasks(listID string, filters ...func(t *task.Task) boo
} }
} }
if filtered { if filtered {
//task.Title = fmt.Sprintf("[%d] %s", task.Index, task.Title)
tasks = append(tasks, task) tasks = append(tasks, task)
} }
} }

View File

@ -39,7 +39,7 @@ func New(r *http.Request) (*Task, error) {
UUID: form.NewUUID(), UUID: form.NewUUID(),
Title: form.Get(r, "title"), Title: form.Get(r, "title"),
Priority: form.ToInt(form.Get(r, "prio")), Priority: form.ToInt(form.Get(r, "prio")),
Tags: StrList(form.ToStrArr(form.Get(r, "tags"))), Tags: append(StrList(form.ToStrArr(form.Get(r, "tag"))), StrList(form.ToStrArr(form.Get(r, "tags")))...),
Created: time.Now(), Created: time.Now(),
Edited: time.Now(), Edited: time.Now(),
@ -110,6 +110,13 @@ func (t *Task) MarshalJSON() ([]byte, error) {
"dueInt": t.Due.Unix(), "dueInt": t.Due.Unix(),
"dueTitle": "Due ", "dueTitle": "Due ",
} }
if t.Due.IsZero() {
for k := range m {
if strings.HasPrefix(k, "due") {
delete(m, k)
}
}
}
if t.Complete { if t.Complete {
m["dateCompleted"] = t.Completed.Format(fullFormat) m["dateCompleted"] = t.Completed.Format(fullFormat)
m["dateCompletedInline"] = t.Completed.Format(shortFormat) m["dateCompletedInline"] = t.Completed.Format(shortFormat)