mumuki-laboratory 7.12.3 → 8.0.0

data/app/controllers/api/organizations_controller.rb

@@ -14,13 +14,12 @@ module Api
     end
 
     def create
-      @organization.save_and_notify!
+      @organization.save!
       render json: @organization.to_resource_h
     end
 
     def update
-      @organization.update_and_notify! organization_params
-
+      @organization.update! organization_params
       render json: @organization.to_resource_h
     end
   end

data/app/controllers/api/users_controller.rb

@@ -4,14 +4,12 @@ module Api
     before_action :authorize_janitor!
 
     def create
-      @user.save!
-      @user.notify!
+      @user.save_and_notify!
       render json: @user.to_resource_h
     end
 
     def update
-      @user.update! user_params.except([:email, :permissions, :uid])
-      @user.notify!
+      @user.update_and_notify! user_params.except([:email, :permissions, :uid])
       render json: @user.to_resource_h
     end
   end

data/app/controllers/invitations_controller.rb

@@ -15,8 +15,7 @@ class InvitationsController < ApplicationController
 
   def join
     current_user.accept_invitation! @invitation
-    current_user.update! user_params
-    current_user.notify!
+    current_user.update_and_notify! user_params
     redirect_to_organization!
   end
 

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

@@ -1,13 +1,4 @@
 <div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
-
-  <% if in_gamified_context? %>
-    <div id="mu-exp-earned-message" class="hidden">
-      <span><%= t(:you_earned) %></span>
-      <strong><span id="mu-exp-points"></span></strong>
-      <span><%= t(:exp_points) %></span>
-    </div>
-  <% end %>
-
   <%= yield %>
 </div>

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

@@ -1,8 +1,3 @@
 <h4 class="text-<%= icon_class_for(contextualization.submission_status) %>">
   <strong><%= fa_icon icon_type_for(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
-  <% if in_gamified_context? %>
-    <strong><small class="text-success">
-      <span class="mu-experience"></span>
-    </small></strong>
-  <% end %>
 </h4>

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

@@ -48,6 +48,7 @@
 <%= hidden_field_tag "mu-exercise-id", @exercise.id %>
 <%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
 <%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
+<%= hidden_field_tag "mu-current-exp", UserStats.exp_for(@current_user) %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">
@@ -61,10 +62,6 @@
     <%= render partial: 'layouts/exercise_skipped' %>
   <% end %>
 
-  <% if in_gamified_context? %>
-    <%= render partial: 'layouts/modals/level_up' %>
-  <% end %>
-
   <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

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

@@ -4,7 +4,7 @@
     <div class="mu-kindergarten-character-speech-bubble">
       <span class="mu-kindergarten-exercise-description"><%= exercise.description_task %></span>
       <div class="mu-kindergarten-buttons">
-        <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.show()">
+        <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.showContext()">
           <img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg" alt="">
         </button>
         <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">

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

@@ -1,5 +1,4 @@
 <%= content_for :navbar do %>
-  <%= hidden_field_tag("mu-current-exp", UserStats.exp_for(@current_user)) if in_gamified_context? %>
   <div class="<%= exercise_container_type %>">
     <nav class="mu-navbar">
       <div class="mu-navbar-breadcrumb hidden-xs">
@@ -19,20 +18,16 @@
       </div>
       <div class="mu-navbar-avatar">
         <% if current_logged_user? %>
-          <% if in_gamified_context? %>
-            <i class="fa fa-star fa-fw fa-2x navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" title="<%= t(:level) %>"></i>
-            <span class="mu-level-number"></span>
-          <% end %>
           <div class="dropdown">
             <span>
               <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
-                <i class="fa fa-bell fa-fw fa-2x navbar-icon"></i>
+                <i class="fa fa-bell fa-fw fa-lg"></i>
                   <span class="badge badge-notifications"><%= notifications_count %></span>
               </a>
             </span>
           </div>
           <div class="dropdown">
-            <div id="profileDropdown" class="profile-dropdown navbar-icon" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
+            <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
               <span class="caret"></span>
             </div>
@@ -81,4 +76,3 @@
 <% end %>
 
 <%= render partial: 'layouts/main' %>
-

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

@@ -1,4 +1,4 @@
-<div class="modal fade guide-corollary mu-kids-modal-border" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade guide-corollary" 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 mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-context" 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,27 +1,17 @@
-<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <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 class="modal-content">
+      <div class="modal-header">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="mu-kids-results-carrousel">
-                <div class="active submission-results">
+              <div class="row">
+                <div class="col-md-12 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-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kindergarten-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <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>
+    <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>
       </button>
-      <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 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>
-      <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 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>
-      <div class="modal-body mu-kids-context-body">
+      <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">

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

@@ -1,30 +1,17 @@
-<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kindergarten-context" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <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>
+    <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>
       </button>
       <div class="modal-header">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
-            <div class="col-md-12">
-              <div class="mu-kids-results-carrousel">
-                <div class="active submission-results kindergarten"></div>
-              </div>
+            <div class="col-md-12 submission-results">
             </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-kids-modal-border" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
+<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-dialog">
-    <div class="modal-content broken kindergarten">
-      <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
+    <div class="modal-content broken">
+      <button type="button" class="mu-kindergarten-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 kindergarten">
+              <div class="mu-kids-character">
                 <img class="mu-kids-character-result-aborted"/>
               </div>
             </div>

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

@@ -5,20 +5,10 @@
   </div>
 </div>
 <div class="row mu-tab-body">
-  <div class="col-md-4 mu-profile-info-left">
+  <div class="col-md-4 text-center">
     <%= 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-right">
+  <div class="col-md-8 mu-profile-info">
     <% if @user.age.present? %>
       <div>
         <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>

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

@@ -29,7 +29,6 @@ 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,29 +1,5 @@
 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]

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

