mumuki-laboratory 7.12.0 → 7.12.1

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss

@@ -14,15 +14,6 @@ $modal-footer-height: 95px;
     height: calc(100% - #{$kids-characters-height} - 15px);
     width: 100%;
 
-    .konvajs-content {
-      width: unset !important;
-      height: unset !important;
-      canvas {
-        width: unset !important;
-        height: unset !important;
-      }
-    }
-
     .mu-kids-single-state,
     .mu-kids-blocks {
       width: 50%;
@@ -30,7 +21,7 @@ $modal-footer-height: 95px;
     }
 
     .mu-kids-blocks {
-      padding-bottom: 15px;
+      margin-right: 15px;
     }
 
     &.mu-full-workspace {
@@ -78,7 +69,7 @@ $modal-footer-height: 95px;
       padding: 30px;
       img {
         padding: 0;
-        border: 5px solid black;
+        border: 3px solid black;
         border-radius: 30px;
       }
     }
@@ -107,14 +98,36 @@ $modal-footer-height: 95px;
     .modal-content {
       position: absolute;
 
-      $width: 800px;
-      $height: $width * 0.625;
+      $width-lg: 800px;
+      $height-lg: $width-lg * 0.625;
+
+      width: $width-lg;
+      height: $height-lg;
+
+      top: calc(50vh - #{$height-lg} / 2);
+      left: calc(50vw - #{$width-lg} / 2);
+
+      @media (orientation: landscape)  and (max-height: $height-lg + 50px) {
+        $height-sm: 85vh;
+        $width-sm: $height-sm / 0.625;
+
+        width: $width-sm;
+        height: $height-sm;
 
-      width: $width;
-      height: $height;
+        top: calc(50vh - #{$height-sm} / 2);
+        left: calc(50vw - #{$width-sm} / 2);
+      }
+
+      @media (orientation: portrait) {
+        $height-sm: 85vh;
+        $width-sm: 85vw;
 
-      top: calc(50vh - #{$height} / 2);
-      left: calc(50vw - #{$width} / 2);
+        width: $width-sm;
+        height: $height-sm;
+
+        top: calc(50vh - #{$height-sm} / 2);
+        left: calc(50vw - #{$width-sm} / 2);
+      }
 
       $border-width: 16px;
       border-width: $border-width;
@@ -123,6 +136,12 @@ $modal-footer-height: 95px;
       border-radius: $border-width;
       box-shadow: none;
 
+      .modal-header,
+      .modal-footer {
+        text-align: center;
+        text-transform: uppercase;
+      }
+
       .modal-body {
         height: 100%;
         div, p {
@@ -171,6 +190,7 @@ $modal-footer-height: 95px;
         'passed': $mu-color-success,
         'passed-with-warnings': $mu-color-warning,
         'failed': $mu-color-danger,
+        'errored': $mu-color-broken,
         'aborted': $mu-color-broken,
         'pending': $mu-color-info
       );

data/app/helpers/contextualization_result_helper.rb

@@ -8,7 +8,7 @@ module ContextualizationResultHelper
   end
 
   def t_contextualization_status(contextualization)
-    t contextualization_status contextualization
+    t contextualization_status(contextualization)
   end
 
   def contextualization_status(contextualization)
@@ -16,6 +16,14 @@ module ContextualizationResultHelper
       :hidden_done
     elsif contextualization.exercise.choice?
       contextualization.solved? ? :correct_answer : :wrong_answer
+    else
+      contextualization_status_translation_key contextualization
+    end
+  end
+
+  def contextualization_status_translation_key(contextualization)
+    if contextualization.exercise.input_kindergarten?
+      "kindergarten_#{contextualization.submission_status}"
     else
       contextualization.submission_status
     end

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

@@ -12,7 +12,7 @@
   <%= corollary_box @exercise %>
 <% else %>
   <div class="mu-kids-default-success">
-    <img class="capital-animation mu-kids-character-success"/>
+    <img class="capital-animation mu-kids-character-result"/>
     <p><%= t :kids_default_success %></p>
   </div>
 <% end %>

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

@@ -4,10 +4,10 @@
     <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.kindergarten.context.showContext()">
+        <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.kindergarten.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
+        <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
           <img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg" alt="">
           <img class="mu-kindergarten-button-image mu-kindergarten-stop hidden" src="https://mumuki.io/static/audio-stop.svg" alt="">
         </button>
@@ -16,14 +16,14 @@
   </div>
   <div class="mu-kindergarten-hint">
     <% if exercise.hint? %>
-      <button class="mu-hint-light" onclick="mumuki.kindergarten.hint.toggle()">
+      <button class="mu-hint-light" onclick="mumuki.kids.hint.toggle()">
         <img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg" alt="">
       </button>
       <div class="mu-kindergarten-light-speech-bubble">
         <span class="mu-kindergarten-exercise-hint">
           <%= exercise.hint.markdownified %>
         </span>
-        <button class="expand-or-collapse-hint-media" onclick="mumuki.kindergarten.hint.toggleMedia()">
+        <button class="expand-or-collapse-hint-media" onclick="mumuki.kids.hint.toggleMedia()">
           <i class="fa fa-fw fa-2x fa-caret-up"></i>
         </button>
       </div>

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

@@ -1,17 +1,17 @@
 <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">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-waiting="<%= t :loading %>" data-dismiss="modal" aria-label="Close">
+      <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-kindergarten-modal-button mu-previous hidden" onclick="mumuki.kindergarten.context.prevSlide()" aria-label="Previous">
+      <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-kindergarten-modal-button mu-next" onclick="mumuki.kindergarten.context.nextSlide()" aria-label="Next">
+      <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>

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

@@ -1,19 +1,22 @@
 <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 danger">
-      <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close">
+    <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>
       </button>
-      <h4 class="modal-header">
-      </h4>
+      <div class="modal-header">
+        <h4 class="modal-title text-broken">
+          <strong><%= t :kindergarten_aborted %></strong>
+        </h4>
+      </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
               <div class="mu-kids-character">
-                <img/>
+                <img class="mu-kids-character-result-aborted"/>
               </div>
             </div>
           </div>

data/lib/mumuki/laboratory.rb

@@ -34,7 +34,7 @@ module Mumukit::Platform::OrganizationMapping::Path
     patch :organization_name do |request, domain, hyper|
       name = hyper.(request, domain)
       if %w(auth login logout).include? name
-        'central'
+        'base'
       else
         name
       end

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

@@ -129,6 +129,12 @@ en:
   joining_html: '¡Welcome to course <strong>%{course}</strong>!'
   keep_learning: Keep learning!
   kids_default_success: You did it great!
+  kindergarten_passed: "Your program worked great!"
+  kindergarten_passed_with_warnings: "Your program worked great!"
+  kindergarten_pending: "There's an error in your program. Try again!"
+  kindergarten_failed: "There's an error in your program. Try again!"
+  kindergarten_errored: "There's an error in your program. Try again!"
+  kindergarten_aborted: "Ups! Something went wrong"
   language: Language
   last_name: Last Name
   last_seen: "Seen by %{name}"

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

@@ -137,7 +137,13 @@ es:
   its_been_a_while: Hace un tiempo que no usás Mumuki.
   joining_html: '¡Te damos la bienvenida al curso <strong>%{course}</strong>!'
   keep_learning: ¡Seguí aprendiendo!
-  kids_default_success: ¡Lo hiciste muy bien!
+  kids_default_success: "¡Lo hiciste muy bien!"
+  kindergarten_passed: "¡Tu programa está muy bien!"
+  kindergarten_passed_with_warnings: "¡Tu programa está muy bien!"
+  kindergarten_pending: "Hay un error en tu programa. ¡Intentá de nuevo!"
+  kindergarten_failed: "Hay un error en tu programa. ¡Intentá de nuevo!"
+  kindergarten_errored: "Hay un error en tu programa. ¡Intentá de nuevo!"
+  kindergarten_aborted: "¡Ups! Hubo un problema técnico"
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido

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

@@ -132,6 +132,12 @@ pt:
   item_not_accessible: Você não tem permissões para acessar este conteúdo
   joining_html: Bem-vindo ao curso <strong> %{curso} </strong>!
   kids_default_success: Você fez muito bem!
+  kindergarten_passed: "O seu programa é muito bom!"
+  kindergarten_passed_with_warnings: "O seu programa é muito bom!"
+  kindergarten_pending: "Houve um erro no seu programa. Tenta novamente!"
+  kindergarten_failed: "Houve um erro no seu programa. Tenta novamente!"
+  kindergarten_errored: "Houve um erro no seu programa. Tenta novamente!"
+  kindergarten_aborted: "Opa! Houve um problema técnico"
   language: Linguagem
   languages: Linguagens
   last_name: Sobrenome

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.12.0'
+    VERSION = '7.12.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 7.12.0
+  version: 7.12.1
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -376,6 +376,7 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.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
 - app/assets/javascripts/mumuki_laboratory/application/profile.js
 - app/assets/javascripts/mumuki_laboratory/application/progress.js
 - app/assets/javascripts/mumuki_laboratory/application/results-renderer.js