diff --git a/app/assets/stylesheets/exercises.css.scss b/app/assets/stylesheets/exercises.css.scss index 2ef110d7..dbb3776e 100644 --- a/app/assets/stylesheets/exercises.css.scss +++ b/app/assets/stylesheets/exercises.css.scss @@ -114,6 +114,7 @@ a.file-heading { .feedback-header { display: flex; + align-items: baseline; .username { flex-grow: 1; diff --git a/app/models/user_exercise_feedback.rb b/app/models/user_exercise_feedback.rb index 5694573b..3075b96e 100644 --- a/app/models/user_exercise_feedback.rb +++ b/app/models/user_exercise_feedback.rb @@ -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 diff --git a/app/views/exercises/feedback.html.slim b/app/views/exercises/feedback.html.slim index 3cdbc30f..508b1478 100644 --- a/app/views/exercises/feedback.html.slim +++ b/app/views/exercises/feedback.html.slim @@ -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() });