Skip to content
Snippets Groups Projects

Resolve "Click on map image of room to show TA where you are"

What does this mr do?

Add an option to select a position on a map when a student enqueues, if a map is available. The TA will see this position whenever they handle a request.

Screenshots

Enqueueing

Student view

Screenshot_2020-02-29_at_12.26.58

TA view

Screenshot_2020-02-29_at_12.27.43

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 #196 (closed)

Edited by Thijs Nulle

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
  • Two comments:

    1. Institute specific images shouldn't go into our repository (TZ2)
    2. that black circle: might not be visible on all images; could we somehow ensure better visibility?
  • Author Contributor

    @otto is there a way to only have images for debugging? I think a map for debugging using development should be handy if this feature gets implemented.

    For the circle, I can add a background shadow but I think we have to draw the line somewhere, it can be added in _variables.scss if that eventually gets merged. That could be an easy way change it on a university basis.

    • Author Contributor

      @otto Removing the projector screen in the TZ2 map, and maybe adding a "door side" instead of an actual door would make the map multifunctional.

    • So far a generic default room you would like to keep the 4 coloured quadrants?

    • Not sure if I fully follow here. Will the TZ2 map only be used for TZ2 or were you planning to use it for every room?

      Edit: I see Otto's remark now. I agree that a generic map should not have the 4 coloured quadrants, but I also think a generic room is nearly impossible to achieve as every room will be different in door placement, project placement, size, etc.

      I think the default should be to not show this place-in-the-room selector at all if no room image can be found. That way you don't get confusion over what indication is where in the room.

      Edited by Chris Lemaire
    • Please register or sign in to reply
  • Thijs Nulle changed the description

    changed the description

  • Otto Visser mentioned in merge request !303 (merged)

    mentioned in merge request !303 (merged)

  • Chris Lemaire assigned to @Lemaire and unassigned @tnulle

    assigned to @Lemaire and unassigned @tnulle

    • There's 23 commits for this MR. I understand your progress might be saved in these commits, but it will be useful in the future to be able to look back through these commits and make sense out of the changes you made. Would you be able to squash these commits into a few commits that describe each relevant change and the reasoning for it?

    • Author Contributor

      This is honestly a bit of a problem since the commits have been wrong since a wrong rebase, every single commit message almost does not show what is actually added and/or changed. Would a better idea be to completely uncommit everything and build the commit history from the ground up and listing it file by file what has changed?

    • If you first rebase on current development and remove those commits that are not from this branch, you can squash the rest of them into a single nice commit with a second rebase.

    • Could you rebase this MR?

    • Please register or sign in to reply
  • After a short conversation with @tnulle, we decided to close this MR for Queue 1.2.0 and leave it as a new feature for Labrador Queue (2.0.0)

  • closed

  • unassigned @Lemaire

Please register or sign in to reply
Loading