Merge pull request #197 from openHPI/feature/anomaly_feedback_ui

Feature/anomaly feedback ui
This commit is contained in:
rteusner
2018-08-08 10:10:14 +02:00
committed by GitHub
3 changed files with 10 additions and 0 deletions

View File

@@ -114,6 +114,7 @@ a.file-heading {
.feedback-header {
display: flex;
align-items: baseline;
.username {
flex-grow: 1;

View File

@@ -9,4 +9,9 @@ class UserExerciseFeedback < ActiveRecord::Base
def to_s
"User Exercise Feedback"
end
def anomaly_notification
AnomalyNotification.where({exercise_id: exercise.id, user_id: user_id, user_type: user_type})
.where("created_at < ?", created_at).order("created_at DESC").to_a.first
end
end

View File

@@ -14,6 +14,8 @@ h1 = link_to(@exercise, exercise_path(@exercise))
.panel-heading role="tab" id="heading"
div.clearfix.feedback-header
span.username = link_to(feedback.user.name, statistics_external_user_exercise_path(id: @exercise.id, external_user_id: feedback.user.id))
- if feedback.anomaly_notification
i class="fa fa-envelope-o" data-placement="top" data-toggle="tooltip" data-container="body" title=feedback.anomaly_notification.reason
span.date = feedback.created_at
.panel-collapse role="tabpanel"
.panel-body.feedback
@@ -22,3 +24,5 @@ h1 = link_to(@exercise, exercise_path(@exercise))
.worktime = "#{t('user_exercise_feedback.working_time')} #{feedback.user_estimated_worktime}" if feedback.user_estimated_worktime
= render('shared/pagination', collection: @feedbacks)
script type="text/javascript" $(function () { $('[data-toggle="tooltip"]').tooltip() });