Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Queue
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Queue
Commits
e85cf741
Commit
e85cf741
authored
Mar 20, 2024
by
Cédric Willekens
Browse files
Options
Downloads
Patches
Plain Diff
Fix styling of feedback page
parent
53f09a95
No related branches found
No related tags found
2 merge requests
!774
Deploy
,
!770
Allow feedback to be flagged
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/nl/tudelft/queue/controller/HomeController.java
+2
-2
2 additions, 2 deletions
...main/java/nl/tudelft/queue/controller/HomeController.java
src/main/resources/templates/home/feedback.html
+15
-12
15 additions, 12 deletions
src/main/resources/templates/home/feedback.html
with
17 additions
and
14 deletions
src/main/java/nl/tudelft/queue/controller/HomeController.java
+
2
−
2
View file @
e85cf741
...
@@ -291,10 +291,10 @@ public class HomeController {
...
@@ -291,10 +291,10 @@ public class HomeController {
return
"home/feedback"
;
return
"home/feedback"
;
}
}
@GetMapping
(
"/feedback/
{id}/
report"
)
@GetMapping
(
"/feedback/report"
)
@PreAuthorize
(
"@permissionService.canViewFeedback(#id)"
)
@PreAuthorize
(
"@permissionService.canViewFeedback(#id)"
)
public
String
reportFeedback
(
@RequestParam
Long
request
,
@RequestParam
Long
assistant
,
public
String
reportFeedback
(
@RequestParam
Long
request
,
@RequestParam
Long
assistant
,
@RequestParam
String
callback
,
@PathVariable
String
id
)
{
@RequestParam
String
callback
)
{
System
.
out
.
printf
(
"Report for request %s for assistant %s"
,
request
,
System
.
out
.
printf
(
"Report for request %s for assistant %s"
,
request
,
assistant
);
assistant
);
fs
.
reportFeedback
(
new
Feedback
.
Id
(
request
,
assistant
));
fs
.
reportFeedback
(
new
Feedback
.
Id
(
request
,
assistant
));
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/home/feedback.html
+
15
−
12
View file @
e85cf741
...
@@ -118,14 +118,21 @@
...
@@ -118,14 +118,21 @@
th:if=
"${fb.feedback != null && !fb.feedback.isEmpty()}"
>
th:if=
"${fb.feedback != null && !fb.feedback.isEmpty()}"
>
<div
class=
"flex space-between"
>
<div
class=
"flex space-between"
>
<div
class=
"tooltip"
>
<div
class=
"flex"
>
<i
class=
"fa-solid fa-circle-exclamation tooltip__control"
></i>
<div
th:if=
"${fb.isReported() && @permissionService.canViewDeanonimisedFeedback()}"
class=
"tooltip"
style=
"justify-content:
space-evenly; margin: auto"
>
<i
class=
"tooltip__control"
style=
"min-height: 1.1rem"
>
!
</i>
<p
role=
"tooltip"
style=
"width: 30rem; white-space: initial"
>
<p
role=
"tooltip"
style=
"width: 30rem; white-space: initial"
>
This feedback item has been reported and
This feedback item has been reported and
will not be shown anymore to the TA.
will not be shown anymore to the TA.
</p>
</p>
</div>
</div>
<p
th:text=
"${fb.feedback}"
></p>
<p
th:text=
"${fb.feedback}"
style=
"justify-content: space-around; margin:
auto; vertical-align: middle"
></p>
</div>
<div
class=
"menu-wrapper"
>
<div
class=
"menu-wrapper"
>
<button
aria-haspopup=
"menu"
<button
aria-haspopup=
"menu"
class=
"fa-solid fa-ellipsis-vertical button"
class=
"fa-solid fa-ellipsis-vertical button"
...
@@ -134,7 +141,7 @@
...
@@ -134,7 +141,7 @@
<ul
class=
"menu"
th:id=
"|feedback-${fb.id}|"
role=
"menu"
>
<ul
class=
"menu"
th:id=
"|feedback-${fb.id}|"
role=
"menu"
>
<li>
<li>
<form
method=
"get"
<form
method=
"get"
th:action=
"@{/feedback/
{id}/
report
(id=${fb.id})
}"
>
th:action=
"@{/feedback/report}"
>
<input
hidden
<input
hidden
th:value=
"${fb.id.requestId}"
th:value=
"${fb.id.requestId}"
name=
"request"
>
name=
"request"
>
...
@@ -147,10 +154,6 @@
...
@@ -147,10 +154,6 @@
<button
role=
"menuitem"
>
Report
<button
role=
"menuitem"
>
Report
as inappropriate
</button>
as inappropriate
</button>
</form>
</form>
<!-- <a role="menuitem"-->
<!-- th:href="|/feedback/report?request=${fb.id.requestId}&assistant=${fb.id.assistantId}&callback=/${#httpServletRequest.requestURI}|"-->
<!-- >Report as-->
<!-- inappropriate</a>-->
</li>
</li>
</ul>
</ul>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment