mumuki-laboratory 7.12.1 → 7.12.3

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/_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/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/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.
@@ -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.

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

@@ -101,6 +101,7 @@ 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.
@@ -155,6 +156,8 @@ 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'
@@ -255,6 +258,7 @@ 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...
@@ -317,6 +321,7 @@ 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,6 +97,7 @@ 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.
@@ -149,6 +150,8 @@ 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'
@@ -242,6 +245,7 @@ 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 ...
@@ -292,5 +296,6 @@ 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.1'
+    VERSION = '7.12.3'
   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]) }
+                                                     :expectations, :test_results, :tips, :current_exp, :level_up_html]) }
 
       it 'includes kids specific renders' do
         body = JSON.parse(response.body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.12.1
+  version: 7.12.3
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: muvment
   requirement: !ruby/object:Gem::Requirement
@@ -371,9 +371,11 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/load-analytics.js
 - app/assets/javascripts/mumuki_laboratory/application/load-error-svg.js
 - app/assets/javascripts/mumuki_laboratory/application/messages.js
+- app/assets/javascripts/mumuki_laboratory/application/mu-modal-carrousel.js
 - app/assets/javascripts/mumuki_laboratory/application/multiple-choice.js
 - app/assets/javascripts/mumuki_laboratory/application/multiple-files.js
 - app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.js
+- app/assets/javascripts/mumuki_laboratory/application/number-counter.js
 - app/assets/javascripts/mumuki_laboratory/application/pin.js
 - app/assets/javascripts/mumuki_laboratory/application/popover.js
 - app/assets/javascripts/mumuki_laboratory/application/primary.js
@@ -488,6 +490,7 @@ files:
 - app/helpers/editor_tabs_helper.rb
 - app/helpers/email_helper.rb
 - app/helpers/exercise_input_helper.rb
+- app/helpers/gamification_helper.rb
 - app/helpers/globals_helper.rb
 - app/helpers/icons_helper.rb
 - app/helpers/kindergarten_helper.rb
@@ -530,6 +533,7 @@ files:
 - app/views/exercise_solutions/_contextualization_results_body.html.erb
 - app/views/exercise_solutions/_contextualization_results_container.html.erb
 - app/views/exercise_solutions/_expectations.html.erb
+- app/views/exercise_solutions/_kids_level_up.html.erb
 - app/views/exercise_solutions/_kids_results.html.erb
 - app/views/exercise_solutions/_kids_results_button.html.erb
 - app/views/exercise_solutions/_out_of_attempts.html.erb
@@ -604,6 +608,7 @@ files:
 - app/views/layouts/modals/_kindergarten_context.html.erb
 - app/views/layouts/modals/_kindergarten_results.html.erb
 - app/views/layouts/modals/_kindergarten_results_aborted.html.erb
+- app/views/layouts/modals/_level_up.html.erb
 - app/views/layouts/modals/_new_message.html.erb
 - app/views/lessons/show.html.erb
 - app/views/messages/errors.html.erb
@@ -841,120 +846,120 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/mailers/previews/user_mailer_preview.rb
-- spec/mailers/user_mailer_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
 - spec/spec_helper.rb
-- spec/teaspoon_env.rb
-- spec/features/guide_reset_spec.rb
+- spec/api_helper.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/javascripts/elipsis-spec.js
+- spec/javascripts/csrf-token-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/events-spec.js
+- spec/javascripts/gamification-spec.js
+- spec/javascripts/sync-mode-spec.js
+- spec/javascripts/exercise-spec.js
+- spec/javascripts/timer-spec.js
+- spec/javascripts/editors-spec.js
+- spec/javascripts/spec-helper.js
+- spec/javascripts/speech-bubble-renderer-spec.js
+- spec/javascripts/submissions-store-spec.js
+- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/bridge-spec.js
+- spec/javascripts/timeout-spec.js
+- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/with_navigation_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
+- spec/helpers/authors_helper_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/application_helper_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
+- spec/helpers/email_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/icons_helper_spec.rb
 - spec/features/complements_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/runner_assets_spec.rb
+- spec/features/disable_user_flow_spec.rb
+- spec/features/links_flow_spec.rb
 - spec/features/not_found_public_flow_spec.rb
 - spec/features/standard_flow_spec.rb
-- spec/features/links_flow_spec.rb
-- spec/features/guides_flow_spec.rb
-- spec/features/profile_flow_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/chapter_spec.rb
+- spec/features/exercise_flow_spec.rb
+- spec/features/choose_organization_spec.rb
 - spec/features/disabled_organization_flow_spec.rb
-- spec/features/runner_assets_spec.rb
+- spec/features/topic_flow_spec.rb
 - spec/features/home_private_flow_spec.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/dynamic_exam_spec.rb
-- spec/features/discussion_flow_spec.rb
-- spec/features/not_found_private_flow_spec.rb
-- spec/features/progressive_tips_spec.rb
-- spec/features/exams_flow_spec.rb
+- spec/features/profile_flow_spec.rb
 - spec/features/home_public_flow_spec.rb
 - spec/features/menu_bar_spec.rb
-- spec/features/exercise_flow_spec.rb
-- spec/features/choose_organization_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/disable_user_flow_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/chapter_spec.rb
+- spec/features/discussion_flow_spec.rb
 - spec/features/invitations_flow_spec.rb
-- spec/dummy/Rakefile
-- spec/dummy/bin/yarn
-- spec/dummy/bin/update
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
+- spec/features/exams_flow_spec.rb
+- spec/features/guides_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/lessons_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/guide_reset_spec.rb
+- spec/evaluation_helper.rb
+- spec/login_helper.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/public/character/animations.json
-- spec/dummy/public/medal/outline.svg
+- spec/dummy/public/error/500.svg
 - spec/dummy/public/error/timeout_2.svg
-- spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/401.svg
-- spec/dummy/public/error/500.svg
-- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/410.svg
-- spec/dummy/public/error/403.svg
+- spec/dummy/public/error/404.svg
 - spec/dummy/public/error/timeout_1.svg
-- spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
+- spec/dummy/public/error/403.svg
+- spec/dummy/public/medal/outline.svg
+- spec/dummy/package.json
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/spring.rb
 - spec/dummy/config/cable.yml
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/application.rb
-- spec/dummy/config/rabbit.yml
+- spec/dummy/config/spring.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/config/puma.rb
 - spec/dummy/config/environments/development.rb
-- spec/dummy/config/locales/en.yml
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/database.travis.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/database.yml
-- spec/dummy/package.json
-- spec/login_helper.rb
-- spec/helpers/with_choices_spec.rb
-- spec/helpers/email_helper_spec.rb
-- spec/helpers/authors_helper_spec.rb
-- spec/helpers/breadcrumbs_helper_spec.rb
-- spec/helpers/with_navigation_spec.rb
-- spec/helpers/exercise_input_helper_spec.rb
-- spec/helpers/avatar_helper_spec.rb
-- spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/icons_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/api_helper.rb
+- spec/dummy/config/rabbit.yml
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/Rakefile
+- spec/dummy/bin/setup
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/update
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rails
+- spec/dummy/config.ru
+- spec/teaspoon_env.rb
 - spec/capybara_helper.rb
-- spec/evaluation_helper.rb
-- spec/javascripts/bridge-spec.js
-- spec/javascripts/events-spec.js
-- spec/javascripts/exercise-spec.js
-- spec/javascripts/global-spec.js
-- spec/javascripts/gamification-spec.js
-- spec/javascripts/speech-bubble-renderer-spec.js
-- spec/javascripts/timeout-spec.js
-- spec/javascripts/results-renderers-spec.js
-- spec/javascripts/csrf-token-spec.js
-- spec/javascripts/elipsis-spec.js
-- spec/javascripts/timer-spec.js
-- spec/javascripts/editors-spec.js
-- spec/javascripts/spec-helper.js
-- spec/javascripts/submissions-store-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/invitations_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/discussions_messages_controller_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/exercise_solutions_controller_spec.rb