mumuki-laboratory 7.5.1 → 7.7.0

data/app/views/layouts/exercise_inputs/layouts/{_input_kids.html.erb → _input_primary.html.erb}

@@ -13,7 +13,7 @@
           <div class="mu-kids-character">
             <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
           </div>
-          <div class="mu-kids-blocks">
+          <div class="mu-exercise-content mu-kids-blocks">
             <%= yield :exercise_content %>
           </div>
         </div>

data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb

@@ -2,7 +2,7 @@
   <div class="col-md-6 exercise-assignment">
     <%= yield :assignment %>
   </div>
-  <div class="col-md-6 ace-editor-col">
+  <div class="mu-exercise-content col-md-6 ace-editor-col">
     <%= yield :exercise_content %>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="modal fade mu-kids-context" id="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">
@@ -24,10 +24,3 @@
     </div>
   </div>
 </div>
-
-<script>
-  $('#kids-context').modal({
-    backdrop: 'static',
-    keyboard: false
-  });
-</script>

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

@@ -9,7 +9,7 @@
             <div class="col-md-12">
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <% if @assignment.solved? %>
+                  <% if current_user? && @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

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

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

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

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

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

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

@@ -180,7 +180,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.facebook.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 
@@ -212,7 +212,7 @@
                                                         <tbody><tr>
 
                                                           <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
-                                                            <a href="http://www.twitter.com/MumukiProject" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
+                                                            <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
                                                           </td>
 
 

data/config/initializers/session_store.rb

@@ -1 +1 @@
-Rails.application.config.session_store :cookie_store, key: '_mumuki_laboratory_session', same_site: Mumukit::Login::Mucookie.cookie_same_site
+Rails.application.config.session_store Mumukit::Login::Mucookie::Store, key: '_mumuki_laboratory_session', same_site: :lax

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
     root to: 'book#show'
 
     concern :debatable do |options|
-      resources :discussions, options.merge(only: [:index, :show, :create, :update, :destroy]) do
+      resources :discussions, options.merge(only: [:index, :new, :show, :create, :update, :destroy]) do
         post :subscription, on: :member
         post :upvote, on: :member
       end
@@ -17,6 +17,7 @@ Rails.application.routes.draw do
     resources :discussions, only: [] do
       resources :messages, only: [:create, :destroy], controller: 'discussions_messages' do
         post :approve, on: :member
+        post :question, on: :member
       end
     end
 

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

@@ -16,6 +16,8 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::BlockedForumError, with: :blocked_forum
     rescue_from Mumuki::Domain::DisabledError, with: :disabled
     rescue_from ActiveRecord::RecordInvalid, with: :bad_record
+    rescue_from Mumuki::Domain::UnpreparedOrganizationError, with: :unprepared_organization
+    rescue_from Mumuki::Domain::DisabledOrganizationError, with: :disabled_organization
   end
 
   def bad_record(exception)
@@ -51,7 +53,15 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
   end
 
   def gone
-    render_error 'gone', 410
+    render_error 'gone', 410, locals: { explanation: :gone_explanation }
+  end
+
+  def unprepared_organization
+    render_error 'forbidden', 403, locals: { explanation: :unprepared_organization_explanation }
+  end
+
+  def disabled_organization
+    render_error 'gone', 410, locals: { explanation: :disabled_organization_explanation }
   end
 
   def render_error(template, status, options={})

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

@@ -33,8 +33,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
 
   def progress_json
     {
-      guide_finished_by_solution: guide_finished_by_solution?,
-      class_for_progress_list_item: class_for_progress_list_item(@exercise, true)
+      guide_finished_by_solution: guide_finished_by_solution?
     }
   end
 

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

@@ -57,6 +57,8 @@ en:
   destroy_message: delete the message
   destroy: Destroy
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
+  disabled_organization_explanation: This path has already finished.
+  discussion_description_placeholder: You can add more information regarding your doubt.
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -112,6 +114,7 @@ en:
   kids_default_success: You did it great!
   language: Language
   last_name: Last Name
+  last_seen: "Seen by %{name}"
   last_submission_date: Last submission
   latest_exercises: Latest exercises
   learning: Learning
@@ -121,6 +124,7 @@ en:
   let_us_know: please let us know!
   loading: Loading
   load_solution_into_console: Load your solution into the console
+  locked_content: 'This content will be unlocked when you finish previous chapters'
   male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   message_count:
@@ -182,7 +186,10 @@ en:
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
+  requires_attention: Requires attention
   reset_query: Clear current search filters
