mumuki-laboratory 8.2.1 → 8.6.1

data/app/views/layouts/exercise_inputs/editors/_upload.html.erb

@@ -1,4 +1,13 @@
 <div class="form-group">
-  <textarea id="solution_content" type="text" name="solution[content]" style="display: none"></textarea>
-  <input id="upload-input" type="file" class="upload submission-control" size="5120" accept=".<%= @exercise.language.extension %>" />
+  <% @max_file_size = 256000 %>
+
+  <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
+  <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=<%= @max_file_size %> accept=".<%= @exercise.language.extension %>" />
+  <div>
+    <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success">
+      <%= fa_icon(:upload, text: t(:select_file), id: "mu-upload-icon") %>
+    </label>
+    <div id="mu-upload-file-limit-exceeded" class="hidden">
+      <%= fa_icon("exclamation-triangle", text: t(:file_exceeds_max_size, size_kb: (@max_file_size / 1000))) %></div>
+  </div>
 </div>

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

@@ -1,6 +1,6 @@
 <% content_for :no_container do %>
 
-  <div <%= turbolinks_enable_for exercise %>>
+  <div <%= turbolinks_enable_for exercise %> data-i18n-prefix="kindergarten">
 
     <div class="mu-kids-landscape-support container-fluid">
       <img class="mu-kids-character-animation"/>

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

@@ -8,7 +8,7 @@
       </button>
       <div class="modal-header">
         <h4 class="modal-title text-broken">
-          <strong><%= t :kindergarten_aborted %></strong>
+          <strong><%= t :aborted %></strong>
         </h4>
       </div>
       <div class="modal-body">

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @lesson }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @lesson }%>

data/app/views/notifications/_discussion.html.erb

@@ -0,0 +1 @@
+<%= menu_item :comments, :new_discussion_message, url_for([target.item, target]), { title: target.item.name.truncate_words(3) } %>

data/app/views/notifications/_dropdown.html.erb

@@ -0,0 +1,13 @@
+<div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
+  <div id="notificationsDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
+    <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
+    <span class="badge badge-notifications"><%= notifications_count %></span>
+  </div>
+  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationsDropdown">
+    <% notifications.each do |it| %>
+      <li>
+        <%= notification_preview_for it.target %>
+      </li>
+    <% end %>
+  </ul>
+</div>

data/app/views/notifications/_exam_authorization_request.html.erb

@@ -0,0 +1 @@
+<%= menu_item :book_open, :exam_authorization_request_updated, url_for(target), { description: target.exam_registration.description } %>

data/app/views/notifications/_exam_registration.html.erb

@@ -0,0 +1 @@
+<%= menu_item :book_open, :exam_registration_open, url_for(target), { description: target.description } %>

data/app/views/notifications/_message.html.erb

@@ -0,0 +1 @@
+<%= menu_item :envelope, :new_message_received, url_for(target.exercise), { sender: target.sender } %>

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

@@ -1,7 +1,7 @@
 <div class="terms-card">
   <details <%= 'open' unless collapsed %>>
     <summary class="terms-card-header">
-      <h4><%= term.header %></h4>
+      <h4 class="terms-card-title"><%= term.header %></h4>
     </summary>
     <div class="terms-card-body">
       <%= term.content_html %>

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

@@ -1,5 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <% if current_user? %>
+  <% if current_logged_user? %>
     <%= breadcrumbs @user %>
   <% else %>
     <%= header_breadcrumbs %>

data/config/routes.rb

@@ -22,6 +22,9 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :exam_registrations, only: [:show]
+    resources :exam_authorization_requests, only: [:show, :create, :update]
+
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
       concerns :debatable, debatable_class: 'Chapter'

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

@@ -1,32 +1,13 @@
 module Mumuki::Laboratory::Controllers::Notifications
-
-  def user_notifications_path
-    user_path(anchor: current_notifications_tab)
-  end
-
   def has_notifications?
     notifications_count > 0
   end
 
   def notifications_count
-    messages_count + discussions_count
-  end
-
-  private
-
-  def current_notifications_tab
-    has_messages? ? 'messages' : 'discussions'
-  end
-
-  def has_messages?
-    messages_count > 0
-  end
-
-  def messages_count
-    current_user.try(:unread_messages).try(:count) || 0
+    notifications.size
   end
 
