mumuki-laboratory 5.8.3 → 5.9.0

data/app/models/concerns/with_discussions.rb

@@ -2,7 +2,7 @@ module WithDiscussions
   extend ActiveSupport::Concern
 
   included do
-    has_many :discussions, as: :item
+    has_many :discussions, as: :item, dependent: :delete_all
   end
 
   def discuss!(user, discussion)

data/app/models/discussion.rb

@@ -2,7 +2,7 @@ class Discussion < ApplicationRecord
   include WithDiscussionStatus, ParentNavigation, WithScopedQueries, Contextualization
 
   belongs_to :item, polymorphic: true
-  has_many :messages, -> { order(:created_at) }
+  has_many :messages, -> { order(:created_at) }, dependent: :delete_all
   belongs_to :initiator, class_name: 'User'
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
   has_many :subscriptions
@@ -123,6 +123,12 @@ class Discussion < ApplicationRecord
     responses_count > 0
   end
 
+  def extra_preview_html
+    # FIXME this is buggy, because the extra
+    # may have changed since the submission of this discussion
+    exercise.assignment_for(initiator).extra_preview_html
+  end
+
   def self.debatable_for(klazz, params)
     debatable_id = params[:"#{klazz.underscore}_id"]
     klazz.constantize.find(debatable_id)

data/app/models/exam.rb

@@ -126,4 +126,18 @@ class Exam < ApplicationRecord
       exams.destroy_all
     end
   end
+
+  def attempts_left_for(assignment)
+    max_attempts_for(assignment) - (assignment.attempts_count || 0)
+  end
+
+  def limited?
+    true
+  end
+
+  private
+
+  def max_attempts_for(assignment)
+    assignment.choice? ? max_choice_submissions : max_problem_submissions
+  end
 end

data/app/models/exercise.rb

@@ -22,6 +22,7 @@ class Exercise < ApplicationRecord
                         :guide
 
   randomize :description, :hint, :extra, :test, :default_content
+  delegate :limited?, :timed?, to: :navigable_parent
 
   def console?
     queriable?
@@ -69,7 +70,7 @@ class Exercise < ApplicationRecord
   end
 
   def submission_for(user)
-    assignment_for(user)&.submission
+    assignment_for(user).submission
   end
 
   def new_solution
@@ -142,6 +143,21 @@ class Exercise < ApplicationRecord
     {}
   end
 
+  def default_content
+    self[:default_content] || ''
+  end
+
+  # Submits the user solution
+  # only if the corresponding assignment has attemps left
+  def try_submit_solution!(user, solution={})
+    assignment = assignment_for(user)
+    if assignment.attempts_left?
+      submit_solution!(user, solution)
+    else
+      assignment
+    end
+  end
+
   private
 
   def evaluation_class

data/app/models/exercise/challenge.rb

@@ -1,11 +1,7 @@
 class Challenge < Exercise
   include WithLayout
 
-  markdown_on :hint, :extra_preview
-
-  def extra_preview(user)
-    Mumukit::ContentType::Markdown.highlighted_code(language.name, extra_for(user))
-  end
+  markdown_on :hint
 
   def reset!
     super

data/app/models/guide.rb

@@ -15,7 +15,7 @@ class Guide < Content
   def clear_progress!(user)
     transaction do
       exercises.each do |exercise|
-        exercise.assignment_for(user)&.destroy!
+        exercise.find_assignment_for(user)&.destroy!
       end
     end
   end

data/app/models/language.rb

@@ -65,6 +65,20 @@ class Language < ApplicationRecord
     new_directive Mumukit::Directives::Sections
   end
 
+
+  def assets_urls_for(kind, content_type)
+    send "#{kind}_#{content_type}_urls"
+  end
+
+  # TODO this should be a Mumukit::Directives::Directive
+  # and be part of a pipeline
+  def interpolate_references_for(assignment, field)
+    interpolate(field, assignment.submitter.interpolations, lambda { |content| replace_content_reference(assignment, content) })
+  end
+
+  private
+
+  # TODO we should use Mumukit::Directives::Pipeline
   def interpolate(interpolee, *interpolations)
     interpolations.inject(interpolee) { |content, interpolation| directives_interpolations.interpolate(content, interpolation).first }
   end
@@ -73,17 +87,20 @@ class Language < ApplicationRecord
     new_directive Mumukit::Directives::Interpolations
   end
 
-  def directives_comment_type
-    Mumukit::Directives::CommentType.parse comment_type
+  def replace_content_reference(assignment, interpolee)
+    case interpolee
+    when /previousContent|previousSolution/
+      assignment.current_content_at(-1)
+    when /(solution|content)\[(-?\d*)\]/
+      assignment.current_content_at($2.to_i)
+    end
   end
 
-  def assets_urls_for(kind, content_type)
-    send "#{kind}_#{content_type}_urls"
-  end
-
-  private
-
   def new_directive(directive_type)
     directive_type.new.tap { |it| it.comment_type = directives_comment_type }
   end
+
+  def directives_comment_type
+    Mumukit::Directives::CommentType.parse comment_type
+  end
 end