+  responses_count_asc: By less validated replies
+  responses_count_desc: By more validated replies
   restart: Restart
   results: Results
   results_hidden: Your solution was submitted successfully!
@@ -238,6 +245,7 @@ en:
   undo_upvote: Undo upvote
   unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
+  unprepared_organization_explanation: This path hasn't started yet.
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
   upload_solution: Upload Solution

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

@@ -64,6 +64,8 @@ es:
   destroy: Eliminar
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
+  disabled_organization_explanation: ¡Este recorrido ha finalizado!
+  discussion_description_placeholder: Podés agregar información para detallar más tu consulta
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -98,7 +100,7 @@ es:
   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.
+  gone_explanation: Este contenido ya no está disponible.
   guide: Lección
   guide_created: Guía creada exitosamente
   guide_finished: ¡Terminaste %{guide}!
@@ -122,6 +124,7 @@ es:
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solución
   latest_exercises: Últimos ejercicios
   learning: Aprendizaje
@@ -131,6 +134,7 @@ es:
   let_us_know: ¡Por favor avisanos!
   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'
   male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   message_count:
@@ -200,7 +204,10 @@ es:
   read: Leido
   read_messages: Ver mensajes
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
+  requires_attention: Requiere atención
   reset_query: Borrar los filtros de búsqueda actuales
+  responses_count_asc: Con menos respuestas validadas
+  responses_count_desc: Con más respuestas validadas
   restart: Reiniciar
   results_hidden: ¡Tu solución fue enviada con éxito!
   results: Resultados
@@ -262,6 +269,7 @@ es:
   undo_upvote: No es útil
   unspecified: Prefiero no decirlo
   unmeet_expectations: Objetivos que no se cumplieron
+  unprepared_organization_explanation: ¡Este recorrido aún no ha comenzado!
   unsubscribe: Dejar de recibir notificaciones
   unsubscribed_successfully: Te desuscribiste exitosamente de los recordatorios.
   upload_solution: "Subir solución"

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

@@ -61,6 +61,8 @@ pt:
   destroy: Excluir
   details: Detalhes
   disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
+  disabled_organization_explanation: Este curso terminou!
+  discussion_description_placeholder: Você pode adicionar mais informações sobre sua dúvida
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -96,7 +98,7 @@ pt:
   gender: Gênero
   get_messages: Ver mensagens
   go_to: Vá para %{organization}
-  gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse conteúdo.
+  gone_explanation: Parece que você não pode mais acessar esse conteúdo.
   guide: Lição
   guide_created: Guia criado com sucesso
   guide_finished: Você terminou %{guide}!
@@ -118,6 +120,7 @@ pt:
   language: Linguagem
   languages: Linguagens
   last_name: Sobrenome
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solução
   latest_exercises: Últimos exercícios
   learning: Aprendendo
@@ -127,11 +130,12 @@ pt:
   let_us_know: Por favor, avise-nos!
   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'
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
-      one: 1 mensagem
-      other: '%{count} mensagens'
+    one: 1 mensagem
+    other: '%{count} mensagens'
   message: Mensagem
   messages: Mensagens
   messages_error: As mensagens acima não estão disponíveis no momento. Eu tentei novamente mais tarde!
@@ -193,6 +197,7 @@ pt:
   read: Ler
   read_messages: Ver mensagens
   refresh_or_wait: Se não mostrar automaticamente em alguns segundos, pressione F5
+  requires_attention: Requer atenção
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar
   results: Resultados
@@ -250,6 +255,7 @@ pt:
   uncategorized: Não classificado
   unspecified: Eu preferiria não dizer
   unmeet_expectations: Objetivos que não foram atendidos
+  unprepared_organization_explanation: Este curso ainda não começou!
   unsubscribe: Cancelar subscrição
   upload_solution: Carregar solução
   uploading_solution: Uploading solution

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.5.1'
+    VERSION = '7.7.0'
   end
 end

data/spec/controllers/confirmations_controller_spec.rb

@@ -15,6 +15,6 @@ describe ExerciseConfirmationsController, organization_workspace: :test do
     before { post :create, params: { exercise_id: reading.id } }
 
     it { expect(response.status).to eq 200 }
-    it { expect(response.body).to json_like(guide_finished_by_solution: true, class_for_progress_list_item: 'progress-list-item text-center success active') }
+    it { expect(response.body).to json_like(guide_finished_by_solution: true) }
   end
 end

