mumuki-laboratory 7.12.1 → 8.1.2

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

@@ -1,4 +1,4 @@
-<div class="modal fade guide-corollary" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade guide-corollary mu-kids-modal-border" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">

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

@@ -1,4 +1,4 @@
-<div class="modal fade mu-kids-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-context mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">

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

@@ -1,17 +1,27 @@
-<div class="modal fade mu-kids-results" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
+    <div class="modal-content success">
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
+      </button>
+      <div class="modal-header text-center">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="row">
-                <div class="col-md-12 submission-results">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results">
                   <% if current_user? && @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
-                                 locals: {assignment: @assignment, guide_finished_by_solution: false} %>
+                               locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>
                 </div>
               </div>

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

@@ -1,22 +1,22 @@
-<div class="modal fade mu-kindergarten-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-times fa-3x"></i>
-            </span>
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
       </button>
-      <button type="button" class="mu-kindergarten-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-arrow-left fa-3x"></i>
-            </span>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
       </button>
-      <button type="button" class="mu-kindergarten-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-arrow-right fa-3x"></i>
-            </span>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
       </button>
-      <div class="modal-body">
+      <div class="modal-body mu-kids-context-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">

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

@@ -1,17 +1,30 @@
-<div class="modal fade mu-kids-results mu-kindergarten-context" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">
-              <i class="fa fa-fw fa-times fa-3x"></i>
-            </span>
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
       </button>
       <div class="modal-header">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
-            <div class="col-md-12 submission-results">
+            <div class="col-md-12">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results kindergarten"></div>
+              </div>
             </div>
           </div>
         </div>

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

@@ -1,7 +1,7 @@
-<div class="modal fade mu-kids-results-aborted mu-kindergarten-context" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results-aborted mu-kids-modal-border" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content broken">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
+    <div class="modal-content broken kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
             <span aria-hidden="true">
               <i class="fa fa-fw fa-times fa-3x"></i>
             </span>
@@ -15,7 +15,7 @@
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="mu-kids-character">
+              <div class="mu-kids-character kindergarten">
                 <img class="mu-kids-character-result-aborted"/>
               </div>
             </div>

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

@@ -0,0 +1,27 @@
+<div class="modal fade mu-level-up" id="mu-level-up" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span></button>
+        <div class="guide-corollary-title">
+          <h3 class="text-left" id="gridSystemModalLabel"><%= t :level_up %></h3>
+        </div>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="text-center mu-level">
+                <i class="fa fa-star fa-fw fa-4x"></i>
+                <span class="mu-level-number"></span>
+                <p></p>
+                <p id="mu-solve-more-exercises"> <%= (t :solve_more_exercises_to_level_up).html_safe %></p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/users/_edit_user_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :user, url: update_user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
+<%= form_for :user, url: user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
     <div class="mu-profile-actions hidden-xs">

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

@@ -5,10 +5,20 @@
   </div>
 </div>
 <div class="row mu-tab-body">
-  <div class="col-md-4 text-center">
+  <div class="col-md-4 mu-profile-info-left">
     <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+    <% if in_gamified_context? %>
+      <svg class="mu-level-progress" width="300" height="300" viewBox="0 0 100 100">
+        <path id="mu-level-progress" stroke-linecap="round" stroke="#24b8aa" stroke-width="4" stroke-dasharray="0, 999" fill="none" d="M50 10 a 40 40 0 0 1 0 80 a 40 40 0 0 1 0 -80"></path>
+      </svg>
+      <div class="mu-level">
+        <i class="fa fa-star fa-fw fa-4x"></i>
+        <span class="mu-level-number"></span>
+        <p><%= t :level %></p>
+      </div>
+    <% end %>
   </div>
-  <div class="col-md-8 mu-profile-info">
+  <div class="col-md-8 mu-profile-info-right">
     <% if @user.age.present? %>
       <div>
         <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>

data/app/views/users/terms.html.erb

@@ -16,3 +16,15 @@
   <% end %>
 </div>
 
