[server/list] Support for 1000 activities in table

jylitalo · Dec 22, 2024 · f53d5f6 · f53d5f6
1 parent fc23741
commit f53d5f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/server/list.go b/server/list.go
@@ -27,7 +27,7 @@ func newListFormData() ListFormData {
 		Types:        map[string]bool{},
 		WorkoutTypes: map[string]bool{},
 		Years:        map[int]bool{},
-		Limit:        100,
+		Limit:        1000,
 	}
 }
 
@@ -68,6 +68,7 @@ func listPost(ctx context.Context, page *Page, db Storage) func(c echo.Context)
 		limit, errL := strconv.Atoi(c.FormValue("limit"))
 		name := c.FormValue("name")
 		if err = errors.Join(errV, errT, errW, errY, errL); err != nil {
+			slog.Error("server.listPost()", "err", err)
 			_ = telemetry.Error(span, err)
 		}
 		slog.Info("POST /list", "values", values)

diff --git a/server/server.go b/server/server.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"html/template"
 	"io"
-	"log/slog"
 	"net/url"
 	"slices"
 	"strconv"
@@ -173,6 +172,7 @@ func yearValues(values url.Values) (map[int]bool, error) {
 			years[y] = (len(v) > 0 && v[0] == "on")
 		}
 	}
+	// slog.Info("server.yearValues", "years", years)
 	return years, nil
 }
 
@@ -221,7 +221,6 @@ func Start(ctx context.Context, db Storage, selectedTypes []string, port int) er
 		value = false
 	}
 	span.End()
-	slog.Info("starting things", "page", page)
 
 	e.GET("/", indexGet(ctx, page, db))
 	e.POST("/best", bestPost(ctx, page, db))
@@ -247,8 +246,9 @@ func indexGet(ctx context.Context, page *Page, db Storage) func(c echo.Context)
 		types := selectedTypes(pf.Types)
 		workoutTypes := selectedWorkoutTypes(pf.WorkoutTypes)
 		years := selectedYears(pf.Years)
+		plfYears := selectedYears(page.List.Form.Years)
 		pld := &page.List.Data
-		pld.Headers, pld.Rows, errL = stats.List(ctx, db, types, workoutTypes, years, page.List.Form.Limit, "")
+		pld.Headers, pld.Rows, errL = stats.List(ctx, db, types, workoutTypes, plfYears, page.List.Form.Limit, "")
 		// init Top tab
 		tf := &page.Top.Form
 		td := &page.Top.Data

diff --git a/server/views/list.html b/server/views/list.html
@@ -20,6 +20,7 @@
             <option{{ if eq .Limit 10 }} selected{{ end }}>10</option>
             <option{{ if eq .Limit 20 }} selected{{ end }}>20</option>
             <option{{ if eq .Limit 100 }} selected{{ end }}>100</option>
+            <option{{ if eq .Limit 1000 }} selected{{ end }}>1000</option>
         </select>
     </div>
 </form>