Add school year field to contest model and filter for contest selection #491
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twalen
reviewed
Mar 26, 2025
twalen
reviewed
Mar 26, 2025
MasloMaslane
reviewed
Apr 3, 2025
MasloMaslane
requested changes
Apr 3, 2025
|
Also, since we are adding searching for contest, would it be possible to paginate contests in /contests/ |
twalen
reviewed
Apr 16, 2025
twalen
reviewed
Apr 23, 2025
twalen
reviewed
Apr 23, 2025
MasloMaslane
approved these changes
Apr 29, 2025
MasloMaslane
approved these changes
Apr 29, 2025
MasloMaslane
approved these changes
Apr 29, 2025
twalen
approved these changes
Apr 30, 2025
wraczuk
pushed a commit
to wraczuk/oioioi
that referenced
this pull request
May 21, 2025
…on (sio2project#491) * Add school year field to contest model and filter function * Fix filter function * Filtering in ORM * Add tests * Fix select_contest template * Contest pagination
stopnoanime
added a commit
to stopnoanime/oioioi
that referenced
this pull request
Jun 5, 2025
* Ordering of DifficultyTags (sio2project#449) * Add ordering for DifficultyTag and DiffultyTagLocalization * Make migrations * Update migrations * Add a note about copying limits (sio2project#480) * Add a note about copying limits * Add text translation * Github Actions - Downloaded translations. (sio2project#495) Co-authored-by: SIO2 Automatic Agent <[email protected]> * add buttons to expand group member lists (sio2project#493) * Searchbox bugfix (sio2project#489) * Now if tags don't show up in probset, only superusers can filter by them. * Fix bug allowing for duplicate difficulty search tags. * Fix bug in filtering by difficulty tags. * PARTIAL fix to tests in TestProblemSearchHintsTags. * Hide tags under searchbox and tag search hints when PROBLEM_TAGS_VISIBLE = False (even for admin). * Fix more tag hint tests. * Fix all but one test from TestProblemSearch. * Remove temporary comment. * Override setting globally for TestProblemSearchHintsTags. * Override settings globally for TestProblemSearchOrigin. * Add setting override to test_statistics_sorting_with_query. * Fix column number in test_statistics_sorting_with_query. * Fix the column number being ordered by in test_problem_statistics.py. * Better problem column array naming in TestProblemStatisticsDisplay. * Rename problem 'Znacznik' in test_problem_search.json to 'Znacznik_zadanie', as 'Tags' are localised in Polish to 'Znaczniki' which caused false positives when checking if the task appeared in URL. * Rename 'Znacznik_zadanie' to 'Znaczn1k', as its previous name still caused name collisions. * Refactor DateTimePicker widget to use Tempus Dominus * datetimepicker use language setting * fix minor bugs in usergroups app and add tests (sio2project#498) * first commit * fix permissions * fix admin panel not saving * small fixes * fix origin info * change permission name * fix permissions for contest admins * fix permissions for contest admins * fix for problems without contests * add test * resolve conflicts * small fix * test tags tab * squash migrations * remove redundant migrations * display nickname next to the full name when displaying contest pupils * add logic and use member.username * fix more similar cases * fix order of names * more elegant code * more elegant code * revert changes * more elegant code * add buttons to expand group member lists * fix minor bugs * add tests * Change DateTimePicker format to match js time picker * Add copying problems in bulk * Pass problem ids as request arguments * Add test for reattaching multiple problems * Add command for creating mock competitions (sio2project#502) * Add create_mock_contest command (sio2project#496) * Use tempus dominus in timeline.js * Add school year field to contest model and filter for contest selection (sio2project#491) * Add school year field to contest model and filter function * Fix filter function * Filtering in ORM * Add tests * Fix select_contest template * Contest pagination * add test option to check if variables in template tags are defined (sio2project#506) * first commit * fix permissions * fix admin panel not saving * small fixes * fix origin info * change permission name * fix permissions for contest admins * fix permissions for contest admins * fix for problems without contests * add test * resolve conflicts * small fix * test tags tab * squash migrations * remove redundant migrations * display nickname next to the full name when displaying contest pupils * add logic and use member.username * fix more similar cases * fix order of names * more elegant code * more elegant code * revert changes * more elegant code * add buttons to expand group member lists * fix minor bugs * add tests * add test option to check if variables in template tags are defined * code style * better approach * better approach * cleaner code * Change how we call datetimepicker setValue * Share code between datetimepicker.js and timeline.js * Readd custom_undo * Update "datetimepicker" branch with "webpack-libs" branch (#6) * Install concurrently with npm * Fix balloons loading old jquery bundle --------- Co-authored-by: reivvax <[email protected]> Co-authored-by: Kamil Szymczak <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SIO2 Automatic Agent <[email protected]> Co-authored-by: Atanazy Gawrysiak <[email protected]> Co-authored-by: Grzegorz Franciszek Krawczyk <[email protected]> Co-authored-by: Kamil Szymczak <[email protected]> Co-authored-by: kyepskee <[email protected]> Co-authored-by: Franciszek Czauderna <[email protected]>
stopnoanime
added a commit
to stopnoanime/oioioi
that referenced
this pull request
Jun 5, 2025
* Ordering of DifficultyTags (sio2project#449) * Add ordering for DifficultyTag and DiffultyTagLocalization * Make migrations * Update migrations * Add a note about copying limits (sio2project#480) * Add a note about copying limits * Add text translation * Github Actions - Downloaded translations. (sio2project#495) Co-authored-by: SIO2 Automatic Agent <[email protected]> * add buttons to expand group member lists (sio2project#493) * Searchbox bugfix (sio2project#489) * Now if tags don't show up in probset, only superusers can filter by them. * Fix bug allowing for duplicate difficulty search tags. * Fix bug in filtering by difficulty tags. * PARTIAL fix to tests in TestProblemSearchHintsTags. * Hide tags under searchbox and tag search hints when PROBLEM_TAGS_VISIBLE = False (even for admin). * Fix more tag hint tests. * Fix all but one test from TestProblemSearch. * Remove temporary comment. * Override setting globally for TestProblemSearchHintsTags. * Override settings globally for TestProblemSearchOrigin. * Add setting override to test_statistics_sorting_with_query. * Fix column number in test_statistics_sorting_with_query. * Fix the column number being ordered by in test_problem_statistics.py. * Better problem column array naming in TestProblemStatisticsDisplay. * Rename problem 'Znacznik' in test_problem_search.json to 'Znacznik_zadanie', as 'Tags' are localised in Polish to 'Znaczniki' which caused false positives when checking if the task appeared in URL. * Rename 'Znacznik_zadanie' to 'Znaczn1k', as its previous name still caused name collisions. * fix minor bugs in usergroups app and add tests (sio2project#498) * first commit * fix permissions * fix admin panel not saving * small fixes * fix origin info * change permission name * fix permissions for contest admins * fix permissions for contest admins * fix for problems without contests * add test * resolve conflicts * small fix * test tags tab * squash migrations * remove redundant migrations * display nickname next to the full name when displaying contest pupils * add logic and use member.username * fix more similar cases * fix order of names * more elegant code * more elegant code * revert changes * more elegant code * add buttons to expand group member lists * fix minor bugs * add tests * Add copying problems in bulk * Refactor Problem.name property to allow for prefetch_related (sio2project#441) Problem.name previously queried through the whole ProblemName table. Now it accesses the names for the problem through self.names, which allows other code to optimize this query by using prefetch_related on the names property. * Add prefetch_related on names to task_archive_tag_view (sio2project#441) * Add tests to check correctness of new Problem.name property (sio2project#441) * Fix access to relationship before Problem is saved (sio2project#441) Previous implementation of Problem.name errored out if Problem.name was accessed before the instance of Problem was saved with .save(). This is now fixed. * Pass problem ids as request arguments * Add test for reattaching multiple problems * Add command for creating mock competitions (sio2project#502) * Add create_mock_contest command (sio2project#496) * Directly check if primary key exists instead of try/catch (sio2project#441) * Add school year field to contest model and filter for contest selection (sio2project#491) * Add school year field to contest model and filter function * Fix filter function * Filtering in ORM * Add tests * Fix select_contest template * Contest pagination * add test option to check if variables in template tags are defined (sio2project#506) * first commit * fix permissions * fix admin panel not saving * small fixes * fix origin info * change permission name * fix permissions for contest admins * fix permissions for contest admins * fix for problems without contests * add test * resolve conflicts * small fix * test tags tab * squash migrations * remove redundant migrations * display nickname next to the full name when displaying contest pupils * add logic and use member.username * fix more similar cases * fix order of names * more elegant code * more elegant code * revert changes * more elegant code * add buttons to expand group member lists * fix minor bugs * add tests * add test option to check if variables in template tags are defined * code style * better approach * better approach * cleaner code * Filter by tag proposals (sio2project#503) * Add the option for filtering by algorithm tags to take into account most popular tag proposals when choosing which tasks to show in the results. * Add the value `include_proposals` to be included in `?q=` for the problemset page controlling whether filtering by algorithm tags takes the most popular tag proposals into account. * Add `TestTagProposalsSearch` test class for this feature. * Create contest monitoring page (sio2project#359) * Fix adding new tags from problem admin (sio2project#304) * Create monitoring site for contests * Add monitoring template * Implement round times monitoring * Add contest permissions info to monitoring page * Added General info tab. -Added q_size and q_size_global to General info. * Add relative start/end times to monitoring * Cleanup * Change monitoring template * Added count of unanswered questions and date of oldest unanswered question to general info * Add attachments info to monitoring page * Quickfix * Add submissions info to monitoring page * Number of submission of every kind * Added count of submissions with system errors * Add info about test limits to contest monitoring * Extend problems info in monitoring page * Refactor contest monitoring view * Added round extensions * Added bool, that shows if someone solved a problem * Bugfix: Changed round to round-name * Bugfix: Added contest filter to SE detection * Create tests_monitoring file * Add tests round times * Bugfix: changed pub-date to date * Added tests for general info * WIP * Changed fixture and fixed system error counter * WIP * Add attachments tests * Changed fixture * Moved monitoring tests from tests_monitoring.py to tests.py * Added fixture to monitoring tests * Changed colspan * Use humanize module --------- Co-authored-by: Zonkil <[email protected]> Co-authored-by: Iteron-dev <[email protected]> * livedata: fix cache_unless_admin_or_observer (sio2project#387) * livedata: fix cache_unless_admin_or_observer result.content is of type "bytes", so wrapping it in str() will create a string that's wrapped in b''. * Add test for cache_unless_admin_or_observer * Mass create tool (sio2project#513) * Add tool for mass mock data creation. * Change __str__ for TagThrough models to include the problem they connect with tag. * Remove all u before strings in models.py, as they were redundant. * Add TestMassCreateTool tests testing mass_create_tool.py functionality. * Django 5 migration (sio2project#483) * Fix: Use `line.fields|length` in fieldset.html and change GET to POST in test_invalidated_user_logout * Fix: Change `pytest.mark.optionalhook` to `pytest.hookimpl(optionalhook=True)` * Fix: Django deprecations (DEFAULT_FILE_STORAGE, index_together) * Bump django-compressor from `>=4.3,<4.4` to `>=4.5,<4.6` * Bump django-mptt from `>=0.14,<0.15` to `>=0.16,<0.17` and update postgres to 14.17 * Fix: `Model instances passed to related filters must be saved` error in models.py * Fix: Remove `filter_horizontal` in BaseTagAdmin and bump django to 5.1.7 * Fix: Django deprecation (log_deletion, log_actions) * Fix: test_can_change_login_from_invalid and test_login_cannot_change_from_valid * Fix: Add `unlocalize` to progress percentage in task-archive-problemgroup.html * Refactor: Remove redundant `USE_L10N` in default_settings.py (due django deprecation) * Fix: Move `DATETIME_FORMAT` to custom format files * Fix: `TypeError: cannot pickle 'generator' object` error * Fix: Replace LogoutView with logout() in `not_anonymous` function * Fix: TestsSelectionForm * Fix: Add `request` lookup_allowed() (django deprecation) * Fix: Add missing migrations (due to index_together deprecation) * Fix: Migrations due `index_together` deprecation * Bump django from `5.1.7` to `o>=5.2,<5.3` * Refactor: Use admin decorators and replace `re_path` with `path` (assisted by `django-upgrade` tool) * Refactor: Remove redundant comment from setup.py * Docs: Adapt to Django 5.2 * Bump the minimum version of `pytest-django` to `4.11`, and update `django-nested-admin` to `>=4.1,<4.2` * Feat: Update migrations for index_together deprecation and add a fast migration note in UPGRADING.rst. * Fix: typo in UPGRADING.rst * Feat: Convert 're_path' to 'path' in contests/urls.py * Refactor: Use `path` instead of `re_path` in `/oioioi/statistics/urls.py` * Github Actions - Downloaded translations. (sio2project#516) Co-authored-by: SIO2 Automatic Agent <[email protected]> * Uncommited changes * add "Projekt MAP" banner * Revert "dodanie brakującego pliku" This reverts commit f64b36a. * Revert "add "Projekt MAP" banner" This reverts commit 08d1a92. * Revert "Revert "add "Projekt MAP" banner"" This reverts commit 470cec97b9cb7556a463d6518a04cc82963f0cda. * Revert "Revert "dodanie brakującego pliku"" This reverts commit bba1a2357344e98ae15d900eccb99bfd8d4aec9e. * Fix Szkopul kursy * Add missing migrations * change szkopul contact info * Add MP2024 contest controller. * Actually fix notifications * socket.io version bump (1.3.7 -> 4.7.2 !!!) * removes "request" dependency as it's long deprecated - now using the fetch API * some work towards typing and partially rewriting the javascript code * Add MAP course * Szkopul views fixes * Add map registered * Add autoscroll to task * MAP course changes * Add migrations * stop maili o 4 tej nad ranem * Changes for MP2025 * migration rename for problems * fix issue with oi migration * add missing migrations * optimised recent contests query thingy * hotfixes from deployment on 2025-05-27 * fixing broken tests * Update python to 3.11 (sio2project#519) * Multiple additional admin operations for Problem model (sio2project#511) * Add assigning to a round * Improve appearance and handle edge cases * Add tests for assigning problems to rounds * Add safer handling of problem_ids * Add better test coverage * Fix test_bad_problem_ids * Add tests for managing problems from another contest * Handle reattaching problems safer * Fix small issue with tests * Include twalen's suggestions * Changes from deployment (sio2project#524) --------- Co-authored-by: reivvax <[email protected]> Co-authored-by: Kamil Szymczak <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SIO2 Automatic Agent <[email protected]> Co-authored-by: Atanazy Gawrysiak <[email protected]> Co-authored-by: Grzegorz Franciszek Krawczyk <[email protected]> Co-authored-by: Kamil Szymczak <[email protected]> Co-authored-by: kyepskee <[email protected]> Co-authored-by: Franciszek Czauderna <[email protected]> Co-authored-by: Mateusz Jacniacki <[email protected]> Co-authored-by: Zonkil <[email protected]> Co-authored-by: Iteron-dev <[email protected]> Co-authored-by: Maciej Dziurzyński <[email protected]> Co-authored-by: Iteron-dev <[email protected]> Co-authored-by: sio2 <[email protected]> Co-authored-by: Tomasz Waleń <[email protected]> Co-authored-by: MasloMaslane <[email protected]> Co-authored-by: tkwiatkowski <[email protected]> Co-authored-by: Meten <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #452. The filter field in the select contest page allows to search for contest by id, name or school year.