+<% if @user&.has_role_terms_to_accept? %>
+  <div class="terms-acceptance">
+    <%= form_for :user, url: terms_user_path, method: :post  do |f| %>
+      <span class="terms-acceptance-checkbox">
+        <%= f.check_box :terms_of_service, required: true, onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')", onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
+        <%= t(:accept_terms) %>
+      </span>
+      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+    <% end %>
+  </div>
+<% end %>
+

data/config/routes.rb

@@ -52,11 +52,15 @@ Rails.application.routes.draw do
     resources :complements, only: :show
     resources :exams, only: :show
 
-    # All users
-    resource :user, only: [:show, :edit]
-    get '/user/terms' => 'users#terms'
-
     # Current user
+    resource :user, only: [:show, :edit, :update] do
+      get :terms
+      post :terms, to: 'users#accept_profile_terms'
+
+      # Notification subscriptions
+      get :unsubscribe
+    end
+
     resources :messages, only: [:index, :create]
     get '/messages/errors' => 'messages#errors'
 
@@ -69,10 +73,6 @@ Rails.application.routes.draw do
     get '/join/:code' => 'invitations#show', as: :invitation
     post '/join/:code' => 'invitations#join'
 
-    # Notification subscriptions
-    get '/user/unsubscribe' => 'users#unsubscribe'
-    put '/user' => 'users#update', as: :update_user
-
     # Route for reading messages
     post '/messages/read_messages/:exercise_id' => 'messages#read_messages', as: :read_messages
 

data/lib/mumuki/laboratory.rb

@@ -31,12 +31,25 @@ end
 
 module Mumukit::Platform::OrganizationMapping::Path
   class << self
-    patch :organization_name do |request, domain, hyper|
-      name = hyper.(request, domain)
-      if %w(auth login logout).include? name
-        'base'
+    alias_method :__organization_name__, :organization_name
+    def in_actual_organization?(request, domain = nil)
+      actual_organization_name(request, domain).present?
+    end
+
+    def actual_organization_name(request, domain)
+      name = __organization_name__(request, domain)
+      name unless %w(auth login logout).include? name
+    end
+
+    def organization_name(request, domain)
+      actual_organization_name(request, domain) || 'base'
+    end
+
+    patch :inorganic_path_for do |request, hyper|
+      if in_actual_organization?(request)
+        hyper.call(request)
       else
-        name
+        path_for(request)
       end
     end
   end

data/lib/mumuki/laboratory/controllers.rb

@@ -2,12 +2,14 @@ module Mumuki::Laboratory::Controllers
 end
 
 require_relative './controllers/authorization'
+require_relative './controllers/action_redirector'
 require_relative './controllers/disabling'
 require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'
 require_relative './controllers/embedded_mode'
 require_relative './controllers/incognito_mode'
+require_relative './controllers/immersive_navigation'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
 require_relative './controllers/exercise_seed'

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

@@ -0,0 +1,21 @@
+module Mumuki::Laboratory::Controllers::ActionRedirector
+  def save_location_before!(action)
+    session[redirection_variable_for(action)] = origin
+  end
+
+  def redirect_after!(action, fallback_location: root_path)
+    redirection_variable = redirection_variable_for(action)
+    destination = session.delete(redirection_variable).presence
+    redirect_to(destination || fallback_location)
+  end
+
+  private
+
+  def redirection_variable_for(action)
+    "redirect_after_#{action}"
+  end
+
+  def origin
+    Addressable::URI.heuristic_parse(request.path).to_s
+  end
+end

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

@@ -0,0 +1,7 @@
+module Mumuki::Laboratory::Controllers::ImmersiveNavigation
+  extend ActiveSupport::Concern
+
+  def immersive_subject
+    subject.navigable_content_in(current_immersive_context)
+  end
+end

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

@@ -29,6 +29,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
         title_html: render_results_title(assignment),
         expectations: assignment.affable_expectation_results,
         tips: assignment.affable_tips,
+        level_up_html: render_results('exercise_solutions/kids_level_up', assignment),
         test_results: assignment.sanitized_affable_test_results) # these results could include escaped characters so they should be rendered as HTML to display properly
   end
 

