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.

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

Allow inactive groups in the graders table to be toggled for display #6778

Merged
merged 29 commits into from
Dec 15, 2023

Commits on Oct 20, 2023

  1. Configuration menu
    Copy the full SHA
    fa0d6bc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6359ef0 View commit details
    Browse the repository at this point in the history
  3. flash-message-for-inactive-grader

    Implementing the following functionality: When an instructor tries to add an inactive grader to a group, the system prevents him from doing so and throws a red flash-message saying the user is inactive and thus cannot be added.
    mimischly7 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    08e6e93 View commit details
    Browse the repository at this point in the history
  4. updating-Changelog

    mimischly7 committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    5f8f4ed View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. enriching-data-returned-by-graders-controller-index-action

    Our goal is to be able to determine in the ffront end which groups should be hidden because they are inactive. Our definition of an inactive group is that all of its members are inactive. Thus, (along with the graders associated to each group, which we already passing to the front end) we need to pass the (student) members associated with each group. This will allow the front end for this graders use case to act similarly to the front end of the groups use case (by filtering which groups should be visible or not based on the activity/inacticity of their users)
    mimischly7 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    a1db588 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Configuration menu
    Copy the full SHA
    1bb7085 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4d02bf7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    59c1898 View commit details
    Browse the repository at this point in the history
  4. Modified Changelog

    Bruce-8 committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    3a70425 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Configuration menu
    Copy the full SHA
    05630bb View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https:/MarkUsProject/Markus into…

    … display-inactive-graders
    
    Resolve merge conflicts
    Bruce-8 committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    82b578c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b6226ed View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. Configuration menu
    Copy the full SHA
    a1e9313 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. finalizing-backend-improvements

    converting left outer join to inner join, setting default behavior for some hashes (for when trying to access a non-existent key), and adding documentation
    mimischly7 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    f6e81b7 View commit details
    Browse the repository at this point in the history
  2. rspec-test-for-Assignment-method

    A simple rspec test for the Assignment.current_grader_data method that ensures the returned object has the structure required by frontend code to operate correctly.
    mimischly7 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    0ae0368 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Merge branch 'master' of https:/MarkUsProject/Markus into…

    … display-inactive-graders
    
    Resolve merge conflicts
    Bruce-8 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d7b4fbd View commit details
    Browse the repository at this point in the history
  2. Fixed errors and changelog

    Bruce-8 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f23392a View commit details
    Browse the repository at this point in the history
  3. Added front-end tests

    Bruce-8 committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    5720893 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Configuration menu
    Copy the full SHA
    289f81d View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Final test fixes (front-end)

    Bruce-8 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    09561aa View commit details
    Browse the repository at this point in the history
  2. rspec-test-for-assign-all-graders

    rspec test that checks the members contained in the object returned by Assignment.current_grader_data is correct.
    mimischly7 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    ab7f5dc View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Configuration menu
    Copy the full SHA
    196be58 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'display-inactive-graders' of https:/Bruce-8…

    …/Markus into display-inactive-graders
    
    Fixing merge conflicts
    Bruce-8 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    87681b2 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. final-touches

    mimischly7 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    7723b9b View commit details
    Browse the repository at this point in the history
  2. conflict-resolution

    mimischly7 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ca70459 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Modified Changelog

    Bruce-8 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    29719a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. removing-unnecessary-lines

    I was initially defining some default behavior for some hashes in the Assignment model, but this was redundant.
    mimischly7 committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    e2c9a24 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Configuration menu
    Copy the full SHA
    61e5dee View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d659e07 View commit details
    Browse the repository at this point in the history