Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7331ab20

Commit 7331ab20 authored Sep 24, 2021 by Chris Lemaire

Downloads
- Plain Diff

Merge branch '404-admin-overview-fix' into 'development'

Fix broken rebase for #437

Closes #404

See merge request !486

parents be4a15c2 9ddc168a

No related branches found

No related tags found

2 merge requests!598Dev to master,!486Fix broken rebase for #437

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/queue/controller/AdminController.java 34 additions, 11 deletions

...ain/java/nl/tudelft/queue/controller/AdminController.java
src/main/java/nl/tudelft/queue/dto/view/CalendarEntryViewDTO.java 58 additions, 0 deletions

.../java/nl/tudelft/queue/dto/view/CalendarEntryViewDTO.java
src/main/java/nl/tudelft/queue/model/labs/AbstractSlottedLab.java 0 additions, 1 deletion

.../java/nl/tudelft/queue/model/labs/AbstractSlottedLab.java
src/main/java/nl/tudelft/queue/model/labs/RegularLab.java 0 additions, 1 deletion

src/main/java/nl/tudelft/queue/model/labs/RegularLab.java
src/main/java/nl/tudelft/queue/service/LabService.java 76 additions, 0 deletions

src/main/java/nl/tudelft/queue/service/LabService.java
src/main/resources/templates/admin/view.html 7 additions, 55 deletions

src/main/resources/templates/admin/view.html
src/main/resources/templates/admin/view/calendar.html 85 additions, 0 deletions

src/main/resources/templates/admin/view/calendar.html
src/test/java/nl/tudelft/queue/controller/AdminControllerTest.java 16 additions, 6 deletions

...java/nl/tudelft/queue/controller/AdminControllerTest.java

with 276 additions and 74 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