From f1bf313280a1b4c7a30d40546de7a1de72ca9bfe Mon Sep 17 00:00:00 2001
From: Thomas Hille <thomahi@gmx.de>
Date: Wed, 8 Mar 2017 14:36:25 +0100
Subject: [PATCH] changed times for rfc and break intervention to minimum 15
 and 20 minutes. roc modal shows some additional text to the modal for less
 confusion

---
 app/assets/javascripts/editor/editor.js.erb | 36 ++++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index f1a6d470..f5b43f1d 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -323,6 +323,9 @@ configureEditors: function () {
     var button = $('#requestComments');
     button.prop('disabled', true);
     button.on('click', function () {
+      if ($('#editor').data('show-interventions') == true){
+        $('#rfc_intervention_text').hide()
+      }
       $('#comment-modal').modal('show');
     });
 
@@ -589,15 +592,16 @@ configureEditors: function () {
                 var percentile75 = data['working_time_75_percentile'];
                 var accumulatedWorkTimeUser = data['working_time_accumulated'];
 
-                var timeUntilBreak = 15 * 60 * 1000;
+                var timeUntilBreak = 20 * 60 * 1000;
+                var minTimeUntilAskQuestion = 15 * 60 * 1000;
 
                 if ((accumulatedWorkTimeUser - percentile75) > 0) {
                     // working time is already over 75 percentile
-                    var timeUntilAskQuestion = 10 * 60 * 1000;
+                    var timeUntilAskQuestion = minTimeUntilAskQuestion;
                 } else {
                     // working time is less than 75 percentile
                     // ensure we give user at least 10 minutes before we bother the user
-                    var timeUntilAskQuestion = (percentile75 - accumulatedWorkTimeUser) > 10 * 60 * 1000 ? (percentile75 - accumulatedWorkTimeUser) : 10 * 60 * 1000;
+                    var timeUntilAskQuestion = (percentile75 - accumulatedWorkTimeUser) > minTimeUntilAskQuestion ? (percentile75 - accumulatedWorkTimeUser) : minTimeUntilAskQuestion;
                 }
 
                 // if notifications are too close to each other, ensure some time differences between them
@@ -616,15 +620,20 @@ configureEditors: function () {
                         url: $('#editor').data('intervention-save-url')});
                 }, timeUntilBreak);
 
+
                 setTimeout(function() {
-                    $('#search-intervention-modal').modal('show');
-                    $.ajax({
-                        data: {
-                            intervention_type: 'QuestionIntervention'
-                        },
-                        dataType: 'json',
-                        type: 'POST',
-                        url: $('#editor').data('intervention-save-url')});
+                    var button = $('#requestComments');
+                    if (!button.prop('disabled')){
+                        $('#rfc_intervention_text').show();
+                        $('#comment-modal').modal('show');
+                        $.ajax({
+                            data: {
+                                intervention_type: 'QuestionIntervention'
+                            },
+                            dataType: 'json',
+                            type: 'POST',
+                            url: $('#editor').data('intervention-save-url')});
+                    };
                 }, timeUntilAskQuestion);
             }
         });
@@ -636,11 +645,6 @@ configureEditors: function () {
             window.open(`https://open.hpi.de/courses/javaeinstieg2017/pinboard?query=${search}`, '_blank');
         })
 
-        $('#btn-search-modal').button().click(function(){
-            var search = $('#search-modal').val();
-            window.open(`https://open.hpi.de/courses/javaeinstieg2017/pinboard?query=${search}`, '_blank');
-        })
-
         $('#sidebar-search-collapsed').on('click',this.handleSideBarToggle.bind(this));
     },