Issue#952 feature progressive tips

.gitignore

@@ -34,3 +34,8 @@ coverage/
 
 vendor/cache/**
 *.cache
+
+node_modules/**
+
+**/*.rsa*
+**/*.gem

app/helpers/assignment_result_helper.rb

@@ -55,6 +55,10 @@ def manual_evaluation_comment(assignment)
     end
   end
 
+  def showable_tips_html(assignment)
+    Mumukit::ContentType::Markdown.to_html assignment.showable_tips.map { |tip| "* #{tip}" }.join "\n"
+  end
+
   private
 
   def solution_octet_data(assignment)

app/models/assignment.rb

@@ -15,7 +15,7 @@ class Assignment < ApplicationRecord
     define_method(field) { self[field]&.map { |it| it.symbolize_keys } }
   end
 
-  delegate :language, :name, :visible_success_output?, to: :exercise
+  delegate :language, :name, :visible_success_output?, :tips, to: :exercise
   delegate :output_content_type, to: :language
   delegate :should_retry?, to: :status
 
@@ -140,6 +140,10 @@ def as_platform_json
         }})
   end
 
+  def showable_tips
+    tips.select { |tries, _| tries <= attemps_count }.map &:second
+  end
+
   private
 
   def update_submissions_count!

app/models/exercise.rb

@@ -14,6 +14,8 @@ class Exercise < ApplicationRecord
 
   belongs_to :guide
 
+  serialize :tips, Array
+
   defaults { self.submissions_count = 0 }
 
   validates_presence_of :submissions_count,

app/models/submission/submission.rb

@@ -31,7 +31,9 @@ def save_submission!(assignment)
   end
 
   def save_results!(results, assignment)
-    assignment.update! results
+    assignment.attemps_count += 1 unless results[:status] == :passed
+    assignment.update results
+    assignment.save!
   end
 
   def notify_results!(results, assignment)

app/views/exercise_solutions/_results.html.erb

@@ -35,6 +35,7 @@
                 </div>
             <% end %>
             <div id="results-section" class="<%= 'collapse' if render_feedback?(assignment) %> results-item">
+              <%= showable_tips_html assignment %>
               <%= render_test_results assignment %>
             </div>
           </div>

db/migrate/20180307150148_add_failed_submissions_count_to_assignments.rb

@@ -0,0 +1,5 @@
+class AddFailedSubmissionsCountToAssignments < ActiveRecord::Migration[5.1]
+  def change
+    add_column :assignments, :attemps_count, :integer, default: 0
+  end
+end

db/migrate/20180307151729_add_progressive_tips_to_exercises.rb

@@ -0,0 +1,5 @@
+class AddProgressiveTipsToExercises < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exercises, :tips, :text
+  end
+end

spec/dummy/db/schema.rb

@@ -40,6 +40,7 @@
     t.string "queries", default: [], array: true
     t.text "query_results"
     t.text "manual_evaluation_comment"
+    t.integer "attemps_count", default: 0
     t.index ["exercise_id"], name: "index_assignments_on_exercise_id"
     t.index ["submission_id"], name: "index_assignments_on_submission_id"
     t.index ["submitter_id"], name: "index_assignments_on_submitter_id"
@@ -136,6 +137,7 @@
     t.text "goal"
     t.string "initial_state"
     t.string "final_state"
+    t.text "tips"
     t.index ["guide_id"], name: "index_exercises_on_guide_id"
     t.index ["language_id"], name: "index_exercises_on_language_id"
   end

spec/features/progressive_tips_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+feature 'Progressive Tips', organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:haskell) { create(:haskell) }
+
+  let!(:problem) { build(:problem, name: 'Succ1', description: 'Description of Succ1', layout: :input_right, tips: [[5, 'try this'], [10, 'try that']] ) }
+  let(:assignment) { problem.find_or_init_assignment_for(user) }
+
+  let!(:chapter) {
+    create(:chapter, name: 'Functional Programming', lessons: [
+      create(:lesson, name: 'getting-started', description: 'An awesome guide', language: haskell, exercises: [problem])
+    ]) }
+
+  before { reindex_current_organization! }
+
+  context 'visit failed exercise' do
+    before { set_current_user! user }
+    before { assignment.update! status: :failed }
+
+    scenario '2 failed submissions' do
+      assignment.update! attemps_count: 2
+      visit "/exercises/#{problem.slug}"
+
+      expect(page).to_not have_text('try this')
+      expect(page).to_not have_text('try that')
+    end
+
+    scenario '5 failed submissions' do
+      assignment.update! attemps_count: 5
+      visit "/exercises/#{problem.id}"
+
+      expect(page).to have_text('try this')
+      expect(page).to_not have_text('try that')
+    end
+
+    scenario '10 failed submissions' do
+      assignment.update! attemps_count: 10
+      visit "/exercises/#{problem.id}"
+
+      expect(page).to have_text('try this')
+      expect(page).to have_text('try that')
+    end
+  end
+end

spec/models/event_generation_spec.rb

@@ -39,6 +39,7 @@
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              eid: exercise.bibliotheca_id,
@@ -97,6 +98,7 @@
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              name: exercise.name,
@@ -151,6 +153,7 @@
                            feedback: nil,
                            test_results: nil,
                            submissions_count: 2,
+                           attemps_count: 0,
                            manual_evaluation_comment: nil,
                            exercise: {
                              eid: exercise.bibliotheca_id,