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

c1dbb0db

Commit c1dbb0db authored Feb 7, 2020 by Taico Aerts

Downloads
- Plain Diff

Merge branch '286-follow-up-from-create-a-post-lab-statistics-page' into 'development'

Resolve "Follow-up from ""Create a post-lab statistics page"""

Closes #286

See merge request !244

parents 201048a7 6a4de3de

No related branches found

No related tags found

Loading

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/nl/tudelft/ewi/queue/WebSocketConfig.java 5 additions, 1 deletion

src/main/java/nl/tudelft/ewi/queue/WebSocketConfig.java
src/main/java/nl/tudelft/ewi/queue/controller/CourseStatusController.java 13 additions, 14 deletions

.../tudelft/ewi/queue/controller/CourseStatusController.java
src/main/java/nl/tudelft/ewi/queue/model/Assignment.java 6 additions, 1 deletion

src/main/java/nl/tudelft/ewi/queue/model/Assignment.java
src/main/java/nl/tudelft/ewi/queue/model/Course.java 4 additions, 4 deletions

src/main/java/nl/tudelft/ewi/queue/model/Course.java
src/main/java/nl/tudelft/ewi/queue/model/Lab.java 4 additions, 0 deletions

src/main/java/nl/tudelft/ewi/queue/model/Lab.java
src/main/java/nl/tudelft/ewi/queue/model/Room.java 4 additions, 3 deletions

src/main/java/nl/tudelft/ewi/queue/model/Room.java
src/main/java/nl/tudelft/ewi/queue/service/LabStatusService.java 4 additions, 3 deletions

...n/java/nl/tudelft/ewi/queue/service/LabStatusService.java
src/main/resources/static/js/lab_status_charts.js 3 additions, 3 deletions

src/main/resources/static/js/lab_status_charts.js

with 43 additions and 29 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