-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
102 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,20 @@ | ||
<%= link_to evaluation_feedback_path(evaluation, feedback), | ||
title: feedback_title(feedback), | ||
"data-bs-toggle": "tooltip", | ||
class: "feedback btn btn-icon #{local_assigns.fetch(:active, false) ? 'disabled' : ''}" do %> | ||
<svg viewBox="0 0 24 24" width="24px" height="24px" style="overflow: visible" > | ||
<g> | ||
<foreignObject x="0" y="0" height="24" width="24"> | ||
<i class="mdi mdi-comment-outline"></i> | ||
<svg viewBox="0 0 24 24" width="24px" height="24px" style="overflow: visible" class="feedback-icon" > | ||
<g> | ||
<foreignObject x="0" y="0" height="24" width="24"> | ||
<i class="mdi mdi-comment-outline"></i> | ||
</foreignObject> | ||
<% if feedback.completed? %> | ||
<foreignObject x="6" y="1" height="16" width="12"> | ||
<i class="mdi mdi-check-bold mdi-12 completed"></i> | ||
</foreignObject> | ||
<% if feedback.completed? %> | ||
<foreignObject x="6" y="1" height="16" width="12"> | ||
<i class="mdi mdi-check-bold mdi-12 completed"></i> | ||
</foreignObject> | ||
<% end %> | ||
<circle cx="21" cy="22.25" r= "9" class="circle"></circle> | ||
<foreignObject x="12" y="12" height="18" width="18"> | ||
<% if feedback&.submission.present? %> | ||
<%= submission_status_icon feedback.submission %> | ||
<% else %> | ||
<i class="mdi mdi-18 mdi-cancel"></i> | ||
<% end %> | ||
<circle cx="21" cy="22.25" r= "9" fill="var(--d-surface)"></circle> | ||
<foreignObject x="12" y="12" height="18" width="18"> | ||
<% if feedback&.submission.present? %> | ||
<%= submission_status_icon feedback.submission %> | ||
<% else %> | ||
<i class="mdi mdi-18 mdi-cancel"></i> | ||
<% end %> | ||
</foreignObject> | ||
</g> | ||
</svg> | ||
<% end %> | ||
</foreignObject> | ||
</g> | ||
</svg> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,18 @@ | ||
<table class="table activity-table"> | ||
<ul class="feedback-list"> | ||
<% current_feedback.evaluation.evaluation_exercises.map do |ex| | ||
Feedback.find_by(evaluation_user: current_feedback.evaluation_user, | ||
evaluation_exercise: ex) | ||
end.each do |feedback| %> | ||
<tr> | ||
<td class="ellipsis-overflow name" title="<%= feedback.exercise.name %>"> | ||
<%= feedback.exercise.name %> | ||
</td> | ||
<td class="buttons"> | ||
<%= render partial: "evaluations/feedback_status", locals: { evaluation: feedback.evaluation, feedback: feedback, active: feedback == current_feedback} %> | ||
</td> | ||
</tr> | ||
<li > | ||
<%= link_to evaluation_feedback_path(feedback.evaluation, feedback), | ||
title: feedback_title(feedback), | ||
"data-bs-toggle": "tooltip", | ||
class: current_feedback == feedback ? "active" : "" do %> | ||
<%= render partial: "evaluations/feedback_status", locals: { evaluation: feedback.evaluation, feedback: feedback } %> | ||
<div class="ellipsis-overflow"> | ||
<%= feedback.exercise.name %> | ||
</div> | ||
<% end %> | ||
</li> | ||
<% end %> | ||
</table> | ||
</ul> |