mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

feat: custom time intervals (resolve #115)

Browse Source
This commit is contained in:
Ferdinand Mütsch
2021-02-13 12:59:59 +01:00
parent daf67b844a
commit 30510591eb
14 changed files with 118 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/common.go
View File

@ -8,10 +8,18 @@ import (
)
func ParseDate(date string) (time.Time, error) {
return time.Parse(config.SimpleDateFormat, date)
}
func ParseDateTime(date string) (time.Time, error) {
return time.Parse(config.SimpleDateTimeFormat, date)
}
func FormatDate(date time.Time) string {
return date.Format(config.SimpleDateFormat)
}
func FormatDateTime(date time.Time) string {
return date.Format(config.SimpleDateTimeFormat)
}

14
utils/summary.go
View File

@ -82,14 +82,20 @@ func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
} else if start := params.Get("start"); start != "" {
err, from, to = ResolveIntervalRaw(start)
} else {
from, err = ParseDate(params.Get("from"))
from, err = ParseDateTime(params.Get("from"))
if err != nil {
return nil, errors.New("missing 'from' parameter")
from, err = ParseDate(params.Get("from"))
if err != nil {
return nil, errors.New("missing 'from' parameter")
}
}
to, err = ParseDate(params.Get("to"))
to, err = ParseDateTime(params.Get("to"))
if err != nil {
return nil, errors.New("missing 'to' parameter")
to, err = ParseDate(params.Get("to"))
if err != nil {
return nil, errors.New("missing 'to' parameter")
}
}
}