data/lib/mumuki/laboratory/events/events.rb

@@ -1,39 +1,6 @@
 Mumukit::Nuntius::EventConsumer.handle do
-
-  # Emitted by user registration and modification in classroom
-  event 'UserChanged' do |payload|
-    User.import_from_resource_h! payload.deep_symbolize_keys[:user]
-  end
-
-  # Emitted by course creation of courses in classroom
-  event 'CourseChanged' do |payload|
-    Course.import_from_resource_h! payload.deep_symbolize_keys[:course]
-  end
-
-  # Emitted by invitation creation in classroom
-  event 'InvitationCreated' do |payload|
-    Invitation.import_from_resource_h! payload.deep_symbolize_keys[:invitation]
-  end
-
-  # Emitted by exam creation and modification in classroom
-  event 'UpsertExam' do |body|
-    Exam.import_from_resource_h! body
-  end
-
-  event 'UpsertExamStudents' do |body|
-    Exam.upsert_students! body
-  end
-
   # Emitted by assigment manual evaluation in classroom
   event 'AssignmentManuallyEvaluated' do |payload|
     Assignment.evaluate_manually! payload.deep_symbolize_keys[:assignment]
   end
-
-  [Book, Topic, Guide].each do |it|
-    event "#{it.name}Changed" do |data|
-      Mumukit::Sync::Syncer.new(
-        Mumukit::Sync::Store::Bibliotheca.new(
-          Mumukit::Platform.bibliotheca_bridge)).locate_and_import! it, data[:slug]
-    end
-  end
 end

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

@@ -95,6 +95,7 @@ en:
   exercise_number: Exercise %{number}
   exercise_success_rate: Exercises success rate
   exit: Exit
+  exp_points: experience points.
   expectations: Expectations
   expected_state: Expected board
   explain_redirect: You have registered in another organization
@@ -145,6 +146,8 @@ en:
   lessons: Lessons
   lesson_number: Lesson %{number}
   let_us_know: please let us know!
+  level: Level
+  level_up: Level up!
   loading: Loading
   load_solution_into_console: Load your solution into the console
   locked_content: 'This content will be unlocked when you finish previous chapters'
@@ -233,6 +236,7 @@ en:
   solved: Solved
   solved_count: '%{count} solved'
   solve_doubts: Solve other's doubts
+  solve_more_exercises_to_level_up: Solve <span>number</span> more exercises to advance to the next level.
   solve_your_doubts: Solve your doubts
   solve_your_doubts_teaser: Do you have any doubts?
   something_went_wrong: Something went wrong!
@@ -289,6 +293,7 @@ en:
   working: "Working"
   wrong_answer: The answer is wrong
   years: years old
+  you_earned: You earned
   you_must_sign_in_before_submitting: You must sign in before submitting your solutions
   you_never_submitted_solutions: It seems that you've never submitted solutions since you created your account.
   your_new_organization: your new organization

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

@@ -93,6 +93,7 @@ es-CL:
   exercise_success_rate: Tasa de éxito en ejercicios
   exercises: Ejercicios
   exit: Salir
+  exp_points: puntos de experiencia.
   expectations: Objetivos
   expected_state: Tablero esperado
   explain_redirect: Notamos que te registraste en otra organización.
@@ -103,7 +104,7 @@ es-CL:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms_link: Si tienes alguna duda, consulta las %{terms_link}
+  forum_terms_link: Si tienes alguna duda, accede a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -139,6 +140,8 @@ es-CL:
   lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avísanos!
+  level: Nivel
+  level_up: ¡Subiste de nivel!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Éste contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -235,6 +238,7 @@ es-CL:
     other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resuelve consultas
+  solve_more_exercises_to_level_up: Resuelve <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consulta tus dudas
   solve_your_doubts_teaser: ¿Tienes alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
@@ -294,5 +298,6 @@ es-CL:
     page_gap: "&hellip;"
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
+  you_earned: Ganaste
   you_must_sign_in_before_submitting: Tienes que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.