mumuki-laboratory 7.3.1 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2119060da9d8e6e5c83715a763f3f78d6433c7da2ed7de4f63ad0d36b9a85e
-  data.tar.gz: 73a5e031b87d2aeafd20bb9bf38d679badf56ea6bac35415c6397219841873b1
+  metadata.gz: 7c23a0042d4601c10b7b61f3196cb7e227fe0ac33f9c7a48b70c57a8a12854cb
+  data.tar.gz: ee21361e7e928cdd3552e00c112ef2d4a38215b8e165f353e9ec701dfa1a22f9
 SHA512:
-  metadata.gz: c81b960760d56143c6b393418eac611d08c45cc31f827998c53833ea852dfbef23f082b138c203475cefedb4bf74e67f7d0f0079e1588606730416159ab5a038
-  data.tar.gz: 6dd3f6673aed2e5d4119171e5f361727bc4a6518fe409ea6d49db8dba53ace606f0578dbde35e9d85396dc5095eee7749cf38c5132a593fd77b13be94b52a9d7
+  metadata.gz: df62506d35e812616ec5476b728d89d8128594503c04b9d152778be3aa4242f209cd20578a49ca85df231e7bc812b3530a555680b897034667f006bc56f53f60
+  data.tar.gz: b4c914f2ebaa83f9d685b0e87262e8f1588e154896cc0f18fa434c00edd3504324b63c10f8251f607990d3d9bf4d50b30d35d5f1459e7416b8d456b5a57ca3db

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_progress_bar.scss

@@ -25,4 +25,7 @@
   .danger {
     background-color: $brand-danger;
   }
+  .info {
+    background-color: $brand-info;
+  }
 }

data/app/helpers/breadcrumbs_helper.rb

@@ -1,4 +1,6 @@
 module BreadcrumbsHelper
+  include DiscussionsHelper
+
   def breadcrumbs(e, extra=nil)
     breadcrumbs0(e.navigable_name, e, extra, 'last')
   end
@@ -28,6 +30,17 @@ module BreadcrumbsHelper
     breadcrumb_list_item link_to(e, link_path), clazz
   end
 
+  def breadcrumbs_for_discussion(discussion, e)
+    discussions_breadcrumb = breadcrumbs_for_linkable(e, link_to(t(:discussions), item_discussions_path(e)))
+    discussion_item = breadcrumb_list_item(breadcrumb_name_for(discussion), 'last')
+
+    discussions_breadcrumb + discussion_item
+  end
+
+  def breadcrumb_name_for(discussion)
+    discussion.friendly.truncate_words(4)
+  end
+
   private
 
   def breadcrumbs_for_linkable(e, extra=nil, last='')

data/app/helpers/contextualization_result_helper.rb

@@ -18,7 +18,7 @@ module ContextualizationResultHelper
   def contextualization_status(contextualization)
     if contextualization.exercise.hidden?
       :hidden_done
-    elsif contextualization.exercise.choices?
+    elsif contextualization.exercise.choice?
       contextualization.passed? ? :correct_answer : :wrong_answer
     else
       contextualization.submission_status

data/app/helpers/icons_helper.rb

@@ -1,7 +1,6 @@
 module IconsHelper
-  #FIXME refactor names
   def status_icon(status_like)
-    fa_icon *icon_for_status(status_like.to_submission_status)
+    fa_icon *icon_for(status_like.to_submission_status)
   end
 
   def fixed_fa_icon(name, options={})
@@ -19,25 +18,37 @@ module IconsHelper
 
   private
 
-  def status_fa_icon(status)
-    fa_icon(*icon_for_status(status))
+  def contextualization_fa_icon(contextualization)
+    fa_icon(*icon_for(contextualization))
   end
 
   def exercise_status_fa_icon(exercise)
-    status_fa_icon(exercise.status_for(current_user))
+    contextualization_fa_icon(exercise.assignment_for(current_user))
   end
 
   def discussion_status_fa_icon(discussion)
-    status_fa_icon(discussion.status)
+    contextualization_fa_icon(discussion)
   end
 
-  def icon_for_status(s)
-    iconized = s.iconize
+  def icon_for(iconizable)
+    iconized = iconizable.iconize
     [iconized[:type], class: "text-#{iconized[:class]} status-icon"]
   end
 