data/app/models/submission/submission.rb

@@ -46,7 +46,7 @@ class Submission
 
   def save_results!(results, assignment)
     assignment.assign_attributes results
-    assignment.increment_attemps!
+    assignment.increment_attempts!
     assignment.save! results
   end
 

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

@@ -21,7 +21,7 @@
     </div>
     <div class="discussion-message-bubble-content">
       <div class="discussion-message-content">
-        <%= message.content_html %>
+        <%= sanitize message.content_html %>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,6 @@
+<div class="bs-callout bs-callout-broken submission-result-pending">
+  <h4>
+    <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

@@ -29,9 +29,9 @@
   <%= solution_download_link assignment %>
 <% end %>
 
-<% if assignment.should_retry? %>
-  <%= assistance_box assignment %>
-<% else %>
+<% if assignment.passed? %>
   <%= corollary_box @exercise %>
+<% else %>
+  <%= assistance_box assignment %>
 <% end %>
 <%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

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

@@ -93,7 +93,7 @@
       </div>
 
       <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-        <%= exercise.extra_preview_html(@discussion.initiator) %>
+        <%= @discussion.extra_preview_html %>
       </div>
     </div>
   <% else %>

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

@@ -17,5 +17,5 @@
     <div class="description"><%= exercise.description_task %></div>
     <div class="hint" style="display: none"><%= exercise.hint_html %></div>
   </div>
-  <div class="mu-kids-character-speech-bubble-failed <%= @assignment&.status %>" style="display: none"></div>
+  <div class="mu-kids-character-speech-bubble-failed <%= @assignment.status %>" style="display: none"></div>
 </div>

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

@@ -7,7 +7,7 @@
           <%= image_tag(org.banner_url, height: 50, class: 'pull-left') %>
         </div>
         <div class="col-md-6 organization-row">
-          <%= link_to(t(:go_to, organization: org.name), org.url_for(request.path), class: 'btn btn-success pull-right') %>
+          <%= link_to(t(:go_to, organization: org.name), organization_switch_url(org), class: 'btn btn-success pull-right') %>
         </div>
       </div>
   <% end %>

data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb

@@ -1,5 +1,5 @@
 <%= hidden_field_tag :console_endpoint, exercise_tries_path(exercise) %>
-<%= hidden_field_tag :historical_queries, @assignment&.queries_with_results.to_json %>
+<%= hidden_field_tag :historical_queries, @assignment.queries_with_results.to_json %>
 
 <% if exercise.extra_visible? %>
   <ul class="nav nav-tabs" role="tablist">
@@ -12,7 +12,7 @@
 
 <div class="tab-content">
   <div role="tabpanel" class="tab-pane mu-input-panel fade in active <%= pending_messages_filter(@assignment) %>" id="console">
-    <% if @assignment&.pending_messages? %>
+    <% if @assignment.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
              onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
@@ -29,18 +29,18 @@
     </div>
    </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= exercise.extra_preview_html(current_user) %>
+    <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
-    <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} if @assignment %>
+    <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} unless @assignment.pending? %>
   </div>
 </div>
-
+<%# FIXME Duplicated view in problem_form %>
 <% content_for :submission_results do %>
   <% if current_user? %>
     <div class="row">
       <div class="col-md-12 submission-results">
-        <% if @assignment&.passed?  %>
+        <% if @assignment.passed?  %>
           <%= render partial: 'exercise_solutions/results',
                      locals: {assignment: @assignment, guide_finished_by_solution: false} %>
         <% end %>

data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb

@@ -4,7 +4,7 @@
   <%= render_exercise_input_editor f, exercise %>
 
   <div class="actions mu-kids-submit-button">
-    <%= render_submit_button(exercise) %>
+    <%= render_submit_button(@assignment) %>
   </div>
   <div class="actions mu-kids-reset-button"></div>
   <img class="mu-kids-compass-rose" src="/compass_rose.svg">

data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb

@@ -18,7 +18,7 @@
     </div>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= exercise.extra_preview_html(current_user) %>
+    <%= @assignment.extra_preview_html %>
   </div>
 </div>
 <div class="actions">

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -18,7 +18,7 @@
 
 <div class="tab-content">
   <div role="tabpanel" class="tab-pane mu-input-panel fade in active" id="editor">
-    <% if @assignment&.pending_messages? %>
+    <% if @assignment.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
              onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
@@ -34,7 +34,7 @@
       <%= render_exercise_input_editor f, exercise %>
 
       <div class="actions">
-        <%= render_submit_button(exercise) %>
+        <%= render_submit_button(@assignment) %>
       </div>
     <% end %>
   </div>
@@ -52,10 +52,10 @@
     </div>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= exercise.extra_preview_html(current_user) %>
+    <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
-    <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} if @assignment %>
+    <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} unless @assignment.pending? %>
   </div>
 </div>
 
@@ -63,7 +63,7 @@
   <% if current_user? %>
     <div class="row">
       <div class="col-md-12 submission-results">
-        <% if @assignment %>
+        <% unless @assignment.pending? %>
           <%= render partial: 'exercise_solutions/results',
                      locals: {assignment: @assignment} %>
         <% end %>

