allow filtering users by year

database/sql/user.sql

@@ -38,10 +38,20 @@ where case
     when @search::text = '' then true
     else kthid = @search or first_name ~* @search or family_name ~* @search
 end
+and case
+    when @year::text = '' then true
+    else @year = year_tag
+end
 order by kthid
 limit $1
 offset $2;
 
+-- name: GetAllYears :many
+select distinct year_tag
+from users
+where year_tag != ''
+order by year_tag;
+
 -- name: UserSetMemberTo :exec
 update users
 set member_to = $2

handlers/admin.go

@@ -88,13 +88,15 @@ func adminUsersForm(s *service.Service, w http.ResponseWriter, r *http.Request)
 	search := r.FormValue("search")
 	offsetStr := r.FormValue("offset")
 	offset, err := strconv.ParseInt(offsetStr, 10, 32)
+	year := r.FormValue("year")
 	if err != nil && offsetStr != "" {
 		return httputil.BadRequest("Invalid int for offset")
 	}
 	users, err := s.DB.ListUsers(r.Context(), database.ListUsersParams{
 		Search: search,
 		Limit:  21,
 		Offset: int32(offset),
+		Year:   year,
 	})
 	if err != nil {
 		return err
@@ -104,7 +106,11 @@ func adminUsersForm(s *service.Service, w http.ResponseWriter, r *http.Request)
 		users = users[0:20:20]
 		more = true
 	}
-	return templates.MemberList(service.DBUsersToModel(users), search, int(offset), more)
+	years, err := s.DB.GetAllYears(r.Context())
+	if err != nil {
+		return err
+	}
+	return templates.MemberList(service.DBUsersToModel(users), search, int(offset), more, years, year)
 }
 
 func invites(s *service.Service, w http.ResponseWriter, r *http.Request) httputil.ToResponse {

templates/admin.templ

@@ -22,15 +22,15 @@ templ Members() {
 	@AdminPage() {
 		<div class="p-8">
 			<section hx-get="/admin/users" hx-trigger="load">
-				@MemberList([]models.User{}, "", 0, false)
+				@MemberList([]models.User{}, "", 0, false, []string{}, "")
 			</section>
 			@uploadForm()
 			@UploadStatus(false)
 		</div>
 	}
 }
 
-templ MemberList(users []models.User, search string, offset int, more bool) {
+templ MemberList(users []models.User, search string, offset int, more bool, years []string, selectedYear string) {
 	<div class="grid grid-cols-[repeat(4,auto)] gap-x-2 [&>*]:h-7">
 		<div class="grid grid-cols-subgrid col-span-full">
 			<span>Username</span>
@@ -62,11 +62,26 @@ templ MemberList(users []models.User, search string, offset int, more bool) {
 				autofocus
 			}
 		/>
+		<select
+			hx-get="/admin/users"
+			name="year"
+			hx-include='input[name="search"]'
+			class={ selectStyle }
+		>
+			<option value="">Year</option>
+			for _, year := range years {
+				<option
+					if year == selectedYear {
+						selected
+					}
+				>{ year }</option>
+			}
+		</select>
 		<button
 			hx-get="/admin/users"
 			class={ button }
 			hx-vals={ templ.JSONString(map[string]any{"offset": max(0, offset-20)}) }
-			hx-include='input[name="search"]'
+			hx-include='input[name="search"], select[name="year"]'
 			if offset == 0 {
 				disabled
 			}
@@ -75,7 +90,7 @@ templ MemberList(users []models.User, search string, offset int, more bool) {
 			hx-get="/admin/users"
 			class={ button }
 			hx-vals={ templ.JSONString(map[string]any{"offset": offset + 20}) }
-			hx-include='input[name="search"]'
+			hx-include='input[name="search"], select[name="year"]'
 			if !more {
 				disabled
 			}