data/spec/controllers/exercise_solutions_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ExerciseSolutionsController, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:problem) { create(:problem) }
-  let(:kids_problem) { create(:problem, layout: :input_kids) }
+  let(:kids_problem) { create(:problem, layout: :input_primary) }
   let!(:chapter) {
     create(:chapter, name: 'Functional Programming', lessons: [
       create(:lesson, exercises: [problem, kids_problem])
@@ -13,21 +13,56 @@ describe ExerciseSolutionsController, organization_workspace: :test do
   before { set_current_user! user }
 
   def post_problem(problem)
-    post :create, params: { exercise_id: problem.id, solution: { content: 'asd' } }
+    post :create, params: { exercise_id: problem.id, solution: { content: 'the content' } }
   end
 
 
-  describe 'when simple content is sent' do
+  context 'when submission contains client_result' do
+    let(:problem) { create(:problem) }
+    let(:assignment) { Assignment.last }
+
+    before { expect_any_instance_of(Language).to receive(:run_tests!).with(bridge_request) }
+    before do
+      post :create, params: {
+        exercise_id: problem.id,
+        solution: { content: 'the content' },
+        client_result: {
+          status: :passed_with_warnings,
+          test_results: [{title: 'everything works', status: 'passed'}]
+        }
+      }
+    end
+
+    let(:bridge_request) do
+      {
+        content: 'the content',
+        custom_expectations: "\n",
+        expectations: [],
+        extra: "",
+        locale: "en",
+        settings: {},
+        test: "dont care",
+        client_result: {
+          status: 'passed_with_warnings',
+          test_results: [{title: 'everything works', status: 'passed'}]
+        }
+      }
+    end
+
+    it { expect(assignment.solution).to eq 'the content' }
+  end
+
+  context 'when simple content is sent' do
     context 'for a non-kids exercise' do
       before { post_problem(problem) }
       let(:assignment) { Assignment.last }
 
       context 'without client-side interpolations' do
         it { expect(response.status).to eq 200 }
-        it { expect(assignment.solution).to eq('asd')}
+        it { expect(assignment.solution).to eq('the content')}
 
         it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                              except: [:class_for_progress_list_item, :html, :remaining_attempts_html]) }
+                                              except: [:html, :remaining_attempts_html]) }
 
 
         it 'does not include kids specific renders' do
@@ -54,7 +89,7 @@ describe ExerciseSolutionsController, organization_workspace: :test do
       before { post_problem(kids_problem) }
 
       it { expect(response.body).to json_eq({ status: :failed, guide_finished_by_solution: false },
-                                            except: [:class_for_progress_list_item, :html, :remaining_attempts_html,
+                                            except: [:html, :remaining_attempts_html,
                                                      :title_html, :button_html, :expectations, :test_results, :tips]) }
 
       it 'includes kids specific renders' do

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20200527180729) do
+ActiveRecord::Schema.define(version: 20200731081757) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -117,6 +117,11 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.text "manual_evaluation_comment"
     t.integer "upvotes_count", default: 0
     t.bigint "organization_id"
+    t.integer "messages_count", default: 0
+    t.integer "validated_messages_count", default: 0
+    t.boolean "requires_moderator_response", default: true
+    t.string "last_moderator_access_by_id"
+    t.datetime "last_moderator_access_at"
     t.index ["initiator_id"], name: "index_discussions_on_initiator_id"
     t.index ["item_type", "item_id"], name: "index_discussions_on_item_type_and_item_id"
     t.index ["organization_id"], name: "index_discussions_on_organization_id"
@@ -143,7 +148,11 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.integer "max_problem_submissions"
     t.integer "max_choice_submissions"
     t.boolean "results_hidden_for_choices", default: false
+    t.bigint "course_id"
+    t.integer "passing_criterion_type", default: 0
+    t.integer "passing_criterion_value"
     t.index ["classroom_id"], name: "index_exams_on_classroom_id", unique: true
+    t.index ["course_id"], name: "index_exams_on_course_id"
     t.index ["guide_id"], name: "index_exams_on_guide_id"
     t.index ["organization_id"], name: "index_exams_on_organization_id"
   end
@@ -288,6 +297,7 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.boolean "read", default: false
     t.integer "discussion_id"
     t.boolean "approved", default: false
+    t.boolean "not_actually_a_question", default: false
   end
 
   create_table "organizations", id: :serial, force: :cascade do |t|
@@ -298,6 +308,7 @@ ActiveRecord::Schema.define(version: 20200527180729) do
     t.text "settings", default: "{}", null: false
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
+    t.integer "progressive_display_lookahead"
     t.index ["book_id"], name: "index_organizations_on_book_id"
     t.index ["name"], name: "index_organizations_on_name", unique: true
   end