mumuki-laboratory 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5419e636836c5d1e4d146042f4312109be2032daed211f10f136de57c356058
-  data.tar.gz: 5bf7264f94c2e47071a06bd4aaf2a9fc06189e33c7ac0a3cafd2e44c5be8494c
+  metadata.gz: cddf5c55fdcb3d1e9376cff1d680af997586ffdba858722d2bb110e4dacea793
+  data.tar.gz: 374c52c8fe4548f9675e6964e7c0ec17d0acaa203f0fc986991f83ca39c62044
 SHA512:
-  metadata.gz: 65414e65c7197323553ace22372ebed883e213215c906385ad73505c76fb73d831081bea67481ff44bcf4c926d887f14a04bd3361eaf264afc0aced6e0b108cb
-  data.tar.gz: 8959efb85d1a1e4bb5c674cae6f70c2091c9e7f93a9c27f868c7429309e6e90e75e146c6360256b92c203f0080095339b44a27e7fd6ea6159bf1e959e4a46c8f
+  metadata.gz: 48090ede128d27abc3788226708cad2e0b0c6313134567ba21309b5eba01369b7f17cbd00a6c2bef6f7977b38b324cdd9380292469679b0b32cc4d5658efdb09
+  data.tar.gz: 42363fa111d1179d003f68aa9850f425bbffe3f9c93a6d00df426025757000572c1dec69002ff830a2642d91d88f472e9b904d63add769686c4fa85a0e76098d

data/app/assets/javascripts/application/kids.js