-  def discussions_count
-    current_user.try(:unread_discussions).try(:count) || 0
+  def notifications
+    current_user.try(:unread_notifications) || []
   end
 end

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

@@ -20,7 +20,8 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
                   .merge(
                     html: render_results(layout, assignment),
                     remaining_attempts_html: remaining_attempts_text(assignment),
-                    current_exp: UserStats.exp_for(assignment.submitter))
+                    current_exp: UserStats.exp_for(assignment.submitter),
+                    in_gamified_context: Organization.current.gamification_enabled?)
   end
 
   def merge_kids_specific_renders(assignment, results)

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

@@ -11,20 +11,20 @@ en:
   actual_state: Obtained board
   age: Age
   all: All
-  appendix: "Appendix"
+  appendix: Appendix
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
   approved_message: Validated by mentor
-  are_you_sure: 'Are you sure you want to %{action}?'
+  are_you_sure: Are you sure you want to %{action}?
   ask_a_question: Ask a question!
   ask_community: Ask community for help
   ask_redirect: Do you want to go there?
   ask_the_first_question: Be the first one to ask!
   attempts_left:
-    zero: "You've run out of attempts "
+    zero: "You've run out of attempts"
     one: "1 attempt remaining"
     other: '%{count} attempts remaining'
   author: Author
-  authoring: "Authoring"
+  authoring: Authoring
   authoring_note_html: This guide's content was developed by %{authors} under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   authoring_note_with_collaborators_html: This guide's content was developed by %{authors} and <a href="%{collaborators}" target="_blank">many others</a>, under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   back_to_mumuki: Back to Mumuki!
@@ -51,7 +51,7 @@ en:
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact %{link}'
   content: Content
-  continue_exercise: "Continue"
+  continue_exercise: Continue
   continue_lesson: Continue this lesson!
   continue_practicing: Continue practicing!
   corollary: To think about
@@ -60,11 +60,12 @@ en:
   created_at: Created at
   date: Date
   description: Description
-  destroy_message: delete the message
   destroy: Destroy
+  destroy_message: delete the message
   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.
+  new_discussion_message: New message on %{title}
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -73,19 +74,28 @@ en:
   edit_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
-  error_description: This is known as a <span class="error-link">%{error}</span>.
-  error_401: 401 error
-  error_403: 403 error
-  error_404: 404 error
-  error_410: 410 error
-  error_500: 500 error
-  errored: Oops, your solution didn't work
   error:
     title:
       forbidden: You are not allowed to see this content
       gone: Oops! Content has expired
       internal_server_error: Oops! Something went wrong
       not_found: Oops! Page was not found
+  error_401: 401 error
+  error_403: 403 error
+  error_404: 404 error
+  error_410: 410 error
+  error_500: 500 error
+  error_description: This is known as a <span class="error-link">%{error}</span>.
+  errored: Oops, your solution didn't work
+  exam_authorization_request_approved_html: Your request was approved, don't forget to log in at <strong>%{date}</strong>. Good luck!
+  exam_authorization_request_created: Your registration to the exam has been saved!
+  exam_authorization_request_rejected: Your request was rejected.
+  exam_authorization_request_saved: Your registration to the exam has been updated!
+  exam_authorization_request_updated: Your registration to %{description} has been updated
+  exam_registration_choose_exam: Choose date and time to attend to the exam
+  exam_registration_explanation_html: You have until <strong>%{date}</strong> to register. After that date, your request will be processed and you will receive a confirmation. <br> Don't forget to check the notifications!
+  exam_registration_open: Registrations open for %{description}!
+  exam_registration_to: Registration to %{description}
   exams: Exams
   exercise: Exercise
   exercises: Exercises
@@ -101,13 +111,15 @@ en:
   failed: Oops, something went wrong
   feedback: Feedback
   female: Female
+  file_exceeds_max_size: "File size should not exceed %{size_kb}kb. Please select another file."
   finish: Finish
   first_name: First Name
   forbidden_explanation: Please verify you have logged in with the right account
   format: Format
+  forum: Forum
   forum_terms: Forum rules
   forum_terms_link: If you have any questions, please check %{terms_link}
-  fullscreen: "Fullscreen"
+  fullscreen: "Fullscreen (F11)"
   gender: Gender
   get_messages: "View messages"
   go_to: 'Go to %{organization}'
