Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ordering for DifficultyTag and DiffultyTagLocalization #438

Merged
merged 2 commits into from
Dec 16, 2024
Merged

Add ordering for DifficultyTag and DiffultyTagLocalization #438

merged 2 commits into from
Dec 16, 2024

Conversation

reivvax
Copy link
Contributor

@reivvax reivvax commented Dec 7, 2024

Closes #344

@reivvax reivvax requested a review from MasloMaslane as a code owner December 7, 2024 20:45
twalen
twalen approved these changes Dec 16, 2024
View reviewed changes
Copy link
Contributor

@twalen twalen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@twalen twalen merged commit 95da4bc into sio2project:master Dec 16, 2024
1 check passed
twalen added a commit that referenced this pull request Dec 16, 2024
@twalen
Revert "Add ordering for DifficultyTag and DiffultyTagLocalization (#438
c9c6839 
)"

This reverts commit 95da4bc.
@twalen twalen mentioned this pull request Dec 16, 2024
Merged
twalen added a commit that referenced this pull request Dec 16, 2024
@twalen
Revert "Add ordering for DifficultyTag and DiffultyTagLocalization (#438
9d32a09 
)" (#446)

This reverts commit 95da4bc.
reivvax added a commit to reivvax/oioioi that referenced this pull request Dec 22, 2024
@reivvax
Squashed commit of the following:
27a3d99 
commit 9d32a09
Author: Tomasz Waleń <[email protected]>
Date:   Mon Dec 16 18:19:20 2024 +0100

    Revert "Add ordering for DifficultyTag and DiffultyTagLocalization (sio2project#438)" (sio2project#446)

    This reverts commit 95da4bc.

commit 95da4bc
Author: reivvax <[email protected]>
Date:   Mon Dec 16 17:31:44 2024 +0100

    Add ordering for DifficultyTag and DiffultyTagLocalization (sio2project#438)

    * Add ordering for DifficultyTag and DiffultyTagLocalization

    * Make migrations

commit ae10597
Author: Grzegorz Franciszek Krawczyk <[email protected]>
Date:   Mon Dec 16 17:29:45 2024 +0100

    Aggregated tag proposals (sio2project#431)

    * Add new AggregatedAlgorithmTagProposal class.

    * Make AggregatedAlgorithmTagProposal increase each time a new AlgorithmTagProposal is created. This is most likely a temporary implementation.

    * Change handling of modification of AggregatedAlgorithmTagProposal to happen when adding or deleting AlgorithmTagProposals.

    * Remove created argument from decrease_aggregated_algorithm_tag_proposal, correct increase function to only increase amount of AggregatedTag if a new AlgorithmTagProposal is created, not when modified.

    * Split test_tags.py into test_tags.py file, testing AlgorithmTag and DifficultyTag classes and test_tag_proposals.py file, testing AlgorithmTagProposal and DifficultyTagProposal classes.

    * Expand test_save_proposals_view in TestSaveProposals class to also check AggregatedAlgorithmTagProposal.

    * Add AggregatedDifficultyTagProposal.

    * Add checking AggregatedDifficultyTagProposal in test_save_poposals_view in TestTagProposals class. Fix mistaken 'assertEquals' to 'assertEqual'.

    * Migrate AggregatedTagProposal classes.

    * Fixed test_tag_proposals.py to work correctly.

    * Remove unnecessary import.

    * Add data migration from TagProposal models to AggregatedTagProposal models.

    * Remove unnecessary import.

    * Initial version of test_data_migrations.py. It should be restructured.

    * Change import of migration function from static to dynamic.

    * Change user primary keys to keys corresponding to valid users from test_users fixture.

    * Change usages of creates in for loops to bulk_creates.

    * Change exceptions raised to logged messages.

    * Make increase_aggregated and decrease_aggregated functions more compact.

    * Add atomicity to increase and decrease functions.

    * Avoided repeating code through making generic function that increases tag proposals for given aggregated model.

    * Add exception logging for decrease_aggregated_tag_proposal function.

    * Simplify tests testing Aggregated Tag Proposals with helper functions.

    * Fix comment explaining _get_tag_amounts helper function.

    * Remove needles whitespaces and end of lines.

commit 9392524
Author: reivvax <[email protected]>
Date:   Mon Dec 16 17:24:58 2024 +0100

    Optimize teacher dashboard (sio2project#439)

    * Start working on optimizing teacher dashboard

    * Optimize database queries in contest dashboard view

    * Add test for round context

    * Fix test for round context

    * Fix fixtures for simpleui tests

    * Adjust test style

commit e0d3fa2
Author: Michał Birecki <[email protected]>
Date:   Mon Dec 16 16:18:36 2024 +0100

    Disable USE_SINOLPACK_MAKEFILES for test_single_file_replacement test (sio2project#442)

commit a761f89
Author: Max Baak <[email protected]>
Date:   Fri Dec 13 10:16:17 2024 +0100

    FIX: correct small typos in readme file (sio2project#443)

    Co-authored-by: kx79wq <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twalen twalen twalen approved these changes

@MasloMaslane MasloMaslane Awaiting requested review from MasloMaslane MasloMaslane is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DifficultyTag's aren't sorted
2 participants
@reivvax @twalen