Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make csv export more flexible (#9309)

Browse source
This commit is contained in:
andig 2023-08-13 15:09:19 +02:00 • committed by GitHub
parent 8b4bc840e7
commit 78fffd6eb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/db/session.go
View file

@ -57,7 +57,6 @@ func (t *Sessions) writeHeader(ctx context.Context, ww *csv.Writer) error {
caption, err := localizer.Localize(&locale.Config{
MessageID: "sessions.csv." + strings.ToLower(f.Name()),
})
if err != nil {
if csv != "" {
caption = csv
@ -79,28 +78,24 @@ func (t *Sessions) writeRow(ww *csv.Writer, mp *message.Printer, r Session) erro
continue
}
var val string
digits := 3
if format := f.Tag("format"); format == "int" {
digits = 0
}
switch v := f.Value().(type) {
case float64:
val = mp.Sprint(number.Decimal(v, number.NoSeparator(), number.MaxFractionDigits(digits)))
case time.Time:
if !v.IsZero() {
val = v.Local().Format("2006-01-02 15:04:05")
}
default:
if rv := reflect.ValueOf(v); rv.Kind() == reflect.Ptr {
if pv := reflect.Indirect(rv); pv.CanFloat() && !rv.IsNil() {
val = mp.Sprint(number.Decimal(pv.Float(), number.NoSeparator(), number.MaxFractionDigits(digits)))
}
break
}
var val string
val = fmt.Sprintf("%v", f.Value())
if rv := reflect.ValueOf(f.Value()); !(rv.Kind() == reflect.Pointer && rv.IsNil()) {
switch v := f.Value().(type) {
case float64, *float64:
val = mp.Sprint(number.Decimal(v, number.NoSeparator(), number.MaxFractionDigits(digits)))
case time.Time:
if !v.IsZero() {
val = v.Local().Format("2006-01-02 15:04:05")
}
default:
val = fmt.Sprintf("%v", f.Value())
}
}
row = append(row, val)

41
server/http_session_handler.go
View file

@ -7,7 +7,7 @@ import (
"fmt"
"math"
"net/http"
"strconv"
"strings"
"github.com/evcc-io/evcc/api"
"github.com/evcc-io/evcc/core/db"
@ -35,34 +35,31 @@ func sessionHandler(w http.ResponseWriter, r *http.Request) {
return
}
var res db.Sessions
year := r.URL.Query().Get("year")
month := r.URL.Query().Get("month")
var (
res db.Sessions
cond []string
args []any
)
push := func(field, val string) {
cond = append(cond, field)
args = append(args, val)
}
filename := "session"
if year := r.URL.Query().Get("year"); year != "" {
filename += "-" + year
push("STRFTIME('%Y', created) LIKE ?", year)
fmtYear := "%"
fmtMonth := "%"
if year != "" {
fmtYear = year
filename += "-" + fmtYear
if month != "" {
iMonth, err := strconv.Atoi(month)
if err != nil {
jsonError(w, http.StatusBadRequest, err)
return
}
fmtMonth = fmt.Sprintf("%02d", iMonth)
filename += "." + fmtMonth
if month := fmt.Sprintf("%02s", r.URL.Query().Get("month")); month != "00" {
filename += "-" + month
push("STRFTIME('%m', created) LIKE ?", month)
}
}
// TODO support other databases than Sqlite
whereQuery := "charged_kwh>=0.05 AND strftime('%Y', created) LIKE ? AND strftime('%m', created) LIKE ?"
if txn := dbserver.Instance.Where(whereQuery, fmtYear, fmtMonth).Order("created DESC").Find(&res); txn.Error != nil {
query := strings.Join(append([]string{"charged_kwh>=0.05"}, cond...), " AND ")
if txn := dbserver.Instance.Where(query, args...).Order("created DESC").Find(&res); txn.Error != nil {
jsonError(w, http.StatusInternalServerError, txn.Error)
return
}