@@ -120,6 +132,7 @@ en:
   hidden_done: 'Good!'
   history: History
   home: Home
+  important_info: Important information
   initial_state: Initial board
   insert_file_name: Insert a file name
   invitation: Invitation to course
@@ -129,12 +142,6 @@ 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}"
@@ -160,8 +167,9 @@ en:
   message: Message
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
-  more_messages: More
+  moderation: Mentoring
   moderator: Mentor
+  more_messages: More
   my_doubts: My doubts
   my_submissions: My Submissions
   name: Name
@@ -173,6 +181,7 @@ en:
   never: never
   new: New
   new_message_placeholder: Write a message for your teacher...
+  new_message_received: You have a new message from %{sender}
   next_exercise: Next
   next_lesson: 'Next Guide: %{name}'
   no_discussions: No discussions matched your search.
@@ -185,6 +194,7 @@ en:
   no_useful_result: Didn't find what you were looking for?
   not_found_explanation: 'You may have mistyped the address or the page may have moved.'
   not_in_any_organizations: It seems you aren't in any organizations yet!
+  notifications: Notifications
   notify_problem_with_exercise: Report a bug
   office: Office
   only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
@@ -224,6 +234,7 @@ en:
   running: running
   save: Save
   see_context: Watch exercise introduction animation
+  select_file: Select file
   sending_solution: Sending solution
   show: Show
   sign_in: Sign in
@@ -261,7 +272,7 @@ en:
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_accepted: The terms and conditions were accepted
-  terms_and_conditions: Terms and conditions
+  terms_and_conditions: Terms and Conditions
   terms_and_conditions_continue_disclaimer: By continuing you agree to %{terms_link}
   terms_and_conditions_must_be_accepted: You must accept the terms and conditions
   test_results: Test results
@@ -280,13 +291,12 @@ en:
   unprepared_organization_explanation: This path hasn't started yet.
   unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
-  upload_solution: Upload Solution
   uploading_solution: "Uploading solution"
   upvote: Upvote
   upvotes_count_desc: Most voted
   upvotes_count_asc: Least voted
   user: User
-  user_data_updated: Your data was updated successfuly
+  user_data_updated: Your data was updated successfully
   username: Username
   view_details: View details
   want_permissions: The next user requires permissions

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

@@ -9,7 +9,7 @@ es-CL:
   actual_state: Tablero obtenido
   all: Todos
   and: y
-  appendix: "Apéndice"
+  appendix: Apéndice
   appendix_teaser: ¿Quieres saber más? <a href="%{link}">Consulta el apéndice de este capítulo</a>
   are_you_sure: '¿Estás seguro que quieres %{action}?'
   ask_a_question: ¡Haz una pregunta!
@@ -21,7 +21,7 @@ es-CL:
     one: '1 intento restante'
     other: '%{count} intentos restantes'
   author: Autor
-  authoring: "Autores"
+  authoring: Autores
   authoring_note_html: Esta guía fue desarrollada por %{authors} bajo los términos de la <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Licencia Creative Commons Compartir-Igual, 4.0</a>.
   authoring_note_with_collaborators_html: Esta guía fue desarrollada por %{authors} y <a href="%{collaborators}" target="_blank">muchas personas más</a>, bajo los términos de la <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Licencia Creative Commons Compartir-Igual, 4.0</a>.
   back_to_mumuki: ¡Vuelve a Mumuki!
@@ -65,6 +65,7 @@ es-CL:
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permanente
   disabled_organization_explanation: ¡Este recorrido ha finalizado!
+  new_discussion_message: Mensaje nuevo en %{title}
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tienes que seguir practicando.
@@ -78,13 +79,22 @@ es-CL:
   error_404: error 404
   error_410: error 410
   error_500: error 500
-  errored: ¡Ups! Tu solución no se puede ejecutar
   error:
     title:
       forbidden: No tienes autorización para ver este contenido
       gone: ¡Ups! El contenido expiró
       internal_server_error: ¡Ups! Algo no anduvo bien
       not_found: ¡Ups!  La página no existe