-  def label_for_status(s)
-    iconized = s.iconize
+  def class_for_exercise(exercise)
+    icon_class_for(exercise.assignment_for(current_user))
+  end
+
+  def icon_class_for(iconizable)
+    iconizable.iconize[:class].to_s
+  end
+
+  def icon_type_for(iconizable)
+    iconizable.iconize[:type].to_s
+  end
+
+  def label_for_contextualization(contextualization)
+    iconized = contextualization.iconize
     %Q{
       <span class="text-#{iconized[:class]} status-label">
         #{fa_icon "#{iconized[:type]}"}

data/app/helpers/progress_bar_helper.rb

@@ -1,5 +1,5 @@
 module ProgressBarHelper
-  include StatusHelper
+  include IconsHelper
 
   def class_for_progress_list_item(exercise, active)
     "progress-list-item text-center #{class_for_exercise(exercise)} #{active ? 'active' : ''}"

data/app/views/discussions/show.html.erb

@@ -1,6 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <%= breadcrumbs_for_linkable @debatable, link_to(t(:discussions), item_discussions_path(@debatable))%>
-  <%= breadcrumb_list_item('last', @discussion.friendly.truncate_words(4)) %>
+  <%= breadcrumbs_for_discussion @discussion, @debatable %>
 <% end %>
 
 <div>

data/app/views/exercise_solutions/{_contextualization_results.html.erb → _contextualization_results_body.html.erb}

@@ -1,5 +1,5 @@
-<% if contextualization.results_visible? %>
-  <div>
+<div>
+  <% unless contextualization.results_body_hidden? %>
     <%= render partial: 'exercise_solutions/expectations', locals: {assignment: contextualization} %>
     <% if render_feedback?(contextualization) %>
       <div class="results-item">
@@ -15,7 +15,5 @@
     <div id="results-section" class="<%= 'collapse' if render_feedback?(contextualization) %> results-item">
       <%= render_test_results contextualization %>
     </div>
-  </div>
-<% else %>
-  <div></div>
-<% end %>
+  <% end %>
+</div>

data/app/views/exercise_solutions/_contextualization_results_container.html.erb

@@ -1,4 +1,4 @@
-<div class="<%= "bs-callout bs-callout-#{class_for_status contextualization.submission_status}" %>">
+<div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
   <%= yield %>
 </div>

data/app/views/exercise_solutions/_kids_results.html.erb

@@ -3,7 +3,7 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<div class="<%= "mu-kids-callout-#{class_for_status assignment.submission_status}" %>">
+<div class="<%= "mu-kids-callout-#{icon_class_for assignment}" %>">
   <%= manual_evaluation_comment assignment %>
 </div>
 

data/app/views/exercise_solutions/_out_of_attempts.html.erb

@@ -3,4 +3,3 @@
     <strong><%= t :out_of_attempts %></strong>
   </h4>
 </div>
-<%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

data/app/views/exercise_solutions/_results.html.erb

@@ -3,35 +3,42 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
-  <%= manual_evaluation_comment assignment %>
-  <% unless assignment.manual_evaluation_comment? %>
-    <%= render partial: 'exercise_solutions/contextualization_results', locals: {contextualization: assignment} %>
-    <% if should_render_need_help_dropdown?(assignment) %>
-      <div class="notify-problem-box">
-        <div class="dropdown">
-          <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
-          <ul class="dropdown-menu" aria-labelledby="helpDropdown">
-            <li>
-              <%= read_discussions_link(@exercise) %>
-            </li>
-            <li>
-              <%= render_community_link %>
-            </li>
-            <li>
-              <%= report_bug_link(assignment) %>
-            </li>
-          </ul>
+<% if assignment.results_hidden? %>
+  <%= render partial: 'exercise_solutions/results_hidden', locals: {assignment: assignment} %>
+<% elsif !assignment.attempts_left? %>
+  <%= render partial: 'exercise_solutions/out_of_attempts', locals: {assignment: assignment} %>
+<% else %>
+  <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
+    <%= manual_evaluation_comment assignment %>
+    <% unless assignment.manual_evaluation_comment? %>
+      <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
+      <% if should_render_need_help_dropdown?(assignment) %>
+        <div class="notify-problem-box">
+          <div class="dropdown">
+            <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
+            <ul class="dropdown-menu" aria-labelledby="helpDropdown">
+              <li>
+                <%= read_discussions_link(@exercise) %>
+              </li>
+              <li>
+                <%= render_community_link %>
+              </li>
+              <li>
+                <%= report_bug_link(assignment) %>
+              </li>
+            </ul>
+          </div>
         </div>
-      </div>
+      <% end %>
     <% end %>
+    <%= solution_download_link assignment %>
   <% end %>
-  <%= solution_download_link assignment %>
-<% end %>
 
-<% if assignment.passed? %>
-  <%= corollary_box @exercise %>
-<% else %>
-  <%= assistance_box assignment %>
+  <% if assignment.passed? %>
+    <%= corollary_box @exercise %>
+  <% else %>
+    <%= assistance_box assignment %>
+  <% end %>
 <% end %>
+
 <%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

data/app/views/exercise_solutions/_results_hidden.html.erb

@@ -0,0 +1,5 @@
+<div class="bs-callout bs-callout-info submission-result-pending">
+  <h4>
+    <strong><%= t :results_hidden %></strong>
+  </h4>
+</div>

data/app/views/exercise_solutions/_results_title.html.erb

@@ -1,3 +1,3 @@
-<h4 class="text-<%= class_for_status(contextualization.submission_status) %>">
-  <strong><%= fa_icon icon_type_for_status(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
+<h4 class="text-<%= icon_class_for(contextualization) %>">
+  <strong><%= fa_icon icon_type_for(contextualization) %> <%= t_contextualization_status contextualization %></strong>
 </h4>

data/app/views/exercises/_read_only.html.erb

@@ -67,7 +67,7 @@
             <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion } do %>
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <%= render partial: 'exercise_solutions/contextualization_results',
+                  <%= render partial: 'exercise_solutions/contextualization_results_body',
                              locals: {contextualization: @discussion, guide_finished_by_solution: false} %>
                 </div>
               </div>

data/app/views/layouts/_timer.html.erb

@@ -4,7 +4,7 @@
     <i class="timer timer-text text-center"><%= t :time_left %></i>
     <i id="timer" class="timer timer-text text-center"></i>
     <script>
-      mumuki.startTimer('<%= end_time %>');
+      mumuki.startTimer('<%= end_time&.iso8601 %>');
     </script>
   </div>
 </div>

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -36,7 +36,6 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   end
 
   def render_results_html(results_partial, assignment)
-    results_partial = 'out_of_attempts' unless assignment.attempts_left?
     render_to_string partial: results_partial,
                      locals: {assignment: assignment}
   end

data/lib/mumuki/laboratory/locales/en.yml

@@ -17,6 +17,7 @@ en:
   ask_the_first_question: Be the first one to ask!
   attempts_left:
     zero: "You've run out of attempts "
+    one: "1 attempt remaining"
     other: '%{count} attempts remaining'
   author: Author
   authoring: "Authoring"
@@ -181,6 +182,7 @@ en:
   reset_query: Clear current search filters
   restart: Restart
   results: Results
+  results_hidden: Your solution was submitted successfully!
   retry_exercise: Retry
   running: running
   save: Save

data/lib/mumuki/laboratory/locales/es.yml

@@ -199,6 +199,7 @@ es:
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
   reset_query: Borrar los filtros de búsqueda actuales
   restart: Reiniciar
+  results_hidden: ¡Tu solución fue enviada con éxito!
   results: Resultados
   retry_exercise: Reintentar
   running: procesando

data/lib/mumuki/laboratory/locales/pt.yml

@@ -18,7 +18,8 @@ pt:
   ask_the_first_question: Faça a primeira pergunta!
   attempts_left:
     zero: 'Você ficou sem tentativas'
-    other: '%{count} tentativa restante'
+    one: '1 tentativa restante'
+    other: '%{count} tentativas restantes'
   author: Autor
   authoring: Autores
   authoring_note_html: 'Este guia foi desenvolvido por %{authors} nos termos do <a href = "https://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> Creative Commons License Share-Equal, 4.0 </a>.'
@@ -192,6 +193,7 @@ pt:
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar
   results: Resultados
+  results_hidden: Sua solução foi enviada com sucesso!
   retry_exercise: Tentar novamente
   running: processamento
   save: Salvar

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.3.1'
+    VERSION = '7.4.0'
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20200213175736) do
+ActiveRecord::Schema.define(version: 20200312181842) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -137,6 +137,7 @@ ActiveRecord::Schema.define(version: 20200213175736) do
     t.integer "duration"
     t.integer "max_problem_submissions"
     t.integer "max_choice_submissions"
