Author filtering

mraron · Jun 23, 2024 · 5c504a7 · 5c504a7
1 parent 987e14d
commit 5c504a7
Show file tree

Hide file tree

Showing 11 changed files with 318 additions and 207 deletions.
diff --git a/internal/njudge/memory/problemlist.go b/internal/njudge/memory/problemlist.go
@@ -132,6 +132,13 @@ func (p *ProblemListQuery) filterInvisible(ctx context.Context, req njudge.Probl
 	return true, nil
 }
 
+func (p *ProblemListQuery) filterAuthor(ctx context.Context, req njudge.ProblemListRequest, pr njudge.Problem) (bool, error) {
+	if req.AuthorFilter != nil {
+		return strings.Contains(pr.Author, *req.AuthorFilter), nil
+	}
+	return true, nil
+}
+
 func (p *ProblemListQuery) GetProblemList(ctx context.Context, req njudge.ProblemListRequest) (*njudge.ProblemList, error) {
 	allProblems, err := p.ps.GetAll(ctx)
 	if err != nil {
@@ -144,6 +151,7 @@ func (p *ProblemListQuery) GetProblemList(ctx context.Context, req njudge.Proble
 		p.filterTitle,
 		p.filterCategory,
 		p.filterInvisible,
+		p.filterAuthor,
 	}
 
 	problems := make([]njudge.Problem, 0)

diff --git a/internal/njudge/problemlist.go b/internal/njudge/problemlist.go
@@ -26,12 +26,13 @@ type ProblemListRequest struct {
 	PerPage        int
 	TitleFilter    string
 	TagFilter      []string
+	AuthorFilter   *string
 	CategoryFilter CategoryFilter
 	User           *User
 }
 
 func (r ProblemListRequest) IsFiltered() bool {
-	return r.TitleFilter != "" || len(r.TagFilter) > 0 || r.CategoryFilter.Type != CategoryFilterNone
+	return r.TitleFilter != "" || len(r.TagFilter) > 0 || r.CategoryFilter.Type != CategoryFilterNone || r.AuthorFilter != nil
 }
 
 type ProblemList struct {

diff --git a/internal/web/handlers/problemset/problemset.go b/internal/web/handlers/problemset/problemset.go
@@ -26,6 +26,8 @@ type ProblemListRequest struct {
 	TitleFilter    string `query:"title"`
 	CategoryFilter int    `query:"category"`
 	TagFilter      string `query:"tags"`
+	FilterAuthor   string `query:"filterAuthor"`
+	Author         string `query:"author"`
 
 	Problemset string `param:"name"`
 }
@@ -105,6 +107,10 @@ func GetProblemList(store problems.Store, ps njudge.Problems, cs njudge.Categori
 			User:        c.Get("user").(*njudge.User),
 		}
 
+		if data.FilterAuthor == "on" {
+			listRequest.AuthorFilter = &data.Author
+		}
+
 		if data.TagFilter != "" {
 			listRequest.TagFilter = strings.Split(data.TagFilter, ",")
 		}
@@ -228,6 +234,8 @@ func GetProblemList(store problems.Store, ps njudge.Problems, cs njudge.Categori
 		result.CategoryFilterOptions = []templates.CategoryFilterOption{
 			{Name: "-"},
 		}
+		result.FilterAuthor = data.FilterAuthor == "on"
+		result.AuthorFilter = data.Author
 
 		result.CategoryFilterOptions = append(result.CategoryFilterOptions,
 			makeCategoryFilterOptions(tr, categories, data.CategoryFilter, categoryNameByID, par)...)

diff --git a/internal/web/templates/problemset.templ b/internal/web/templates/problemset.templ
@@ -35,6 +35,8 @@ type ProblemListViewModel struct {
 	TitleFilter           string
 	TagsFilter            string
 	CategoryFilterOptions []CategoryFilterOption
+	FilterAuthor bool
+	AuthorFilter string
 }
 
 templ tagList(tags []njudge.Tag) {
@@ -87,6 +89,18 @@ templ problemListFilter(vm ProblemListViewModel) {
                         </select>
                         <input name="tags" value={vm.TagsFilter} class="form-control" id="tagsFilterHidden" type="hidden">
                     </div>
+                    <div class="form-row">
+                        <div class="form-group col-md-2">
+                            <div class="form-check">
+                                <input type="checkbox" name="filterAuthor" id="filterAuthor" class="form-check-input" checked?={vm.FilterAuthor}>
+                                <label for="filterAuthor">{Tr(ctx, "Filter author?")}</label>
+                            </div>
+                        </div>
+                        <div class="form-group col-md-10">
+                            <label for="author">{Tr(ctx, "Author")}</label>
+                            <input type="text" id="author" name="author" class="form-control" value={vm.AuthorFilter} onkeydown="$('#filterAuthor').prop('checked', true);">
+                        </div>
+                    </div>
                     <button type="submit" class="btn btn-primary">{Tr(ctx, "Filter")}</button>
                     if vm.Filtered {
                         <a class="btn btn-danger" href=".">{Tr(ctx,  "Clear")}</a>

diff --git a/internal/web/templates/problemset_templ.go b/internal/web/templates/problemset_templ.go
diff --git a/internal/web/translations/catalog.go b/internal/web/translations/catalog.go