Merge pull request #99 from mraron/fix-problemset-category-links

Fix category links in problemset
mraron · May 29, 2024 · 925cdd1 · 925cdd1
2 parents 3606739 + b5f765b
commit 925cdd1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/internal/web/handlers/problemset/problemset.go b/internal/web/handlers/problemset/problemset.go
@@ -168,7 +168,7 @@ func GetProblemList(store problems.Store, ps njudge.Problems, cs njudge.Categori
 
 				curr.CategoryLink = templates.Link{
 					Text: categoryNameByID[cid],
-					Href: templ.SafeURL(fmt.Sprintf("/task_archive#category%d", p.Category.ID)),
+					Href: templ.SafeURL(fmt.Sprintf("/task_archive?root=%d#category%d", cid, p.Category.ID)),
 				}
 			}
 

diff --git a/internal/web/templates/task_archive.templ b/internal/web/templates/task_archive.templ
@@ -65,5 +65,25 @@ templ TaskArchive(vm TaskArchiveViewModel) {
                 </li>
             }
         </ul>
+        if vm.Root.Type == njudge.TaskArchiveNodeCategory {
+            <script>
+                if(window.location.hash)
+                {
+                    let elem = $(window.location.hash);
+                    elem.siblings('a').addClass('bg-info text-light');
+                    while(1) {
+                        let par = elem.parent().closest('ul.problemCategoryList');
+                        if(par.length == 0) break ;
+                        /*par.find('li > ul.problemCategoryList').each(function() {
+                            $(this).removeClass('show');
+                        });*/
+                        elem.addClass('show');
+                        elem = par;
+                    }
+                    elem.addClass('show');
+                    elem.scrollIntoView();
+                }
+            </script>
+        }
     }
 }
diff --git a/internal/web/templates/task_archive_templ.go b/internal/web/templates/task_archive_templ.go