data/app/views/layouts/exercise_inputs/read_only_editors/_text.erb

@@ -0,0 +1,3 @@
+<div class="field form-group">
+  <%= Mumukit::ContentType::Markdown.to_html(Mumukit::ContentType::Markdown.code(content)) %>
+</div>

data/app/views/layouts/modals/_kids_results.html.erb

@@ -9,7 +9,7 @@
             <div class="col-md-12">
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <% if @assignment&.passed? %>
+                  <% if @assignment.passed? %>
                     <%= render partial: 'exercise_solutions/kids_results',
                                  locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>

data/db/migrate/20180725145801_add_submissions_caps_to_exams.rb

@@ -0,0 +1,6 @@
+class AddSubmissionsCapsToExams < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exams, :max_problem_submissions, :integer
+    add_column :exams, :max_choice_submissions, :integer
+  end
+end

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

@@ -2,7 +2,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   extend ActiveSupport::Concern
 
   included do
-    include ProgressBarHelper
+    include ProgressBarHelper, ExerciseInputHelper
 
     before_action :set_guide_previously_done!
   end
@@ -14,16 +14,18 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
       html: render_results_html(assignment),
       title_html: render_results_title_html(assignment),
       button_html: render_results_button_html(assignment),
-      expectations_html: render_results_expectations_html(assignment))
+      expectations_html: render_results_expectations_html(assignment),
+      remaining_attempts_html: remaining_attempts_text(assignment))
   end
 
   def render_results_html(assignment)
-    render_to_string partial: results_partial,
+    render_to_string partial: results_partial(assignment),
                      locals: {assignment: assignment}
   end
 
-  def results_partial
-    @exercise&.input_kids? ? 'exercise_solutions/kids_results' : 'exercise_solutions/results'
+  def results_partial(assignment)
+    return 'out_of_attempts' unless assignment.attempts_left?
+    assignment.input_kids? ? 'exercise_solutions/kids_results' : 'exercise_solutions/results'
   end
 
   def render_results_title_html(assignment)

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

@@ -15,6 +15,9 @@ en:
   ask_community: Ask community for help
   ask_redirect: Do you want to go there?
   ask_the_first_question: Be the first one to ask!
+  attempts_left:
+    zero: "You've run out of attempts "
+    other: '%{count} attempts remaining'
   author: Author
   authoring: "Authoring"
   authoring_note: This guide's content was developed by %{authors} and <a href="%{collaborators}" target="_blank">many others</a>, under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
@@ -143,6 +146,7 @@ en:
   office: Office
   opened: Open
   opened_count: '%{count} opened'
+  out_of_attempts: You've run out of attempts. You should proceed to the next exercise!
   output: Output
   overview: Overview
   passed: Everything is in order! Your solution passed all our tests!

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

@@ -16,6 +16,10 @@ es:
   ask_community: Preguntá a la comunidad
   ask_redirect: ¿Querés que te llevemos ahí?
   ask_the_first_question: ¡Hacé la primera pregunta!
+  attempts_left:
+    zero: 'Te quedaste sin intentos'
+    one: '1 intento restante'
+    other: '%{count} intentos restantes'
   author: Autor
   authoring: "Autores"
   authoring_note: Esta guía fue desarrollada por %{authors} y <a href="%{collaborators}" target="_blank">muchas personas más</a>, bajo los términos de la <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Licencia Creative Commons Compartir-Igual, 4.0</a>.
@@ -161,6 +165,7 @@ es:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
+  out_of_attempts: Te quedaste sin intentos. ¡Seguí al proximo ejercicio!
   output: Salida
   overview: Vista general
   passed: ¡Muy bien! Tu solución pasó todas las pruebas

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

@@ -16,6 +16,9 @@ pt:
   ask_community: Pergunte à comunidade
   ask_redirect: Você quer que nós o levemos para lá?
   ask_the_first_question: Faça a primeira pergunta!
+  attempts_left:
+    zero: 'Você ficou sem tentativas'
+    other: '%{count} tentativa restante'
   author: Autor
   authoring: Autores
   authoring_note: 'Este guia foi desenvolvido por %{authors} e <a href="%{collaborators}" target="_blank"> muitas outras pessoas </a>, nos termos do <a href = "https://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> Creative Commons License Share-Equal, 4.0 </a>.'
@@ -154,6 +157,7 @@ pt:
   opened: Aberto
   opened_count: '%{count} aberto'
   organizations: Organizações
+  out_of_attempts: Você ficou sem tentativas. Você deve prosseguir para o próximo exercício!
   output: Sair
   overview: Visão global
   passed: Muito bem! Sua solução passou todos os testes

data/lib/mumuki/laboratory/mumukit/directives.rb

@@ -1,6 +1,7 @@
 require 'mumukit/directives'
 
 class Mumukit::Directives::Sections < Mumukit::Directives::Directive
+  # TODO Move this behaviour to gem
   def join(sections)
     file_declarations, file_references = sections.map do |section, content|
       [build(section, content), interpolate(section)]