mumuki-laboratory 7.4.2 → 7.6.1

data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb

@@ -28,7 +28,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
    </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
@@ -40,7 +40,7 @@
   <% if current_user? %>
     <div class="row">
       <div class="col-md-12 submission-results">
-        <% if @assignment.passed?  %>
+        <% if @assignment.solved?  %>
           <%= render partial: 'exercise_solutions/results',
                      locals: {assignment: @assignment, guide_finished_by_solution: false} %>
         <% end %>

data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb

@@ -17,7 +17,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
 </div>

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -51,7 +51,7 @@
       <label for="include_solution"><p><%= t(:load_solution_into_console) %></p></label>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">

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.passed? %>
+                  <% 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

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/1st_reminder.text.erb

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

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

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

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

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

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

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

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

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

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

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

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

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

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

@@ -1,7 +1,7 @@
 <%= form_for :user, url: update_user_path, method: :put do |f| %>
   <div class="row mu-tab-body">
     <div class="col-md-4 text-center">
-      <%= image_tag @user.image_url, size: '250x250', class: 'img-circle' %>
+      <%= image_tag @user.profile_picture, size: '250x250', class: 'img-circle' %>
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>

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/lib/mumuki/laboratory/controllers.rb

@@ -2,6 +2,7 @@ module Mumuki::Laboratory::Controllers
 end
 
 require_relative './controllers/authorization'
+require_relative './controllers/disabling'
 require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
 require_relative './controllers/notifications'

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

@@ -1,8 +1,4 @@
 module Mumuki::Laboratory::Controllers::Authorization
-  def from_sessions?
-    params['controller'] == 'login'
-  end
-
   def authorize_if_private!
     return if Organization.current.public? || from_sessions?
     authorize! :student

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

@@ -0,0 +1,5 @@
+module Mumuki::Laboratory::Controllers::Disabling
+  def ensure_user_enabled!
+    current_user.ensure_enabled! unless from_sessions?
+  end
+end

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

@@ -14,7 +14,10 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     rescue_from Mumuki::Domain::UnauthorizedError, with: :unauthorized
     rescue_from Mumuki::Domain::GoneError, with: :gone
     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)
@@ -41,12 +44,24 @@ module Mumuki::Laboratory::Controllers::DynamicErrors
     render_error 'forbidden', 403, locals: { explanation: :forbidden_explanation }, error_message: message
   end
 
+  def disabled
+    render_error 'forbidden', 403, locals: { explanation: :disabled_explanation }
+  end
+
   def blocked_forum
     render_error 'forbidden', 403, locals: { explanation: :blocked_forum_explanation }
   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

@@ -10,22 +10,25 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
   def render_results_json(assignment, results = {})
     if assignment.input_kids?
       merge_kids_specific_renders(assignment, results)
-      render_results = 'exercise_solutions/kids_results'
+      layout = 'exercise_solutions/kids_results'
     else
-      render_results = 'exercise_solutions/results'
+      layout = 'exercise_solutions/results'
     end
 
-    render json: results.merge(progress_json).merge(
-        html: render_results_html(render_results, assignment),
-        remaining_attempts_html: remaining_attempts_text(assignment))
+    render json: results
+                  .merge(progress_json)
+                  .merge(
+                    html: render_results(layout, assignment),
+                    remaining_attempts_html: remaining_attempts_text(assignment))
   end
 
   def merge_kids_specific_renders(assignment, results)
     results.merge!(
-        button_html: render_results_button_html(assignment),
-        title_html: render_results_title_html(assignment),
-        expectations_html: render_results_expectations_html(assignment),
-        test_results: assignment.test_results)
+        button_html: render_results_button(assignment),
+        title_html: render_results_title(assignment),
+        expectations: assignment.affable_expectation_results,
+        tips: assignment.affable_tips,
+        test_results: assignment.affable_test_results)
   end
 
   def progress_json
@@ -35,26 +38,21 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
     }
   end
 
-  def render_results_html(results_partial, assignment)
+  def render_results(results_partial, assignment)
     render_to_string partial: results_partial,
                      locals: {assignment: assignment}
   end
 
-  def render_results_title_html(assignment)
+  def render_results_title(assignment)
     render_to_string partial: 'exercise_solutions/results_title',
                      locals: {contextualization: assignment}
   end
 
-  def render_results_button_html(assignment)
+  def render_results_button(assignment)
     render_to_string partial: 'exercise_solutions/kids_results_button',
                      locals: {assignment: assignment}
   end
 