@@ -95,7 +95,6 @@ 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
@@ -146,8 +145,6 @@ 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'
@@ -236,7 +233,6 @@ 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!
@@ -293,7 +289,6 @@ 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,7 +93,6 @@ 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.
@@ -140,8 +139,6 @@ 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'
@@ -238,7 +235,6 @@ 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...
@@ -298,6 +294,5 @@ 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.

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

@@ -101,7 +101,6 @@ es:
   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.
@@ -156,8 +155,6 @@ es:
   lessons: Lecciones
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avisanos!
-  level: Nivel
-  level_up: ¡Subiste de nivel!
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -258,7 +255,6 @@ es:
     other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resolvé consultas
-  solve_more_exercises_to_level_up: Resolvé <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consultá tus dudas
   solve_your_doubts_teaser: ¿Tenés alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
@@ -321,7 +317,6 @@ es:
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
   years: años
-  you_earned: Ganaste
   you_must_sign_in_before_submitting: Tenés 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.
   your_new_organization: tu nueva organización

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

@@ -97,7 +97,6 @@ pt:
   exercise_success_rate: Taxa de sucesso em exercícios
   exercises: Exercícios
   exit: Sair
-  exp_points: pontos de experiência.
   expectations: Objetivos
   expected_state: Tabuleiro esperado
   explain_redirect: Percebemos que você se registrou em outra organização.
@@ -150,8 +149,6 @@ pt:
   lessons: Lições
   lesson_number: Lição %{number}
   let_us_know: Por favor, avise-nos!
-  level: Nível
-  level_up: Você sobe de nível!
   loading: Carregando
   load_solution_into_console: Carregue a solução no console
   locked_content: 'Este conteúdo será desbloqueado quando você terminar os capítulos anteriores'
@@ -245,7 +242,6 @@ pt:
   solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
   solve_doubts: Resolvi dúvidas
-  solve_more_exercises_to_level_up: Resolva mais <span>number</span> exercícios para avançar para o próximo nível.
   solve_your_doubts: Consulte suas dúvidas
   solve_your_doubts_teaser: Você tem alguma dúvida?
   something_went_wrong: Oops!, Algo não estava certo ...
@@ -296,6 +292,5 @@ pt:
   working: Processamento
   wrong_answer: A resposta não é correta
   years: anos
-  you_earned: Você ganhou
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
   your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.12.3'
+    VERSION = '8.0.0'
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -89,7 +89,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
                                             except: [:html, :remaining_attempts_html, :title_html, :button_html,
-                                                     :expectations, :test_results, :tips, :current_exp, :level_up_html]) }
+                                                     :expectations, :test_results, :tips, :current_exp]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)