From 17d09accb752c97e8e3ea538542f9f5905b52b51 Mon Sep 17 00:00:00 2001
From: Thomas Hille <thomahi@gmx.de>
Date: Tue, 28 Feb 2017 17:29:52 +0100
Subject: [PATCH] only show interventions if condition is met. right now, only
 show one intervention per user and exercise

---
 app/assets/javascripts/editor/editor.js.erb | 4 +++-
 app/controllers/exercises_controller.rb     | 6 ++++++
 app/views/exercises/_editor.html.slim       | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index ef632fc1..bd2dc69b 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -646,7 +646,9 @@ configureEditors: function () {
     this.initializeDescriptionToggle();
     this.initializeSideBarTooltips();
     this.initializeTooltips();
-    this.initializeInterventionTimer();
+    if ($('#editor').data('show-interventions') == true){
+        this.initializeInterventionTimer();
+    }
     this.initPrompt();
     this.renderScore();
     this.showFirstFile();
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index e339c1c9..97910b18 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -155,6 +155,12 @@ class ExercisesController < ApplicationController
 
   def implement
     redirect_to(@exercise, alert: t('exercises.implement.no_files')) unless @exercise.files.visible.exists?
+    @show_interventions =
+      if UserExerciseIntervention.find_by(exercise: @exercise, user: current_user)
+        "false"
+      else
+        "true"
+      end
     @submission = current_user.submissions.where(exercise_id: @exercise.id).order('created_at DESC').first
     @files = (@submission ? @submission.collect_files : @exercise.files).select(&:visible).sort_by(&:name_with_extension)
     @paths = collect_paths(@files)
diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim
index b3d9c57b..b4cf7bb8 100644
--- a/app/views/exercises/_editor.html.slim
+++ b/app/views/exercises/_editor.html.slim
@@ -1,7 +1,8 @@
 - external_user_external_id = @current_user.respond_to?(:external_id) ? @current_user.external_id : '' #'tests' #(@current_user.uuid.present? ? @current_user.uuid : '')
 - external_user_id = @current_user.respond_to?(:external_id) ? @current_user.id : '' #'tests' #(@current_user.uuid.present? ? @current_user.uuid : '')
 - consumer_id = @current_user.respond_to?(:external_id) ? @current_user.consumer_id : '' #'tests' #(@current_user.uuid.present? ? @current_user.uuid : '')
-#editor.row data-exercise-id=exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout',  permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id data-user-external-id=external_user_external_id data-working-times-url=working_times_exercise_path data-intervention-save-url=intervention_exercise_path
+- show_interventions = @show_interventions || "false"
+#editor.row data-exercise-id=exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout',  permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id data-user-external-id=external_user_external_id data-working-times-url=working_times_exercise_path data-intervention-save-url=intervention_exercise_path data-show-interventions=show_interventions
   div id="sidebar" class=(@exercise.hide_file_tree ? 'sidebar-col-collapsed' : 'sidebar-col') = render('editor_file_tree', exercise: @exercise, files: @files)
   div id='output_sidebar' class='output-col-collapsed' = render('exercises/editor_output', external_user_id: external_user_id, consumer_id: consumer_id )
   div id='frames' class='editor-col'