-  def render_results_expectations_html(assignment)
-    render_to_string partial: 'exercise_solutions/expectations',
-                     locals: {assignment: assignment}
-  end
-
   def guide_finished_by_solution?
     !@guide_previously_done && @exercise.guide_done_for?(current_user)
   end

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

@@ -40,6 +40,7 @@ en:
   created_at_desc: Newest
   comment: Comment
   confirm: Confirm
+  confirm_reset: You are about to restart your exercise. Do you want to proceed?
   confirm_restart: You are about to delete your progress for this guide. Do you want to proceed?
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact the admin: %{link}'
@@ -53,8 +54,10 @@ en:
   created_at: Created at
   date: Date
   description: Description
-  destroy: Destroy
   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_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -87,6 +90,7 @@ en:
   finish: Finish
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
+  format: Format
   gender: Gender
   go_to: 'Go to %{organization}'
   gone_explanation: This content is no longer available.
@@ -118,6 +122,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:
@@ -192,6 +197,10 @@ en:
   sign_in_action: sign in
   sign_out: Sign Out
   sign_up_date: User since
+  skipped: You are doing very well, so you've passed this exercise.
+  skipped_congratulations: Well done!
+  skipped_description: You are doing very well, so you've passed this exercise.
+  skipped_solve_anyway: Solve anyway
   solution: Solution
   solved: Solved
   solved_count: '%{count} solved'
@@ -220,7 +229,6 @@ en:
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_and_conditions: Terms and conditions
   test_results: Test results
-  test_results: Tests results
   time_ago: "%{time} ago"
   time_left: You have
   title: Title
@@ -230,7 +238,9 @@ en:
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   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

@@ -43,6 +43,7 @@ es:
   created_at_desc: Nuevas
   comment: Comentar
   confirm: Confirmar
+  confirm_reset: Estás por reiniciar tu ejercicio. ¿Querés continuar?
   confirm_restart: Estás por borrar tu progreso en esta guía. ¿Querés continuar?
   console: Consola
   contact_administrator: 'Si pensás que es un error, comunicate con la persona que administra esta organización: %{link}'
@@ -59,9 +60,11 @@ es:
   day: Día
   days: Días
   description: Descripción
-  destroy: Eliminar
   destroy_message: eliminar el mensaje
+  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_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -93,9 +96,10 @@ es:
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
+  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}!
@@ -128,6 +132,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:
@@ -211,6 +216,10 @@ es:
   sign_in_action: iniciar sesión
   sign_out: Cerrar Sesión
   sign_up_date: Usuario desde
+  skipped: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_congratulations: ¡Bien hecho!
+  skipped_description: Venís aprendiendo muy bien, por lo que aprobaste este ejercicio.
+  skipped_solve_anyway: Resolver de todos modos
   solution: Solución
   solved: Resuelta
   solved_count:
@@ -253,7 +262,9 @@ es:
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
   uncategorized: No categorizado
   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

@@ -38,6 +38,7 @@ pt:
   closed_count: '%{count} fechado'
   comment: Comentar
   confirm: Confirme
+  confirm_reset: Você está prestes a reiniciar seu exercício. Você quer continuar?
   confirm_restart: Você está prestes a apagar o seu progresso neste guia. Você quer continuar?
   console: Consola
   contact_administrator: Se você acha que é um erro, entre em contato com a pessoa que gerencia essa organização %{link}
@@ -56,9 +57,11 @@ pt:
   day: Dia
   days: Dias
   description: Descrição
-  destroy: Excluir
   destroy_message: excluir a mensagem
+  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_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -89,11 +92,12 @@ pt:
   finish: Terminar
   first_name: Nome
   forbidden_explanation: Isso significa que você não tem autorização para ver esse conteúdo. <br> Você poderia ter entrado com uma conta incorreta?
+  format: Formato
   fullscreen: Tela completa
   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}!
@@ -124,6 +128,7 @@ 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:
@@ -204,6 +209,10 @@ pt:
   sign_in_action: iniciar sessão
   sign_out: Fechar Sessão
   sign_up_date: Usuário de
+  skipped: Você está aprendendo muito bem e passou neste exercício.
+  skipped_congratulations: Bem feito!
+  skipped_description: Você está aprendendo muito bem e passou neste exercício.
+  skipped_solve_anyway: Resolver mesmo assim
   solution: Solução
   solved: Resolvido
   solved_count: '%{count} resolvido'
@@ -241,7 +250,9 @@ pt:
   to_solved: Marcar como resolvida
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
   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