+    t.boolean "results_hidden_for_choices", default: false
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"

data/spec/features/exams_flow_spec.rb

@@ -7,11 +7,22 @@ feature 'Exams Flow', organization_workspace: :test do
 
   let(:other_organization) { create(:organization, name: 'baz') }
 
-  let(:exam_with_no_submission_limits) { create(:exam, organization_id: Organization.find_by_name('test').id, guide_id: guide.id) }
+  let(:test_organization) { Organization.locate! 'test' }
+  let(:exam_with_no_submission_limits) { create(:exam, organization: test_organization, guide: guide) }
+
+  let(:capped_exam) { create(:exam, organization: test_organization, guide: problems_guide, max_choice_submissions: 2, max_problem_submissions: 5) }
+
   let(:guide) { create(:guide, exercises: [exercise])}
   let(:exercise) { create(:exercise, name: 'Exam Exercise') }
 
-  before { exam_with_no_submission_limits.index_usage! Organization.find_by_name('test') }
+  let(:problems_guide) { create(:guide, exercises: [choice_problem, code_problem])}
+
+  let(:choice_problem) { create(:problem, name: 'Exam Choice Problem', editor: :multiple_choice,
+    choices: [{ value: "A", checked: true }, { value: "B", checked: false }]) }
+
+  let(:code_problem) { create(:problem, name: 'Exam Code Problem') }
+
+  before { exam_with_no_submission_limits.index_usage! test_organization }
 
   before { reindex_current_organization! }
 
