Skip to content
Snippets Groups Projects

Resolve "[Queue-2.0] Lab page sortability"

All threads resolved!

What does this mr do?

Sorts the labs on the labs page on whether they are open, have passed, or the starting time. Adds filters for the type of lab and the module of the lab on the page as well.

Screenshots

before

image

after

image

Does this MR meet the acceptance criteria?

  • I have added a changelog entry to reflect the significant changes I made.
  • Tests were created to test the feature.
  • I have updated the documentation accordingly.
  • I adhere to the style guide.

Closes #370 (closed)

Edited by Wouter Polet

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Wouter Polet added 41 commits

    added 41 commits

    Compare with previous version

  • Wouter Polet added 1 commit

    added 1 commit

    • f88bda3a - Add some margins to the lab filters

    Compare with previous version

  • Wouter Polet marked this merge request as ready

    marked this merge request as ready

  • Wouter Polet changed the description

    changed the description

  • Wouter Polet requested review from @Lemaire

    requested review from @Lemaire

  • Wouter Polet marked the checklist item I have added a changelog entry to reflect the significant changes I made. as completed

    marked the checklist item I have added a changelog entry to reflect the significant changes I made. as completed

  • Wouter Polet added 1 commit

    added 1 commit

    • 65e06a45 - Add lab sort and filter to changelog file

    Compare with previous version

  • Otto Visser removed 1 deleted label

    removed 1 deleted label

  • Chris Lemaire changed target branch from queue-v2.0 to development

    changed target branch from queue-v2.0 to development

  • Chris Lemaire resolved all threads

    resolved all threads

  • Otto Visser approved this merge request

    approved this merge request

  • Otto Visser started a merge train

    started a merge train

  • Otto Visser removed this merge request from the merge train because pipeline did not succeed

    removed this merge request from the merge train because pipeline did not succeed

  • Otto Visser added 7 commits

    added 7 commits

    • 4fa83cec - 1 commit from branch development
    • 50f1fda7 - Add a standard sorting to the lab page
    • abe89323 - Add filter for the type of the lab
    • 08e24969 - Add remove current filter button to labs page
    • 53fd38ea - Add module filter to labs page
    • c64c0cf2 - Add some margins to the lab filters
    • 5a27e1d2 - Add lab sort and filter to changelog file

    Compare with previous version

  • Looks like the build issue should be fixed when branch is rebased on development. Could you do that @wpolet ?

    • Resolved by Chris Lemaire

      After closely looking at the sorting, I noticed that finished labs are ordered below upcoming labs. This might be slightly confusing without a visual indicator. We should either make a separator for active-upcoming and upcoming-past labs so that they're in separate categories entirely or do a quick fix by adding another label to avoid confusion.

  • Wouter Polet added 17 commits

    added 17 commits

    • 5a27e1d2...8fb7438e - 11 commits from branch development
    • 26db6005 - Add a standard sorting to the lab page
    • 83b2a617 - Add filter for the type of the lab
    • 21447e1a - Add remove current filter button to labs page
    • 0765b48f - Add module filter to labs page
    • f52e33ee - Add some margins to the lab filters
    • 0a3275e6 - Add lab sort and filter to changelog file

    Compare with previous version

  • Wouter Polet added 1 commit

    added 1 commit

    • 5da59a05 - Add lab sort and filter to changelog file

    Compare with previous version

  • Wouter Polet added 1 commit

    added 1 commit

    • 5b9f6914 - Add Completed badge to labs that are done

    Compare with previous version

  • @otto is fixing the pipeline on the Kubernetes side it seems, after that this looks ready to merge.

  • Chris Lemaire resolved all threads

    resolved all threads

  • Chris Lemaire approved this merge request

    approved this merge request

  • Otto Visser started a merge train

    started a merge train

  • Otto Visser removed this merge request from the merge train because pipeline did not succeed

    removed this merge request from the merge train because pipeline did not succeed

  • Chris Lemaire added 7 commits

    added 7 commits

    • 17a0fd9d - Add a standard sorting to the lab page
    • 39ea3ccb - Add filter for the type of the lab
    • e8eed51c - Add remove current filter button to labs page
    • 6378c5bd - Add module filter to labs page
    • d34f3098 - Add some margins to the lab filters
    • 62eb1130 - Add lab sort and filter to changelog file
    • c3d67dc5 - Add Completed badge to labs that are done

    Compare with previous version

  • Otto Visser approved this merge request

    approved this merge request

  • Otto Visser enabled automatic add to merge train when the pipeline for 512c9c22 succeeds

    enabled automatic add to merge train when the pipeline for 512c9c22 succeeds

  • Otto Visser added this merge request to the merge train at position 2

    added this merge request to the merge train at position 2

  • merged

  • Otto Visser mentioned in commit a59fe30d

    mentioned in commit a59fe30d

  • unassigned @wpolet

  • Please register or sign in to reply
    Loading