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

support combo new and old

master
bel 2021-07-17 22:51:54 -06:00
parent d5ec073f75
commit 9301ddd467
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/ajax/form/form.go
View File

@ -83,6 +83,7 @@ func ToDuration(s string) time.Duration {
for len(substr) > 0 && (substr[len(substr)-1] >= '0' && substr[len(substr)-1] <= '9') { for len(substr) > 0 && (substr[len(substr)-1] >= '0' && substr[len(substr)-1] <= '9') {
substr = substr[:len(substr)-1] substr = substr[:len(substr)-1]
} }
s = strings.ReplaceAll(s, substr, "")
substr = strings.TrimSuffix(substr, c.key) substr = strings.TrimSuffix(substr, c.key)
n, _ := strconv.Atoi(substr) n, _ := strconv.Atoi(substr)
d += c.d * time.Duration(n) d += c.d * time.Duration(n)

1
server/ajax/form/form_test.go
View File

@ -153,6 +153,7 @@ func TestToDuration(t *testing.T) {
"simple": {input: "1s", want: time.Second}, "simple": {input: "1s", want: time.Second},
"compound": {input: "1m1s", want: time.Minute + time.Second}, "compound": {input: "1m1s", want: time.Minute + time.Second},
"compound:unsorted": {input: "1s1m", want: time.Minute + time.Second}, "compound:unsorted": {input: "1s1m", want: time.Minute + time.Second},
"compound:extension": {input: "1d1m", want: time.Minute + time.Hour*24},
"extension:day": {input: "1d", want: 24 * time.Hour}, "extension:day": {input: "1d", want: 24 * time.Hour},
"extension:week": {input: "1w", want: 24 * 7 * time.Hour}, "extension:week": {input: "1w", want: 24 * 7 * time.Hour},
"extension:week,day": {input: "1w1d", want: 24 * 8 * time.Hour}, "extension:week,day": {input: "1w1d", want: 24 * 8 * time.Hour},