+  errored: ¡Ups! Tu solución no se puede ejecutar
+  exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong>. ¡Buena suerte!
+  exam_authorization_request_created: ¡Tu inscripción al exámen se registró exitosamente!
+  exam_authorization_request_rejected: Tu solicitud fue rechazada.
+  exam_authorization_request_saved: ¡Tu inscripción al exámen se modificó exitosamente!
+  exam_authorization_request_updated: Hay novedades sobre tu inscripción a %{description}
+  exam_registration_choose_exam: Seleccioná día y horario en el que te gustaría rendir el exámen
+  exam_registration_explanation_html: Tienes tiempo hasta el <strong>%{date}</strong> para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
+  exam_registration_open: ¡Ya puedes inscribirte a %{description}!
+  exam_registration_to: Inscripción a %{description}
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios
@@ -99,12 +109,13 @@ es-CL:
   failed: Tu solución no pasó las pruebas
   feedback: Problemas que encontramos
   female: Mujer
+  file_exceeds_max_size: "El tamaño de archivo no debe exceder %{size_kb}kb. Por favor selecciona otro archivo."
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms_link: Si tienes alguna duda, accede a las %{terms_link}
-  fullscreen: "Pantalla completa"
+  forum_terms_link: No olvides que al participar debes cumplir las %{terms_link}
+  fullscreen: "Pantalla completa (F11)"
   gender: Género
   get_messages: "Ver mensajes"
   go_to: 'Ir a %{organization}'
@@ -120,6 +131,7 @@ es-CL:
   home: Inicio
   hour: hora
   hours: horas
+  important_info: Información importante
   initial_state: Tablero inicial
   insert_file_name: Ingresa un nombre de archivo
   invitation: Invitación a curso
@@ -156,8 +168,9 @@ es-CL:
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Vuelve a intentar más tarde!
   minute: minuto
   minutes: minutos
+  moderation: Mentoría
+  moderator: Mentor
   more_messages: Ver mensajes anteriores
-  moderator: Moderador
   my_doubts: Mis consultas
   name: Nombre
   navigation_continue: 'Siguiente %{kind}: %{sibling}'
@@ -167,22 +180,24 @@ es-CL:
   need_help: No entiendo, ¡necesito ayuda!
   never: nunca
   new: Nuevo
-  new_message: ¿Tienes dudas? ¡Levanta la mano!
   new_discussion: Nueva consulta
+  new_message: ¿Tienes dudas? ¡Levanta la mano!
   new_message_placeholder: Escribe el mensaje para tu docente acá...
+  new_message_received: Tienes un nuevo mensaje de %{sender}
   next_exercise: Siguiente
   next_guide: 'Siguiente Lección: %{name}'
   no_discussions: No encontramos consultas que coincidan con tu búsqueda.
   no_exercises: No encontramos ejercicios que coincidan con tu búsqueda.
   no_guides: No encontramos lecciones que coincidan con tu búsqueda.
   no_messages: ¡Parece que no tienes ningún mensaje todavía!
-  no_need_hint: 'Este ejercicio no tiene pista'
+  no_need_hint: Este ejercicio no tiene pista
   no_questions: Parece que aún no hay ninguna consulta.
   no_submissions: ¡Parece que aún no intentaste resolver este ejercicio!
   no_useful_result: ¿No encontraste lo que estabas buscando?
   not_found: ¡La página que buscaste no existe!
   not_found_explanation: Fíjate si escribiste bien la dirección.
   not_in_any_organizations: ¡Parece que no estás en ninguna organización todavía!
+  notifications: Notificaciones
   notify_problem_with_exercise: Reporta un bug
   office: Secretaría
   only_landscape_support: Por favor, rota tu tablet o celular para realizar ejercicios
@@ -222,6 +237,7 @@ es-CL:
   running: procesando
   save: Guardar
   see_context: Mira la animación del principio
+  select_file: Seleccionar archivo
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
@@ -263,7 +279,7 @@ es-CL:
   teacher_info: Información para docentes
   tell_us_how: ¡Cuéntanos cómo te pasó esto!
   tell_us_if_our_error: Si piensas que es un error nuestro, %{issues}
-  terms_and_conditions: Términos y condiciones
+  terms_and_conditions: Términos y Condiciones
   terms_and_conditions_continue_disclaimer: Al continuar aceptas los %{terms_link}
   terms_and_conditions_must_be_accepted: Tienes que aceptar los términos y condiciones
   test_results: Resultados de las pruebas
@@ -283,7 +299,6 @@ es-CL:
   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"
   uploading_solution: "Subiendo solución"
   upvote: Es útil
   upvotes_count_desc: Más útiles