@@ -44,22 +55,82 @@ feature 'Exams Flow', organization_workspace: :test do
     expect(page).to have_text('You have no permissions for this content.')
   end
 
-  scenario 'visit exam in path, when there is no more time' do
-    user = create(:user)
-    set_current_user! user
-    exam.authorize!(user)
-    expect_any_instance_of(Exam).to receive(:enabled_for?).and_return(false)
-    visit "/exams/#{exam.classroom_id}"
+  context 'visit authorized exam for user' do
+    let(:user) { create(:user) }
+    let(:current_exam) { exam }
 
-    expect(page).to have_text('This content is no longer available.')
-  end
+    before do
+      current_exam.authorize! user
+      set_current_user! user
+    end
+
+    scenario 'in path, when there is no more time' do
+      expect_any_instance_of(Exam).to receive(:enabled_for?).and_return(false)
+      visit "/exams/#{current_exam.classroom_id}"
+
+      expect(page).to have_text('This content is no longer available.')
+    end
 
-  scenario 'visit exercise for exam with no submission limits' do
-    user = create(:user)
-    set_current_user! user
-    exam_with_no_submission_limits.authorize!(user)
-    visit "/exercises/#{exercise.id}"
+    feature 'with no submission limits' do
+      let(:current_exam) { exam_with_no_submission_limits }
+
+      scenario 'in a particular exercise' do
+        visit "/exercises/#{exercise.id}"
+
+        expect(page).to have_text('Exam Exercise')
+      end
+    end
 
-    expect(page).to have_text('Exam Exercise')
+    feature 'with submission limits' do
+      let(:current_exam) { capped_exam }
+
+      feature 'when user has no remaining attempts' do
+        feature 'for code problem' do
+          before { 5.times { code_problem.submit_solution!(user, content: 'foo')  } }
+
+          scenario do
+            visit "/exercises/#{code_problem.id}"
+
+            expect(page).to have_text('Exam Code Problem')
+            expect(page).to have_text('out of attempts')
+          end
+        end
+
+        feature 'for choice problem' do
+          before { 2.times { choice_problem.submit_solution!(user, content: 'foo')  } }
+
+          scenario do
+            visit "/exercises/#{choice_problem.id}"
+
+            expect(page).to have_text('Exam Choice Problem')
+            expect(page).to have_text('out of attempts')
+          end
+        end
+      end
+
+      feature 'when user has remaining attempts' do
+        feature 'for code problem' do
+          before { 2.times { code_problem.submit_solution!(user, content: 'foo') } }
+
+          scenario do
+            visit "/exercises/#{code_problem.id}"
+
+            expect(page).to have_text('Exam Code Problem')
+            expect(page).to have_text('3 attempts remaining')
+          end
+        end
+
+        feature 'for choice problem' do
+          before { 1.times { choice_problem.submit_solution!(user, content: 'foo') } }
+
+          scenario do
+            visit "/exercises/#{choice_problem.id}"
+
+            expect(page).to have_text('Exam Choice Problem')
+            expect(page).to have_text('1 attempt remaining')
+          end
+        end
+      end
+    end
   end
 end

data/spec/features/exercise_flow_spec.rb

