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

EIP
Labrador
Queue
Commits
7f5fca2d

Commit 7f5fca2d authored Aug 30, 2023 by Ruben Backx

Downloads
- Plain Diff

Merge branch 'request-table-and-notification-fixes' into 'development'

Fix request table incoming requests and restore request taken notifications

See merge request !686

parents 1baeaf7f ff6bf57d

No related branches found

No related tags found

Loading

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

build.gradle.kts 1 addition, 1 deletion

build.gradle.kts
src/main/java/nl/tudelft/queue/service/RequestService.java 2 additions, 2 deletions

src/main/java/nl/tudelft/queue/service/RequestService.java
src/main/java/nl/tudelft/queue/service/WebSocketService.java 9 additions, 3 deletions

src/main/java/nl/tudelft/queue/service/WebSocketService.java
src/main/resources/static/js/create_tab.js 0 additions, 9 deletions

src/main/resources/static/js/create_tab.js
src/main/resources/static/js/global.js 0 additions, 8 deletions

src/main/resources/static/js/global.js
src/main/resources/static/js/lab_view.js 6 additions, 1 deletion

src/main/resources/static/js/lab_view.js
src/main/resources/static/js/request_table.js 15 additions, 2 deletions

src/main/resources/static/js/request_table.js
src/main/resources/templates/layout.html 4 additions, 3 deletions

src/main/resources/templates/layout.html
src/main/resources/templates/request/list/request-table.html 30 additions, 29 deletions

src/main/resources/templates/request/list/request-table.html

with 67 additions and 58 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