Skip to content
Snippets Groups Projects

Resolve "Generate Jitsi links for hybrid labs"

All threads resolved!

What does this mr do?

Makes sure that hybrid labs can be created. This means that a jitsi link can be generated if the location selected is "Online @ Jitsi". In other cases, no jitsi link will be created. This feature will eliminate the need to create 2 lab sessions (1 for online and 1 for physical) when a lab is hybrid.

Screenshots

before

after

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.
Edited by Henry Page

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
  • Henry Page added 101 commits

    added 101 commits

    • 72fa23ed...08a3a223 - 98 commits from branch development
    • f13c19a1 - Merge branch 'development' of gitlab.ewi.tudelft.nl:eip/labrador/queue into...
    • ea898d56 - Fixing the select box
    • 42e2f78a - Spotless changes and fixes for online modes not showing up

    Compare with previous version

  • Henry Page resolved all threads

    resolved all threads

  • Henry Page resolved all threads

    resolved all threads

  • Henry Page added 1 commit

    added 1 commit

    • 5b6bda57 - Wrote first test using argument captors to make sure it's being saved

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • 82464cf2 - Fix application dev properties

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • 3d2aad54 - Edit to labs are now possible, but online modes are not persisted

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • 36056290 - LabSession updates are now fully persisted

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • 22ef9b21 - Teacher/Admin side pretty much done

    Compare with previous version

  • Henry Page added 8 commits

    added 8 commits

    • 3a03f1c7 - Changes to DTO's to support hybrid options
    • 10d0afed - Mark features for removal
    • a85e6d08 - Updating view for the home lab screen for hybrid labs
    • cc2bde09 - Updating lab view
    • 66ac57c2 - Changing to qSession ViewDTO
    • 7e7ec6b3 - Update student request view
    • 2bd9310f - Merge Commit
    • 15f96427 - Changes to markup and hiding fields when there are no rooms & online modes

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    Compare with previous version

  • Henry Page added 41 commits

    added 41 commits

    • 1562ec67...1eb45ca0 - 38 commits from branch development
    • 0637863f - Request Table done, only websockets to go, removed all occurences of CommunicationMethod.JITSI_MEET
    • 3ad80ac5 - Remove unsupported online modes
    • 6d8f1920 - Resolving MR conflicts

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • a39548c7 - Fix Filtering WS still broken D:

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    Compare with previous version

  • assigned to @hpage

  • Henry Page added 1 commit

    added 1 commit

    Compare with previous version

  • Henry Page added 3 commits

    added 3 commits

    Compare with previous version

  • Henry Page 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

  • Henry Page marked the checklist item Tests were created to test the feature. as completed

    marked the checklist item Tests were created to test the feature. as completed

  • Henry Page marked the checklist item I have updated the documentation accordingly. as completed

    marked the checklist item I have updated the documentation accordingly. as completed

  • Henry Page marked the checklist item I adhere to the style guide. as completed

    marked the checklist item I adhere to the style guide. as completed

  • Henry Page marked this merge request as ready

    marked this merge request as ready

  • Henry Page added 1 commit

    added 1 commit

    Compare with previous version

  • Henry Page added 1 commit

    added 1 commit

    • 3b47ef37 - Migration to change old communication values

    Compare with previous version

  • Ruben Backx
  • Ruben Backx
  • Ruben Backx
  • Ruben Backx
  • Ruben Backx
  • Everything seems to work well! I've tried creating and editing a lab, as well as creating a bunch of requests, and joining approve/rejecting them etc.. and everything seems to do what it should.

  • Timur Oberhuber approved this merge request

    approved this merge request

  • Henry Page added 1 commit

    added 1 commit

    • a7273939 - Ruben suggestions pre-enum set

    Compare with previous version

  • Henry Page resolved all threads

    resolved all threads

  • Ruben Backx approved this merge request

    approved this merge request

  • Ruben Backx started a merge train

    started a merge train

  • Ruben Backx mentioned in commit 13aacbd0

    mentioned in commit 13aacbd0

  • merged

  • Please register or sign in to reply
    Loading