@@ -12,7 +12,7 @@ feature 'Exercise Flow', organization_workspace: :test do
   let!(:problem_4) { build(:problem, name: 'Succ4', description: 'Description of Succ4', layout: :input_bottom, extra: 'x = 2') }
   let!(:problem_5) { build(:problem, name: 'Succ5', description: 'Description of Succ5', layout: :input_right, editor: :upload, hint: 'lele', language: gobstones) }
   let!(:problem_6) { build(:problem, name: 'Succ6', description: 'Description of Succ6', layout: :input_right, editor: :hidden, language: haskell) }
-  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', choices: [{value: 'some choice', checked: true}]) }
+  let!(:problem_7) { build(:problem, name: 'Succ7', description: 'Description of Succ7', editor: :single_choice, choices: [{value: 'some choice', checked: true}]) }
   let!(:playground_1) { build(:playground, name: 'Succ5', description: 'Description of Succ4', layout: :input_right) }
   let!(:playground_2) { build(:playground, name: 'Succ6', description: 'Description of Succ4', layout: :input_right, extra: 'x = 4') }
   let!(:reading) { build(:reading, name: 'Reading about Succ', description: 'Lets understand succ history') }

data/spec/helpers/breadcrumbs_helper_spec.rb

@@ -71,6 +71,32 @@ describe BreadcrumbsHelper, organization_workspace: :test do
     end
   end
 
+  context 'discussion' do
+    let!(:chapter) { create(:chapter, name: 'my chapter', lessons: [lesson]) }
+    let(:lesson) { create(:lesson, name: 'my lesson', exercises: [exercise]) }
+    let(:exercise) { create(:exercise, name: 'my exercise') }
+
+    let(:discussion) { create(:discussion, item: debatable) }
+    let(:breadcrumb) { breadcrumbs_for_discussion(discussion, debatable) }
+
+    before { reindex_current_organization! }
+
+    context 'in exercise' do
+      let(:debatable) { exercise }
+
+      it 'breadcrumb goes mumuki / test organization / chapter / lesson / exercise / discussions / discussion' do
+        expect(breadcrumb).to include('da da-mumuki')
+        expect(breadcrumb).to include('test')
+        expect(breadcrumb).to include('my chapter')
+        expect(breadcrumb).to include('my lesson')
+        expect(breadcrumb).to include('my exercise')
+        expect(breadcrumb).to include('discussions')
+        expect(breadcrumb).to include(discussion.title)
+        expect(breadcrumb).to be_html_safe
+      end
+    end
+  end
+
   context 'book' do
     let(:breadcrumb) { header_breadcrumbs(link_for_organization: false) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 7.4.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: 7.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.3.0
+        version: 7.4.0
 - !ruby/object:Gem::Dependency
   name: mumukit-login
   requirement: !ruby/object:Gem::Requirement
@@ -454,7 +454,6 @@ files:
 - app/helpers/progress_helper.rb
 - app/helpers/reset_button_helper.rb
 - app/helpers/runner_assets_helper.rb
-- app/helpers/status_helper.rb
 - app/helpers/version_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
@@ -475,7 +474,7 @@ files:
 - app/views/errors/not_found.html.erb
 - app/views/errors/unauthorized.html.erb
 - app/views/exams/show.html.erb
-- app/views/exercise_solutions/_contextualization_results.html.erb
+- app/views/exercise_solutions/_contextualization_results_body.html.erb
 - app/views/exercise_solutions/_contextualization_results_container.html.erb
 - app/views/exercise_solutions/_expectations.html.erb
 - app/views/exercise_solutions/_kids_results.html.erb
@@ -483,6 +482,7 @@ files:
 - app/views/exercise_solutions/_out_of_attempts.html.erb
 - app/views/exercise_solutions/_results.html.erb
 - app/views/exercise_solutions/_results_button.html.erb
+- app/views/exercise_solutions/_results_hidden.html.erb
 - app/views/exercise_solutions/_results_title.html.erb
 - app/views/exercises/_exercise_assignment.html.erb
 - app/views/exercises/_read_only.html.erb

data/app/helpers/status_helper.rb

@@ -1,13 +0,0 @@
-module StatusHelper
-  def class_for_status(s)
-    s.to_submission_status.iconize[:class].to_s
-  end
-
-  def icon_type_for_status(s)
-    s.to_submission_status.iconize[:type].to_s
-  end
-
-  def class_for_exercise(exercise)
-    class_for_status(exercise.status_for(current_user))
-  end
-end