Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Queue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Incidents

Snippets Groups Projects

0033502b

Commit 0033502b authored Aug 18, 2022 by Taico Aerts

Downloads
- Plain Diff

Merge branch 'wait-time-improvements' into 'development'

Improve wait time

See merge request !571

parents 3ff8d244 e59793bc

No related branches found

No related tags found

2 merge requests!598Dev to master,!571Improve wait time

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/queue/model/LabRequest.java 46 additions, 3 deletions

src/main/java/nl/tudelft/queue/model/LabRequest.java
src/main/java/nl/tudelft/queue/model/TimeSlot.java 21 additions, 0 deletions

src/main/java/nl/tudelft/queue/model/TimeSlot.java
src/main/java/nl/tudelft/queue/model/labs/AbstractSlottedLab.java 27 additions, 0 deletions

.../java/nl/tudelft/queue/model/labs/AbstractSlottedLab.java
src/main/java/nl/tudelft/queue/model/labs/Lab.java 8 additions, 1 deletion

src/main/java/nl/tudelft/queue/model/labs/Lab.java
src/main/java/nl/tudelft/queue/model/labs/RegularLab.java 18 additions, 0 deletions

src/main/java/nl/tudelft/queue/model/labs/RegularLab.java
src/main/resources/templates/lab/view/components/lab-info.html 30 additions, 11 deletions

...ain/resources/templates/lab/view/components/lab-info.html

with 150 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment