RubyGems - mumuki-laboratory - Versions diffs - 7.3.1 → 7.5.1 - Mend

mumuki-laboratory 7.3.1 → 7.5.1

Files changed (585) hide show

data/app/views/layouts/_exercise_skipped.html.erb ADDED

@@ -0,0 +1,28 @@
+<div class="modal fade mu-exercise-skipped" id="exercise-skipped" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <p class="modal-title text-center title-font"><%= t :skipped_congratulations %></p>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <%= t :skipped_description %>
+          <%= link_to (t :skipped_solve_anyway), "", "data-dismiss" => "modal" %>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <div class="row">
+          <div class="col-md-12">
+            <%= next_exercise_button(@exercise) %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+  $("#exercise-skipped").modal({
+    backdrop: 'static',
+    keyboard: false
+  });
+</script>

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

@@ -1,27 +1,30 @@
-<% if contextualization.single_visual_result? %>
-  <%= contextualization.single_visual_result_html %>
+<% if contextualization.single_visible_test_result? %>
+  <div class="mu-single-test-result">
+    <h5 class="text-danger mu-test-result-header"><%= render_test_result_header contextualization.affable_test_results.first %></h5>
+    <%= contextualization.first_test_result_html %>
+  </div>
 <% else %>
   <strong><%= t :test_results %>:</strong>
-  <ul class="results-list">
-    <% contextualization.test_results.each_with_index do |test_result, index| %>
+  <ul class="results-list mu-multiple-test-results">
+    <% contextualization.affable_test_results.each_with_index do |test_result, index| %>
       <li>
         <% if test_result[:status].failed? %>
-          <span class="text-danger">
+          <span class="text-danger mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
-            <strong class="example-title"><%= test_result[:title] %></strong>
+            <%= render_test_result_header test_result %>
             <% unless contextualization.visible_success_output? %>
               <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more"><%= t :view_details %></a>
             <% end %>
           </span>
         <% else %>
-          <span class="text-success example-title">
+          <span class="text-success mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
             <%= test_result[:title] %>
           </span>
         <% end %>
         <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
-          <%= contextualization.output_content_type.to_html test_result[:result] %>
+          <%= contextualization.test_result_html test_result %>
         </div>
       </li>
     <% end %>

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

@@ -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/app/views/layouts/exercise_inputs/editors/_code.html.erb CHANGED

@@ -4,13 +4,14 @@
                   class: 'form-control editor',
                   value: @current_content,
                   data: {lines: 17} %>
-  <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
-    <span class="fa-stack fa-lg">
-      <i class="fa fa-square-o fa-stack-2x"></i>
-      <i class="fa fa-expand fa-stack-1x"></i>
-    </span>
-  </a>
   <div class="mu-overlapped">
-    <a class="editor-reset submission-reset"><%= restart_icon %></a>
+    <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
+      <span class="fa-stack fa-lg">
+        <i class="fa fa-square-o fa-stack-2x"></i>
+        <i class="fa fa-expand fa-stack-1x"></i>
+      </span>
+    </a>
+    <a class="editor-format"><%= format_icon %></a>
+    <a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
   </div>
 </div>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb CHANGED

@@ -26,15 +26,14 @@
       <% end %>
     </div>
-    <a class="editor-resize multiple-files" title="<%= t(:fullscreen) %> (F11)">
-      <span class="fa-stack fa-lg">
-        <i class="fa fa-square-o fa-stack-2x"></i>
-        <i class="fa fa-expand fa-stack-1x"></i>
-      </span>
-    </a>
     <div class="mu-overlapped">
-      <a class="editor-reset submission-reset"><%= restart_icon %></a>
+      <a class="editor-resize multiple-files" title="<%= t(:fullscreen) %> (F11)">
+        <span class="fa-stack fa-lg">
+          <i class="fa fa-square-o fa-stack-2x"></i>
+          <i class="fa fa-expand fa-stack-1x"></i>
+        </span>
+      </a>
+      <a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
     </div>
   </div>

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

@@ -28,7 +28,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
    </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
@@ -40,7 +40,7 @@
   <% if current_user? %>
     <div class="row">
       <div class="col-md-12 submission-results">
-        <% if @assignment.passed?  %>
+        <% if @assignment.solved?  %>
           <%= render partial: 'exercise_solutions/results',
                      locals: {assignment: @assignment, guide_finished_by_solution: false} %>
         <% end %>

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

@@ -17,7 +17,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
 </div>

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

@@ -51,7 +51,7 @@
       <label for="include_solution"><p><%= t(:load_solution_into_console) %></p></label>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">

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

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

data/app/views/user_mailer/1st_reminder.html.erb CHANGED

@@ -313,7 +313,7 @@
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/1st_reminder.text.erb CHANGED

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/2nd_reminder.html.erb CHANGED

@@ -313,7 +313,7 @@
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/2nd_reminder.text.erb CHANGED

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/3rd_reminder.html.erb CHANGED

@@ -313,7 +313,7 @@
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/3rd_reminder.text.erb CHANGED

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/no_submissions_reminder.html.erb CHANGED

@@ -313,7 +313,7 @@
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/no_submissions_reminder.text.erb CHANGED

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/users/_user_form.html.erb CHANGED

@@ -1,7 +1,7 @@
 <%= form_for :user, url: update_user_path, method: :put do |f| %>
   <div class="row mu-tab-body">
     <div class="col-md-4 text-center">
-      <%= image_tag @user.image_url, size: '250x250', class: 'img-circle' %>
+      <%= image_tag @user.profile_picture, size: '250x250', class: 'img-circle' %>
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>

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

@@ -2,6 +2,7 @@ module Mumuki::Laboratory::Controllers
 end
 require_relative './controllers/authorization'
+require_relative './controllers/disabling'
 require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'

data/lib/mumuki/laboratory/controllers/authorization.rb CHANGED

@@ -1,8 +1,4 @@
 module Mumuki::Laboratory::Controllers::Authorization
-  def from_sessions?
-    params['controller'] == 'login'
-  end
   def authorize_if_private!
     return if Organization.current.public? || from_sessions?
     authorize! :student

data/lib/mumuki/laboratory/controllers/disabling.rb ADDED

@@ -0,0 +1,5 @@
+module Mumuki::Laboratory::Controllers::Disabling
+  def ensure_user_enabled!
+    current_user.ensure_enabled! unless from_sessions?
+  end
+end

data/lib/mumuki/laboratory/controllers/dynamic_errors.rb CHANGED

@@ -14,6 +14,7 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::UnauthorizedError, with: :unauthorized
     rescue_from Mumuki::Domain::GoneError, with: :gone
     rescue_from Mumuki::Domain::BlockedForumError, with: :blocked_forum
+    rescue_from Mumuki::Domain::DisabledError, with: :disabled
     rescue_from ActiveRecord::RecordInvalid, with: :bad_record
   end
@@ -41,6 +42,10 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     render_error 'forbidden', 403, locals: { explanation: :forbidden_explanation }, error_message: message
   end
+  def disabled
+    render_error 'forbidden', 403, locals: { explanation: :disabled_explanation }
+  end
   def blocked_forum
     render_error 'forbidden', 403, locals: { explanation: :blocked_forum_explanation }
   end

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

@@ -10,22 +10,25 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   def render_results_json(assignment, results = {})
     if assignment.input_kids?
       merge_kids_specific_renders(assignment, results)
-      render_results = 'exercise_solutions/kids_results'
+      layout = 'exercise_solutions/kids_results'
     else
-      render_results = 'exercise_solutions/results'
+      layout = 'exercise_solutions/results'
     end
-    render json: results.merge(progress_json).merge(
-        html: render_results_html(render_results, assignment),
-        remaining_attempts_html: remaining_attempts_text(assignment))
+    render json: results
+                  .merge(progress_json)
+                  .merge(
+                    html: render_results(layout, assignment),
+                    remaining_attempts_html: remaining_attempts_text(assignment))
   end
   def merge_kids_specific_renders(assignment, results)
     results.merge!(
-        button_html: render_results_button_html(assignment),
-        title_html: render_results_title_html(assignment),
-        expectations_html: render_results_expectations_html(assignment),
-        test_results: assignment.test_results)
+        button_html: render_results_button(assignment),
+        title_html: render_results_title(assignment),
+        expectations: assignment.affable_expectation_results,
+        tips: assignment.affable_tips,
+        test_results: assignment.affable_test_results)
   end
   def progress_json