@@ -97,6 +97,10 @@ mumuki.load(function () {
       return $('#kids-results');
     },
 
+    getResultsAbortedModal: function () {
+      return $('#kids-results-aborted');
+    },
+
     getCharaterImage: function () {
       return $('.mu-kids-character > img');
     },
@@ -120,13 +124,13 @@ mumuki.load(function () {
     },
 
     restart: function () {  // This function is called by the custom runner
-      mumuki.kids._hideFailedMessage();
+      mumuki.kids._hideMessageOnCharacterBubble();
       var $bubble = mumuki.kids.getCharacterBubble();
       Object.keys(mumuki.kids.resultAction).forEach($bubble.removeClass.bind($bubble));
       mumuki.kids.getCharaterImage().attr('src', '/anim_amarillo.svg');
     },
 
-    _hideFailedMessage: function () {
+    _hideMessageOnCharacterBubble: function () {
       var $bubble = mumuki.kids.getCharacterBubble();
       $bubble.find('.mu-kids-character-speech-bubble-tabs').show();
       $bubble.find('.mu-kids-character-speech-bubble-normal').show();
@@ -135,7 +139,7 @@ mumuki.load(function () {
       mumuki.kids.getOverlay().hide();
     },
 
-    _showFailedMessage: function (data) {
+    _showMessageOnCharacterBubble: function (data) {
       var $bubble = mumuki.kids.getCharacterBubble();
       $bubble.find('.mu-kids-character-speech-bubble-tabs').hide();
       $bubble.find('.mu-kids-character-speech-bubble-normal').hide();
@@ -144,10 +148,10 @@ mumuki.load(function () {
       mumuki.kids.getOverlay().show();
     },
 
-    _showOnPopup: function (data) {
+    _showOnSuccessPopup: function (data) {
       mumuki.kids.getSubmissionResult().html(data.html);
       mumuki.kids.getCharaterImage().attr('src', '/amarillo_exito.svg');
-      mumuki.kids._showFailedMessage(data);
+      mumuki.kids._showMessageOnCharacterBubble(data);
       setTimeout(function () {
         var results_kids_modal = mumuki.kids.getResultsModal();
         if (results_kids_modal) {
@@ -157,19 +161,44 @@ mumuki.load(function () {
           });
           results_kids_modal.find('.modal-header').first().html(data.title_html);
           results_kids_modal.find('.modal-footer').first().html(data.button_html);
+          mumuki.kids._showCorollaryCharacter();
         }
       }, 1000 * 4);
     },
 
+    _showOnFailurePopup: function () {
+      mumuki.kids.submitButton.disable();
+      mumuki.kids.getResultsAbortedModal().modal();
+      mumuki.submission.animateTimeoutError(mumuki.kids.submitButton);
+    },
+
     _showOnCharacterBubble: function (data) {
       mumuki.kids.getCharaterImage().attr('src', '/amarillo_fracaso.svg');
-      mumuki.kids._showFailedMessage(data);
+      mumuki.kids._showMessageOnCharacterBubble(data);
+    },
+
+    _showCorollaryCharacter: function () {
+      var image = $('#mu-kids-corollary-animation')[0];
+      setTimeout(function () {
+        image.src = mumuki.characters.magnifying_glass_apparition.url;
+        setTimeout(function () {
+          image.src = mumuki.characters.magnifying_glass_loop.url;
+        }, mumuki.characters.magnifying_glass_apparition.duration);
+      }, 500);
     },
 
     resultAction: {}
 
   };
 
+  _createSubmitButton = function () {
+    var submitButton = $('#kids-btn-retry');
+    var submissionControl = $('.submission_control');
+    return new mumuki.submission.SubmitButton(submitButton, submissionControl);
+  };
+
+  mumuki.kids.submitButton = _createSubmitButton();
+
   mumuki.showKidsResult = function (data) {
     mumuki.updateProgressBarAndShowModal(data);
     if (data.guide_finished_by_solution) return;
@@ -183,9 +212,10 @@ mumuki.load(function () {
     }
   };
 
-  mumuki.kids.resultAction.passed = mumuki.kids._showOnPopup;
-  mumuki.kids.resultAction.aborted = mumuki.kids._showOnPopup;
-  mumuki.kids.resultAction.passed_with_warnings = mumuki.kids._showOnPopup;
+  mumuki.kids.resultAction.passed = mumuki.kids._showOnSuccessPopup;
+  mumuki.kids.resultAction.passed_with_warnings = mumuki.kids._showOnSuccessPopup;
+
+  mumuki.kids.resultAction.aborted = mumuki.kids._showOnFailurePopup;
 
   mumuki.kids.resultAction.failed = mumuki.kids._showOnCharacterBubble;
   mumuki.kids.resultAction.errored = mumuki.kids._showOnCharacterBubble;

data/app/assets/javascripts/application/load-error-svg.js

@@ -1,14 +1,16 @@
 mumuki.load(function () {
-  var svgs = ['403', '404', '500', 'timeout_1', 'timeout_2', 'timeout_3'];
+  var error_svgs = ['403', '404', '500', 'timeout_1', 'timeout_2', 'timeout_3'];
 
   mumuki.errors = mumuki.errors || {};
   mumuki.characters = mumuki.characters || {};
 
-  svgs.forEach(function (svgErrorSuffix) {
+  error_svgs.forEach(function (svgErrorSuffix) {
     addImage(mumuki.errors, 'error_' + svgErrorSuffix, '/');
   });
 
   addImage(mumuki.characters, 'yellow_context', '/character/kids/');
+  addImage(mumuki.characters, 'magnifying_glass_apparition', '/');
+  addImage(mumuki.characters, 'magnifying_glass_loop', '/');
 
   function addImage(object, imageName, urlPrefix) {
     var url = urlPrefix + imageName + '.svg';

data/app/assets/javascripts/application/submission.js

@@ -27,9 +27,9 @@ var mumuki = mumuki || {};
     }
   };
 
-  function SubmitButton() {
-    this.submitButton = $('.btn-submit');
-    this.submissionControls = $('.submission_control');
+  function SubmitButton(submitButton, submissionControls) {
+    this.submitButton = submitButton;
+    this.submissionControls = submissionControls;
   }
 
   SubmitButton.prototype = {
@@ -55,11 +55,14 @@ var mumuki = mumuki || {};
     if (!submissionsResults) return;
 
     var resultsBox = new ResultsBox(submissionsResults);
-    var submitButton = new SubmitButton();
+
+    var btnSubmit = $('.btn-submit');
+    var submissionControl = $('.submission_control');
+    var submitButton = new SubmitButton(btnSubmit, submissionControl);
 
     var bridge = new mumuki.bridge.Laboratory;
 
-    $('.btn-submit').on('click', function (e) {
+    btnSubmit.on('click', function (e) {
       e.preventDefault();
       submitButton.disable();
       resultsBox.waiting();
@@ -101,4 +104,9 @@ var mumuki = mumuki || {};
     }, mumuki.errors.error_timeout_1.duration);
   }
 
+  mumuki.submission = {
+    animateTimeoutError: animateTimeoutError,
+    SubmitButton: SubmitButton
+  };
+
 })(mumuki);

data/app/assets/stylesheets/application/modules/_kids_results.scss

@@ -29,6 +29,21 @@ $capital-animation-width: 135px;
     .submission-results {
       padding: 0;
     }
+    .submission-result-error {
+      padding-bottom: 30px;
+    }
+  }
+}
+
+.mu-kids-default-success {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+  padding: 20px 0 0;
+  img {
+    padding-bottom: 10px;
   }
 }
 

data/app/helpers/assignment_result_helper.rb

@@ -49,6 +49,12 @@ module AssignmentResultHelper
     end
   end
 
+  def manual_evaluation_comment(assignment)
+    if assignment.manual_evaluation_comment?
+      Mumukit::ContentType::Markdown.to_html assignment.manual_evaluation_comment
+    end
+  end
+
   private
 
   def solution_octet_data(assignment)

data/app/models/status_rendering_verbosity.rb

@@ -22,7 +22,7 @@ module StatusRenderingVerbosity
       if status_like.to_mumuki_status.errored?
         []
       else
-        expectation_results.select { |it| it[:result] == :failed }
+        expectation_results.select { |it| it[:result].failed? }
       end
     end
 

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

@@ -0,0 +1,18 @@
+<%
+  @guide = @exercise.guide
+  @stats = @guide.stats_for(current_user)
+%>
+
+<div class="<%= "mu-kids-callout-#{class_for_status assignment.status}" %>">
+  <%= manual_evaluation_comment assignment %>
+</div>
+
+<% if @exercise.corollary.present? %>
+  <img id="mu-kids-corollary-animation" class="capital-animation"/>
+  <%= corollary_box @exercise %>
+<% else %>
+  <div class="mu-kids-default-success">
+    <img src="/amarillo_exito_bailarin.svg" class="capital-animation"/>
+    <p><%= t :kids_default_success %></p>
+  </div>
+<% end %>

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

@@ -4,7 +4,7 @@
       <% if assignment.passed? %>
         <%= next_exercise_button(@exercise) %>
       <% else %>
-        <button class="btn btn-success btn-block" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
+        <button class="btn btn-success btn-block submission-control" id="kids-btn-retry" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
       <% end %>
     </div>
   </div>

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

@@ -3,13 +3,13 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<div class="<%= (@exercise.input_kids? ? 'mu-kids-callout-' : 'bs-callout bs-callout-') + (class_for_status assignment.status) %>">
+<div class="<%= "bs-callout bs-callout-#{class_for_status assignment.status}" %>">
 
-  <%= render partial: 'exercise_solutions/results_title', locals: {assignment: assignment} unless @exercise.input_kids? %>
+  <%= render partial: 'exercise_solutions/results_title', locals: {assignment: assignment} %>
 
-  <% if assignment.manual_evaluation_comment? %>
-      <%= Mumukit::ContentType::Markdown.to_html assignment.manual_evaluation_comment %>
-  <% else %>
+
+  <%= manual_evaluation_comment assignment %>
+  <% unless assignment.manual_evaluation_comment? %>
       <% if assignment.results_visible? %>
           <div>
             <% if assignment.expectation_results_visible? %>
@@ -65,4 +65,4 @@
 
 <%= corollary_box @exercise unless assignment.should_retry? %>
 
-<%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} unless @exercise.input_kids? %>
+<%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

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

@@ -2,10 +2,5 @@
   <h4>
     <strong><%= t :errored %></strong>
   </h4>
-  <div class="submission-result-error-body">
-    <img id="submission-result-error-animation"/>
-    <ul class="submission-result-error-body-description">
-      <%= raw t :abort_explanation %>
-    </ul>
-  </div>
+  <%= render partial: 'layouts/submission_result_error_body' %>
 </div>

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

@@ -0,0 +1,6 @@
+<div class="submission-result-error-body">
+  <img id="submission-result-error-animation"/>
+  <ul class="submission-result-error-body-description">
+    <%= raw t :abort_explanation %>
+  </ul>
+</div>

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

@@ -5,7 +5,7 @@
   <ul class="results-list">
     <% assignment.test_results.each_with_index do |test_result, index| %>
       <li>
-        <% if test_result[:status] == :failed %>
+        <% if test_result[:status].failed? %>
           <span class="text-danger">
             <%= status_icon(test_result[:status]) %>
             <strong class="example-title"><%= test_result[:title] %></strong>

data/app/views/layouts/exercise_inputs/layouts/_input_kids.html.erb

@@ -33,6 +33,7 @@
       </div>
 
       <%= render partial: 'layouts/modals/kids_results', locals: {exercise: @exercise, assignment: @assignment} %>
+      <%= render partial: 'layouts/modals/kids_results_aborted' %>
       <%= render partial: 'layouts/modals/kids_context', locals: {exercise: @exercise, assignment: @assignment} %>
 
     </div>

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

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

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

@@ -0,0 +1,25 @@
+<div class="modal fade kids-results" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title text-broken">
+          <strong><%= t :errored %></strong>
+        </h4>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="submission-result-error">
+                <%= render partial: 'layouts/submission_result_error_body' %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-success btn-block submission_control" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -17,10 +17,14 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   end
 
   def render_results_html(assignment)
-    render_to_string partial: 'exercise_solutions/results',
+    render_to_string partial: results_partial,
                      locals: {assignment: assignment}
   end
 
+  def results_partial
+    @exercise&.input_kids? ? 'exercise_solutions/kids_results' : 'exercise_solutions/results'
+  end
+
   def render_results_title_html(assignment)
     render_to_string partial: 'exercise_solutions/results_title',
                      locals: {assignment: assignment}

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

@@ -82,6 +82,7 @@ en:
   its_been_a_while: It's been a while since you last used Mumuki.
   joining: You're about to join
   keep_learning: Keep learning!
+  kids_default_success: You did it great!
   language: Language
   last_name: Last Name
   last_submission_date: Last submission

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

@@ -90,6 +90,7 @@ es:
   its_been_a_while: Hace un tiempo que no usás Mumuki.
   joining: '¡Te damos la bienvenida al curso <strong>%{course}</strong>!'
   keep_learning: ¡Seguí aprendiendo!
+  kids_default_success: ¡Lo hiciste muy bien!
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido

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

@@ -30,7 +30,7 @@ pt:
   content: Conteúdo
   continue_exercise: Continuar
   continue_lesson: Continue esta lição!
-  continue_practicing: Eu continuei aprendendo!
+  continue_practicing: Continue aprendendo!
   contributors: Autores
   correct_answer: A resposta está correta!
   create_submission: Enviar
@@ -87,7 +87,8 @@ pt:
   invitation: Convite para o curso
   invitation_for: Participe %{curso}
   item_not_accessible: Você não tem permissões para acessar este conteúdo
-  joining: Bem-vindo ao curso <strong> %{curso} </ strong>!
+  joining: Bem-vindo ao curso <strong> %{curso} </strong>!
+  kids_default_success: Você fez muito bem!
   language: Linguagem
   languages: Idiomas
   last_name: Sobrenome

data/lib/mumuki/laboratory/status/base.rb

@@ -19,6 +19,10 @@ module Mumuki::Laboratory::Status::Base
     false
   end
 
+  def failed?
+    false
+  end
+
   def errored?
     false
   end

data/lib/mumuki/laboratory/status/failed.rb

@@ -1,6 +1,10 @@
 module Mumuki::Laboratory::Status::Failed
   extend Mumuki::Laboratory::Status::Base
 
+  def self.failed?
+    true
+  end
+
   def self.should_retry?
     true
   end

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '5.1.1'
+    VERSION = '5.2.0'
   end
 end