Room updates
Rooms can be managed from the Admins; Rooms can now have maps; Students can update their room whenever they want; Upon enqueuing, autoload the map for the room so students can enter where they are sitting
Requires the following database change:
alter table queue.room add column `map_file_path` varchar(255);
INSERT INTO lab_rooms (lab_id,rooms_id) SELECT lab.id,1 FROM lab;
UPDATE request SET room_id = 1
Fixes #57 (closed) Fixes #104 (closed) Fixes #79 (closed) by removal of UI
Merge request reports
Activity
added 1 commit
- 7e5103de - Updated logic for adding and removing rooms for lab create/edit
added 1 commit
- 6e0fcf1e - Improved Lab view page: show current room selected
added 1 commit
- ead9e014 - Set Request comment to empty if not submitted; Redirect messages for Room edit/create/delete
added 21 commits
-
ead9e014...5ea5f0f9 - 13 commits from branch
development
- 3d40958b - Rooms can be managed from the Admins; Rooms can now have maps; Students can…
- 4c79b95c - Updated logic for adding and removing rooms for lab create/edit
- 3109d0ec - Room does not need ManyToMany to Lab
- f1f3b1c0 - Small layout update for Lab view page
- 5d262864 - Improved Lab view page: show current room selected
- b7822327 - Set Request comment to empty if not submitted; Redirect messages for Room edit/create/delete
- 91802148 - Allow all logged in users to retrieve the image for a room when needed
- b8ab52d1 - Only try to update the room info if the room UI needs to be rendered
Toggle commit list-
ead9e014...5ea5f0f9 - 13 commits from branch
@MrHug rebased this branch & fixed a bug in it where room info is requested without an active room selected (eg you're not enqueued). It all looks good to me, but it'd be good for you to test it to verify it's still what you wanted
Now also fixes #104 (closed)
I'm testing some stuff now and will update this post with issues :)
-
Filling it out like this gives you a "Oops something went wrong". Suggested fix: Just remove this option? Or disable the save button when it it selected. It does not seem to be the default anyway.
- The yellow is very yellow. Maybe if the text were black it would be better?
- I added a room in the edit lab view, then only selected one. Now the list to select rooms from only contains the one entry? Is this intended behaviour?
-
- I disabled the option so it can't be selected
- white text on this yellow is part of the TU Delft huisstijl
- Yea, so in the edit view it lists all rooms ever added to the system (deletable by admins). Theones selected there are the actual rooms for the lab, and the above select box gives you the option to change your room based on the available rooms for the lab
added 20 commits
-
3898c6ad...4563767c - 19 commits from branch
development
- 54c7f1af - Merge branch 'development' into 'room-updates'
By Otto Visser on 2018-06-08T08:06:19 (imported from GitLab project)
-
3898c6ad...4563767c - 19 commits from branch
added 1 commit
- 74a7930d - Add imports for Room/FYSrep to build the project
mentioned in commit 68c70ef0
By Otto Visser on 2018-06-22T07:44:18 (imported from GitLab project)