@@ -35,27 +38,21 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
     }
   end
-  def render_results_html(results_partial, assignment)
-    results_partial = 'out_of_attempts' unless assignment.attempts_left?
+  def render_results(results_partial, assignment)
     render_to_string partial: results_partial,
                      locals: {assignment: assignment}
   end
-  def render_results_title_html(assignment)
+  def render_results_title(assignment)
     render_to_string partial: 'exercise_solutions/results_title',
                      locals: {contextualization: assignment}
   end
-  def render_results_button_html(assignment)
+  def render_results_button(assignment)
     render_to_string partial: 'exercise_solutions/kids_results_button',
                      locals: {assignment: assignment}
   end
-  def render_results_expectations_html(assignment)
-    render_to_string partial: 'exercise_solutions/expectations',
-                     locals: {assignment: assignment}
-  end
   def guide_finished_by_solution?
     !@guide_previously_done && @exercise.guide_done_for?(current_user)
   end

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

@@ -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"
@@ -39,6 +40,7 @@ en:
   created_at_desc: Newest
   comment: Comment
   confirm: Confirm
+  confirm_reset: You are about to restart your exercise. Do you want to proceed?
   confirm_restart: You are about to delete your progress for this guide. Do you want to proceed?
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact the admin: %{link}'
@@ -52,8 +54,9 @@ en:
   created_at: Created at
   date: Date
   description: Description
-  destroy: Destroy
   destroy_message: delete the message
+  destroy: Destroy
+  disabled_explanation: You are trying to visit a permamently disabled or deleted resource
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -86,6 +89,7 @@ en:
   finish: Finish
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
+  format: Format
   gender: Gender
   go_to: 'Go to %{organization}'
   gone_explanation: This content is no longer available.
@@ -181,6 +185,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
@@ -190,6 +195,10 @@ en:
   sign_in_action: sign in
   sign_out: Sign Out
   sign_up_date: User since
+  skipped: You are doing very well, so you've passed this exercise.
+  skipped_congratulations: Well done!
+  skipped_description: You are doing very well, so you've passed this exercise.
+  skipped_solve_anyway: Solve anyway
   solution: Solution
   solved: Solved
   solved_count: '%{count} solved'
@@ -218,7 +227,6 @@ en:
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_and_conditions: Terms and conditions
   test_results: Test results
-  test_results: Tests results
   time_ago: "%{time} ago"
   time_left: You have
   title: Title
@@ -228,6 +236,7 @@ en:
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   undo_upvote: Undo upvote
+  unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.

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

@@ -43,6 +43,7 @@ es:
   created_at_desc: Nuevas
   comment: Comentar
   confirm: Confirmar
+  confirm_reset: Estás por reiniciar tu ejercicio. ¿Querés continuar?
   confirm_restart: Estás por borrar tu progreso en esta guía. ¿Querés continuar?
   console: Consola
   contact_administrator: 'Si pensás que es un error, comunicate con la persona que administra esta organización: %{link}'
@@ -59,9 +60,10 @@ es:
   day: Día
   days: Días
   description: Descripción
-  destroy: Eliminar
   destroy_message: eliminar el mensaje
+  destroy: Eliminar
   details: Detalles
+  disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -93,6 +95,7 @@ es:
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
+  format: Dar formato
   gender: Género
   go_to: 'Ir a %{organization}'
   gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este contenido.
@@ -199,6 +202,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
@@ -210,6 +214,10 @@ es:
   sign_in_action: iniciar sesión
   sign_out: Cerrar Sesión
   sign_up_date: Usuario desde
+  skipped: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_congratulations: ¡Bien hecho!
+  skipped_description: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_solve_anyway: Resolver de todos modos
   solution: Solución
   solved: Resuelta
   solved_count:
@@ -252,6 +260,7 @@ es:
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
   uncategorized: No categorizado
   undo_upvote: No es útil
+  unspecified: Prefiero no decirlo
   unmeet_expectations: Objetivos que no se cumplieron
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.