mumuki-laboratory 9.13.2 → 9.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19427492957bc679a64b679d1b50e33e38a750a032e9ca916fa8ba543eef8c03
-  data.tar.gz: bab7ef25dbc9e0970471fca58b4d8e3a1efd592d9f34d092e6f0eeed4c8eeb5d
+  metadata.gz: '0973e0c9ab8333b9b2f4207d9cc40e3c88199c67fcee8f35415b802d0494a85a'
+  data.tar.gz: 7a7c28856ecb1751c25a053fe0db0eaf0607a8c1dbaa22c70071eeb26617d2ba
 SHA512:
-  metadata.gz: bb031814c4d6bc24bcfe00e988923cbdaf0e9cdd6e033d37fd09542736be3a6d9489bc41b5b9cb85bafd52b461ef48a2483082e441a2e92a02370135ba77b3be
-  data.tar.gz: eb0b4b0e606f74d5e679b77cb05088eebcbd651e733730acfee0f28fb15d5aecaa490d011d5bc4319cda746951419c5a85f9398472a9aa4cf40b5f5408dc5f3a
+  metadata.gz: 9db401ba5aa815447c273ab82597ee16c98cd0d13ca5f68720f3190114fa69f40f9195ac479d5f4fc234ef3cdfcc7fe7c2e11c8b6d2cd59a9be9194b596d2096
+  data.tar.gz: b06e42055b04fa8116ce5053e842d63a6c56e8a38c1c38d8b3ed2c23688ae0f0925f8208ece9c765d8987d0f3e6963cb8dcc8faa5ab11dc4e544c95af444d4a3

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -27,7 +27,11 @@
       this.$textarea = $(textarea);
     }
 
-    setupEditor() {
+    setupEditor(readonly = false) {
+      return readonly ? this._setupReadOnlyEditor() : this._setupCommonEditor();
+    }
+
+    _setupCommonEditor() {
       this.editor = this.createEditor({
         lineNumbers: true,
         extraKeys: {
@@ -61,7 +65,7 @@
       return this;
     }
 
-    setupReadOnlyEditor() {
+    _setupReadOnlyEditor() {
       this.editor = this.createEditor({
         readOnly: true,
         cursorBlinkRate: -1, //Hides the cursor

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -6,10 +6,11 @@ mumuki.page.editors = [];
 (() => {
   function createCodeMirrors() {
     return $(".editor").map(function (index, textarea) {
-      var $textarea = $("#solution_content");
+      const $textarea = $("#solution_content");
+      const readonly = $textarea.data('readonly');
 
       return new mumuki.editor.CodeMirrorBuilder(textarea)
-        .setupEditor()
+        .setupEditor(readonly)
         .setupMinLines($textarea.data('lines'))
         .setupLanguage()
         .build();

data/app/assets/javascripts/mumuki_laboratory/application/console.js

@@ -87,7 +87,7 @@
     }
     get content() {
       var firstEditor = mumuki.page.editors[0];
-      if (firstEditor && $("#include_solution").prop("checked"))
+      if (firstEditor && this.includeSolution())
         return firstEditor.getValue();
       else
         return '';
@@ -142,6 +142,12 @@
     get _requestData() {
       return {content: this.content, query: this.line, cookie: this.cookie};
     }
+    includeSolution() {
+      return !this._includeSolutionCheckbox || this._includeSolutionCheckbox.checked;
+    }
+    get _includeSolutionCheckbox() {
+      return $("#include_solution")[0];
+    }
   }
 
 

data/app/assets/javascripts/mumuki_laboratory/application/discussions.js

@@ -19,25 +19,18 @@ mumuki.load(() => {
       .build();
   }
 
-  function createReadOnlyEditors() {
-    return $(".read-only-editor").map(function (index, textarea) {
-      var $textarea = $("#solution_content");
-
-      return new mumuki.editor.CodeMirrorBuilder(textarea)
-        .setupReadOnlyEditor()
-        .setupMinLines($textarea.data('lines'))
-        .setupLanguage()
-        .build();
-    });
-  }
-
-  createReadOnlyEditors();
   let editor = createNewMessageEditor();
 
   var Forum = {
     toggleButton: function (elements) {
       elements.toggleClass('d-none');
     },
+    disableButton: function (elements) {
+      elements.attr('disabled', true);
+    },
+    reenableButton: function (elements) {
+      elements.attr('disabled', false);
+    },
     token: new mumuki.CsrfToken(),
     tokenRequest: function (data) {
       return $.ajax(Forum.token.newRequest(data));
@@ -56,6 +49,7 @@ mumuki.load(() => {
       Forum.discussionPostAndToggle(url, $upvoteButtons);
     },
     discussionResponsible: function (url) {
+      Forum.disableButton($responsibleButton);
       Forum.discussionPostToggleAndRenderToast(url, $responsibleButton);
       $('.responsible-moderator-badge').toggleClass('d-none');
     },
@@ -66,6 +60,7 @@ mumuki.load(() => {
       Forum.discussionPost(url)
         .done(function (response) {
           Forum.toggleButton(elem);
+          Forum.reenableButton(elem);
           mumuki.toast.addToast(response);
         })
         .fail(function (response) {

data/app/assets/javascripts/mumuki_laboratory/application/exercise.js

@@ -1,3 +1,23 @@
+(() => {
+  function solutionChangedSinceLastSubmission() {
+    return  mumuki.exercise.id &&
+            mumuki.SubmissionsStore.getLastSubmissionAndResult(mumuki.exercise.id) &&
+            !mumuki.SubmissionsStore.getSubmissionResultFor(mumuki.exercise.id, mumuki.editors.getSubmission());
+  }
+
+  window.addEventListener("beforeunload", (event) => {
+    if (solutionChangedSinceLastSubmission()) {
+      event.returnValue = 'unsaved_progress';
+    } else {
+      delete event['returnValue'];
+    }
+  });
+
+  window.addEventListener("turbolinks:before-visit", (event) => {
+    if (solutionChangedSinceLastSubmission() && !confirm(mumuki.I18n.t('unsaved_progress'))) event.preventDefault();
+  });
+})();
+
 /**
  * @typedef {"input_right" | "input_bottom" | "input_primary" | "input_kindergarten"} Layout
  * @typedef {{id: number, layout: Layout, settings: any}} Exercise

data/app/assets/javascripts/mumuki_laboratory/application/i18n.js

@@ -9,6 +9,7 @@ mumuki.I18n = (() => {
       passed_with_warnings: () => "Tu solución funcionó, pero hay cosas que mejorar",
       pending: () => "Pendiente",
       skipped: () => "Venís aprendiendo muy bien, por lo que aprobaste este ejercicio",
+      unsaved_progress: () => "Tu solución tiene cambios sin guardar, ¿Querés salir de todos modos?",
     },
     'es-CL': {
       aborted: () => "Ups, no pudimos evaluar tu solución",
@@ -18,6 +19,7 @@ mumuki.I18n = (() => {
       passed_with_warnings: () => "Tu solución funcionó, pero hay cosas que mejorar",
       pending: () => "Pendiente",
       skipped: () => "Vienes aprendiendo muy bien, por lo que aprobaste este ejercicio",
+      unsaved_progress: () => "Tu solución tiene cambios sin guardar, ¿Quieres salir de todos modos?",
     },
     'en': {
       aborted: () => "Oops, we couldn't evaluate your solution",
@@ -27,6 +29,7 @@ mumuki.I18n = (() => {
       passed_with_warnings: () => "It worked, but you can do better",
       pending: () => "Pending",
       skipped: () => "You are doing very well, so you've passed this exercise",
+      unsaved_progress: () => "Your solution has unsaved changes, leave anyways?",
     },
     'pt': {
       aborted: () => "Opa, não pudemos avaliar sua solução",
@@ -36,6 +39,7 @@ mumuki.I18n = (() => {
       passed_with_warnings: () => "Sua solução funcionou, mas há coisas para melhorar",
       pending: () => "Pendente",
       skipped: () => "Você está aprendendo muito bem e passou neste exercício",
+      unsaved_progress: () => "Sua solução tem alterações não salvas. Deseja sair mesmo assim?",
     }
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js

@@ -27,11 +27,12 @@ mumuki.renderers.results = (() => {
    */
   function classForStatus(status) {
     switch (status) {
-      case "errored":              return "broken";
-      case "failed":               return "danger";
-      case "passed_with_warnings": return "warning";
-      case "passed":               return "success";
-      case "pending":              return "muted";
+      case "errored":                   return "broken";
+      case "failed":                    return "danger";
+      case "manual_evaluation_pending": return "info";
+      case "passed_with_warnings":      return "warning";
+      case "passed":                    return "success";
+      case "pending":                   return "muted";
     }
   }
 

data/app/controllers/ajax_controller.rb

@@ -1,9 +1,14 @@
 class AjaxController < ApplicationController
   before_action :authenticate!
+  before_action :validate_organization_enabled!, on: :create
 
   private
 
   def authenticate!
     head 403 unless current_user?
   end
+
+  def validate_organization_enabled!
+    Organization.current.validate_enabled! unless current_user&.teacher_here?
+  end
 end

data/app/controllers/application_controller.rb

@@ -19,11 +19,11 @@ class ApplicationController < ActionController::Base
   before_action :set_time_zone!
 
   before_action :ensure_user_enabled!, if: :current_user?
-
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
-  before_action :validate_active_organization!
 
   before_action :authorize_if_private!
+  before_action :validate_active_organization!
+
   before_action :validate_user_profile!, if: :current_user?
   before_action :validate_accepted_role_terms!, if: :current_user?
   before_action :ensure_restore_progress!, if: :current_user?

data/app/controllers/exam_authorization_requests_controller.rb

@@ -31,6 +31,6 @@ class ExamAuthorizationRequestsController < ApplicationController
 
   def verify_registration_opened!
     exam_registration = ExamRegistration.find(authorization_request_params[:exam_registration_id])
-    raise Mumuki::Domain::GoneError if exam_registration.end_time.past?
+    raise Mumuki::Domain::GoneError if exam_registration.ended?
   end
 end

data/app/controllers/exercise_solutions_controller.rb

@@ -8,7 +8,7 @@ class ExerciseSolutionsController < AjaxController
 
   def create
     assignment = @exercise.try_submit_solution!(current_user, solution_params)
-    render_results_json assignment, status: assignment.status
+    render_results_json assignment, status: assignment.visible_status
   end
 
   private

data/app/helpers/discussions_helper.rb

@@ -184,7 +184,10 @@ module DiscussionsHelper
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:reply_count, count: discussion.visible_messages.size)}"
+    <<~HTML.html_safe
+      <span>#{friendly_time(discussion.created_at, :time_since)}</span>
+      <span> · #{t(:reply_count, count: discussion.visible_messages.size)}</span>
+    HTML
   end
 
   def discussion_filter_params_without_page

data/app/helpers/editor_helper.rb

@@ -7,8 +7,8 @@ module EditorHelper
   end
 
   def read_only_editor(content, language, options = {})
-    editor_options = editor_defaults(language, options, 'read-only-editor')
-    text_area_tag :solution_content, content, editor_options
+    editor_options = editor_defaults(language, options.deep_merge(data: { readonly: true }), 'editor')
+    text_area_tag 'solution[content]', content, editor_options
   end
 
   def spell_checked_editor(name, options = {})

data/app/helpers/exam_registration_helper.rb

@@ -1,6 +1,6 @@
 module ExamRegistrationHelper
   def exam_registration_view
-    if @registration.end_time.past?
+    if @registration.ended?
       { icon: :times_circle, class: :danger, t: :exam_registration_finished_html }
     else
       { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }

data/app/helpers/time_helper.rb

@@ -0,0 +1,12 @@
+module TimeHelper
+  def friendly_time(time, t_key = nil)
+    friendly_time = time_ago_in_words time
+    friendly_time_t = t_key ? t(t_key, time: friendly_time) : friendly_time
+
+    <<~HTML.html_safe
+      <time title="#{time}">
+        #{friendly_time_t}
+      </time>
+    HTML
+  end
+end

data/app/helpers/user_discussions_helper.rb

@@ -1,6 +1,6 @@
 module UserDiscussionsHelper
   def user_discussions_table_title(discussion, user, last_read)
-    %Q{
+    <<~HTML.html_safe
       <tr></tr>
       <thead>
         <tr>
@@ -9,30 +9,30 @@ module UserDiscussionsHelper
           </td>
         </tr>
       </thead>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_header
-    %Q{
+    <<~HTML.html_safe
       <tr class="fw-bold">
         <td></td>
         <td>#{t(:exercise)}</td>
         <td>#{t(:discussion_created_by)}</td>
         <td>#{t(:last_message)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_item(discussion, user)
-    %Q{
+    <<~HTML.html_safe
       <tr>
         <td class="text-center">
           #{icon_for_read(discussion.read_by?(user))}
         </td>
         <td>#{link_to discussion.item.name, item_discussion_path(discussion)}</td>
         <td>#{discussion_user_name discussion.initiator}</td>
-        <td>#{t(:time_since, time: time_ago_in_words(discussion.last_message_date))}</td>
+        <td>#{friendly_time(discussion.last_message_date, :time_since)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 end

data/app/views/discussions/_description_message.html.erb

@@ -4,7 +4,7 @@
       <div class="discussion-message-bubble-title">
         <%= linked_discussion_user_name(discussion.initiator) %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
+          <%= friendly_time(discussion.created_at, :time_since) %>
         </span>
       </div>
     </div>

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

@@ -7,7 +7,7 @@
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
+          <%= friendly_time(message.created_at, :time_since) %>
         </span>
         <span class="actions">
           <% if message.authorized?(current_user) && !message.deleted? %>
@@ -47,7 +47,7 @@
           <% if current_user&.moderator_here? %>
             <hr>
             <%= t :deleted_by, deleter: message.deleted_by.name %>
-            <%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
+            <%= friendly_time(message.deleted_at, :time_since) %>
             <a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
               <%= t :show_message %>
             </a>

data/app/views/exam_authorization_requests/_pending.html.erb

@@ -1,5 +1,12 @@
-<%= t :exam_authorization_pending_explanation_html,
-      date: l(authorization_request.exam.start_time, format: :long),
-      end_time: l(authorization_request.exam_registration.end_time, format: :long),
-      location: Organization.current.time_zone,
-      edit_path: url_for(authorization_request.exam_registration) %>
+<% if authorization_request.exam_registration.ended? %>
+  <%= t :exam_authorization_pending_confirmation_soon_html %>
+<% elsif authorization_request.exam_registration.multiple_options? %>
+  <%= t :exam_authorization_pending_change_date_html,
+        end_time: l(authorization_request.exam_registration.end_time, format: :long),
+        location: Organization.current.time_zone,
+        edit_path: url_for(authorization_request.exam_registration) %>
+<% else %>
+  <%= t :exam_authorization_pending_done_html,
+        end_time: l(authorization_request.exam_registration.end_time, format: :long),
+        location: Organization.current.time_zone %>
+<% end %>

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

@@ -20,17 +20,19 @@
         <%= t exam_registration_view[:t], date: l(@registration.end_time, format: :long), location: Organization.current.time_zone %>
       </p>
     </div>
-    <% unless @registration.end_time.past? %>
+    <% unless @registration.ended? %>
       <%= form_for @authorization_request, html: {class: 'mu-form'} do |f| %>
         <%= f.hidden_field :exam_registration_id, value: @registration.id %>
-        <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
-        <% @registration.exams.each do |exam| %>
-          <div class="form-check">
-            <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, class: 'form-check-input mu-read-only-input',
-                               checked: @authorization_request.exam_id == exam.id) %>
-            <%= label_tag exam.id, "#{l(exam.start_time, format: :long)} #{current_time_zone_html}".html_safe, class: 'form-check-label' %>
-          </div>
-        <% end %>
+        <div class="mb-4">
+          <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
+          <% @registration.exams.each do |exam| %>
+            <div class="form-check">
+              <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, class: 'form-check-input mu-read-only-input',
+                                 checked: @authorization_request.exam_id == exam.id) %>
+              <%= label_tag exam.id, "#{l(exam.start_time, format: :long)} #{current_time_zone_html}".html_safe, class: 'form-check-label' %>
+            </div>
+          <% end %>
+        </div>
         <button class="btn btn-complementary"> <%= t :save %> </button>
       <% end %>
     <% end %>

data/app/views/exercises/_read_only.html.erb

@@ -47,22 +47,18 @@
 
       <% if should_render_read_only_exercise_tabs?(@discussion) %>
         <ul class="nav nav-tabs discussion-tabs" role="tablist">
-
-          <% if @discussion.has_submission? %>
-            <li role="presentation">
-              <a class="editor-tab nav-link active" data-bs-target="#solution" aria-controls="solution" role="tab" data-bs-toggle="tab">
-                <%= t :solution %>
-              </a>
-            </li>
-            <li role="presentation">
-              <a class="editor-tab nav-link" data-bs-target="#results" aria-controls="results" role="tab" data-bs-toggle="tab">
-                <%= t :results %>
-              </a>
-            </li>
-          <% end %>
-
           <li role="presentation">
-            <a class="editor-tab nav-link <%= "active" unless @discussion.has_submission? %>" data-bs-target="#content" aria-controls="content" role="tab" data-bs-toggle="tab">
+            <a class="editor-tab nav-link active" data-bs-target="#solution" aria-controls="solution" role="tab" data-bs-toggle="tab">
+              <%= t :solution %>
+            </a>
+          </li>
+          <li role="presentation">
+            <a class="editor-tab nav-link" data-bs-target="#results" aria-controls="results" role="tab" data-bs-toggle="tab">
+              <%= t :results %>
+            </a>
+          </li>
+          <li role="presentation">
+            <a class="editor-tab nav-link" data-bs-target="#content" aria-controls="content" role="tab" data-bs-toggle="tab">
               <%= t :description %>
             </a>
           </li>
@@ -77,32 +73,28 @@
         </ul>
 
         <div class="tab-content">
-          <% if @discussion.has_submission? %>
-            <div role="tabpanel" class="tab-pane active" id="solution">
-              <div class="mu-tab-body">
-                <div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="editor">
-                  <div class="mu-read-only-editor">
-                    <%= render_exercise_read_only_editor exercise, @discussion.solution %>
-                  </div>
-                </div>
+          <div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="solution">
+            <div class="mu-tab-body">
+              <div class="mu-read-only-editor">
+                <%= render_exercise_read_only_editor exercise, @discussion.solution %>
               </div>
             </div>
+          </div>
 
-            <div role="tabpanel" class="tab-pane" id="results">
-              <div class="mu-tab-body">
-                <%= render layout: 'exercise_solutions/contextualization_results_container', locals: { contextualization: @discussion } do %>
-                  <div class="row">
-                    <div class="col-md-12 submission-results">
-                      <%= render partial: 'exercise_solutions/contextualization_results_body',
-                                 locals: { contextualization: @discussion, guide_finished_by_solution: false } %>
-                    </div>
+          <div role="tabpanel" class="tab-pane fade" id="results">
+            <div class="mu-tab-body">
+              <%= render layout: 'exercise_solutions/contextualization_results_container', locals: { contextualization: @discussion } do %>
+                <div class="row">
+                  <div class="col-md-12 submission-results">
+                    <%= render partial: 'exercise_solutions/contextualization_results_body',
+                               locals: { contextualization: @discussion, guide_finished_by_solution: false } %>
                   </div>
-                <% end %>
-              </div>
+                </div>
+              <% end %>
             </div>
-          <% end %>
+          </div>
 
-          <div role="tabpanel" class="tab-pane <%= 'active' unless @discussion.has_submission? %>" id="content">
+          <div role="tabpanel" class="tab-pane fade" id="content">
             <div class="mu-tab-body">
               <div class="exercise-assignment">
                 <%= render partial: 'exercises/exercise_assignment', locals: { exercise: exercise } %>

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

@@ -26,7 +26,7 @@
           </span>
           <span class="discussion-initiator">
             <strong><%= discussion_user_name discussion.initiator %></strong>
-            <%= t(:asked_time_since, time: time_ago_in_words(discussion.created_at)) %>
+            <%= friendly_time(discussion.created_at, :asked_time_since) %>
             <span class="discussion-status-icon">
               <%= discussion_status_fa_icon(discussion) %>
             </span>

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

@@ -6,7 +6,7 @@
             <div class="message">
               <p> <%= message.content_html %></p>
               <div class="sender"><%= message.sender unless message.sender == current_user_uid %></div>
-              <time><%= time_ago_in_words message.created_at %></time>
+              <%= friendly_time(message.created_at) %>
             </div>
           </li>
       <% end %>

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

@@ -31,7 +31,7 @@
       <span> <strong><%= t :email %>:</strong> <%= @user.email %> </span>
     </div>
     <div>
-      <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
+      <span> <strong><%= t :programming_since %>:</strong> <%= friendly_time(@user.created_at, :time_since) %> </span>
     </div>
   </div>
 </div>

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

@@ -20,7 +20,7 @@
             <td><%= icon_for_read(message.read?) %></td>
             <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
             <td><%= mail_to message.sender %></td>
-            <td><%= time_ago_in_words message.created_at %></td>
+            <td><%= friendly_time(message.created_at) %></td>
           </tr>
         <% end %>
       </table>

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

@@ -38,7 +38,7 @@
                 <%= render partial: "notifications/#{notification.subject}", locals: { notification: notification } %>
               </td>
               <td class="col-md-3">
-                <%= t(:time_since, time: time_ago_in_words(notification.created_at)) %>
+                <%= friendly_time(notification.created_at, :time_since) %>
               </td>
             </tr>
           <% end %>

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

@@ -116,13 +116,15 @@ es-CL:
       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_pending_explanation_html: Tienes tiempo hasta el <strong>%{end_time}</strong> (hora de %{location}) para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
+  exam_authorization_pending_confirmation_soon_html: El período de inscripción a este examen ha finalizado. Tu solicitud será evaluada pronto y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
+  exam_authorization_pending_change_date_html: Tienes tiempo hasta el <strong>%{end_time}</strong> (hora de %{location}) para cambiar el turno haciendo click <strong><a href="%{edit_path}">aquí</a></strong>. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
+  exam_authorization_pending_done_html: Ya te inscribiste a este examen. Luego del <strong>%{end_time}</strong> (hora de %{location}) se evaluará tu solicitud y recibirás una confirmación. <br> ¡No olvides de revisar las notificaciones!
   exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong> (hora de %{location}). ¡Buena suerte!
-  exam_authorization_request_created: ¡Tu inscripción al exámen se registró exitosamente!
+  exam_authorization_request_created: ¡Tu inscripción al examen se registró exitosamente!
   exam_authorization_request_rejected: Tu solicitud fue rechazada porque no cumpliste con los requisitos para rendir el examen.
-  exam_authorization_request_saved: ¡Tu inscripción al exámen se modificó exitosamente!
+  exam_authorization_request_saved: ¡Tu inscripción al examen 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_choose_exam: Seleccioná día y horario en el que te gustaría rendir el examen
   exam_registration_explanation_html: Tienes tiempo hasta el <strong>%{date}</strong> (hora de %{location}) para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
   exam_registration_finished_html: La inscripción a este examen finalizó el <strong>%{date}</strong> (hora de %{location})
   exam_registration_open: ¡Ya puedes inscribirte a %{description}!

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

@@ -123,13 +123,15 @@ es:
       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_pending_explanation_html: Tenés tiempo hasta el <strong>%{end_time}</strong> (hora de %{location}) para cambiar el turno haciendo click <strong><a href="%{edit_path}">acá</a></strong>. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
+  exam_authorization_pending_confirmation_soon_html: El período de inscripción a este examen ha finalizado. Tu solicitud será evaluada pronto y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
+  exam_authorization_pending_change_date_html: Tenés tiempo hasta el <strong>%{end_time}</strong> (hora de %{location}) para cambiar el turno haciendo click <strong><a href="%{edit_path}">acá</a></strong>. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
+  exam_authorization_pending_done_html: Ya te inscribiste a este examen. Luego del <strong>%{end_time}</strong> (hora de %{location}) se evaluará tu solicitud y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
   exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong> (hora de %{location}). ¡Buena suerte!
-  exam_authorization_request_created: ¡Tu inscripción al exámen se registró exitosamente!
+  exam_authorization_request_created: ¡Tu inscripción al examen se registró exitosamente!
   exam_authorization_request_rejected: Tu solicitud fue rechazada porque no cumpliste con los requisitos para rendir el examen.
-  exam_authorization_request_saved: ¡Tu inscripción al exámen se modificó exitosamente!
+  exam_authorization_request_saved: ¡Tu inscripción al examen 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_choose_exam: Seleccioná día y horario en el que te gustaría rendir el examen
   exam_registration_explanation_html: Tenés tiempo hasta el <strong>%{date}</strong> (hora de %{location}) para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
   exam_registration_finished_html: La inscripción a este examen finalizó el <strong>%{date}</strong> (hora de %{location})
   exam_registration_open: ¡Ya podés inscribirte a %{description}!

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.13.2'
+    VERSION = '9.16.0'
   end
 end

data/spec/features/not_found_private_flow_spec.rb

@@ -30,7 +30,7 @@ feature 'not found private on app', organization_workspace: :base do
     expect(page.text).to json_eq errors: [
       'The operation on organization base' +
       ' was forbidden to user foo+1@bar.com' +
-      ' with permissions !student:central/*;teacher:;headmaster:;janitor:;admin:;owner:;ex_student:']
+      ' with permissions !student:central/*;teacher:;headmaster:;janitor:;admin:;owner:']
   end
 
   scenario 'api with authentication', :json_eq_error do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.13.2
+  version: 9.16.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.13.1
+        version: 9.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.13.1
+        version: 9.16.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -567,6 +567,7 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
+- app/helpers/time_helper.rb
 - app/helpers/time_zone_helper.rb
 - app/helpers/toast_helper.rb
 - app/helpers/user_activity_helper.rb
@@ -980,135 +981,135 @@ signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/capybara_helper.rb
-- spec/api_helper.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/exercise_flow_spec.rb
-- spec/features/immersive_redirection_spec.rb
-- spec/features/disabled_organization_flow_spec.rb
-- spec/features/discussion_flow_spec.rb
-- spec/features/menu_bar_spec.rb
-- spec/features/invitations_flow_spec.rb
-- spec/features/standard_flow_spec.rb
-- spec/features/not_found_public_flow_spec.rb
-- spec/features/home_public_flow_spec.rb
-- spec/features/chapters_flow_spec.rb
 - spec/features/disable_user_flow_spec.rb
-- spec/features/links_flow_spec.rb
+- spec/features/exercise_flow_spec.rb
 - spec/features/certificate_programs_flow_spec.rb
-- spec/features/exams_flow_spec.rb
-- spec/features/user_activity_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/runner_assets_spec.rb
 - spec/features/guide_reset_spec.rb
-- spec/features/dynamic_exam_spec.rb
+- spec/features/home_public_flow_spec.rb
+- spec/features/links_flow_spec.rb
 - spec/features/not_found_private_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/chapters_flow_spec.rb
+- spec/features/read_only_flow_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/standard_flow_spec.rb
+- spec/features/user_activity_flow_spec.rb
+- spec/features/invitations_flow_spec.rb
+- spec/features/home_private_flow_spec.rb
+- spec/features/exams_flow_spec.rb
+- spec/features/topic_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/not_found_public_flow_spec.rb
+- spec/features/immersive_redirection_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
+- spec/features/lessons_flow_spec.rb
 - spec/features/guides_flow_spec.rb
-- spec/features/profile_flow_spec.rb
 - spec/features/notifications_flow_spec.rb
+- spec/features/menu_bar_spec.rb
+- spec/features/profile_flow_spec.rb
 - spec/features/terms_flow_spec.rb
-- spec/features/home_private_flow_spec.rb
-- spec/features/read_only_flow_spec.rb
-- spec/features/runner_assets_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/complements_flow_spec.rb
-- spec/features/progressive_tips_spec.rb
-- spec/helpers/breadcrumbs_helper_spec.rb
-- spec/helpers/certificate_helper_spec.rb
-- spec/helpers/avatar_helper_spec.rb
-- spec/helpers/with_navigation_spec.rb
-- spec/helpers/authors_helper_spec.rb
-- spec/helpers/with_choices_spec.rb
-- spec/helpers/icons_helper_spec.rb
-- spec/helpers/email_helper_spec.rb
-- spec/helpers/exercise_input_helper_spec.rb
-- spec/helpers/user_activity_helper_spec.rb
-- spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
+- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/i18n-spec.js
+- spec/javascripts/gamification-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/elipsis-spec.js
+- spec/javascripts/kids-button-spec.js
+- spec/javascripts/sync-mode-spec.js
+- spec/javascripts/spec-helper.js
+- spec/javascripts/timer-spec.js
+- spec/javascripts/csrf-token-spec.js
+- spec/javascripts/submissions-store-spec.js
+- spec/javascripts/timeout-spec.js
+- spec/javascripts/editors-spec.js
+- spec/javascripts/speech-bubble-renderer-spec.js
+- spec/javascripts/upload-spec.js
+- spec/javascripts/exercise-spec.js
+- spec/javascripts/events-spec.js
+- spec/javascripts/bridge-spec.js
+- spec/spec_helper.rb
+- spec/teaspoon_env.rb
 - spec/evaluation_helper.rb
-- spec/dummy/Rakefile
-- spec/dummy/package.json
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/yarn
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
-- spec/dummy/bin/update
-- spec/dummy/public/error/timeout_2.svg
+- spec/dummy/public/medal/outline.svg
+- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/500.svg
 - spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/timeout_1.svg
-- spec/dummy/public/error/500.svg
-- spec/dummy/public/error/403.svg
+- spec/dummy/public/error/timeout_2.svg
 - spec/dummy/public/error/401.svg
+- spec/dummy/public/error/403.svg
 - spec/dummy/public/error/410.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/character/magnifying_glass/loop.svg
+- spec/dummy/public/character/animations.json
 - spec/dummy/public/character/magnifying_glass/apparition.svg
-- spec/dummy/public/character/kibi/success_l.svg
+- spec/dummy/public/character/magnifying_glass/loop.svg
 - spec/dummy/public/character/kibi/failure.svg
-- spec/dummy/public/character/kibi/jump.svg
+- spec/dummy/public/character/kibi/context.svg
 - spec/dummy/public/character/kibi/passed_with_warnings.svg
+- spec/dummy/public/character/kibi/jump.svg
+- spec/dummy/public/character/kibi/success_l.svg
 - spec/dummy/public/character/kibi/success2_l.svg
-- spec/dummy/public/character/kibi/context.svg
-- spec/dummy/public/character/animations.json
-- spec/dummy/public/medal/outline.svg
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/config.ru
-- spec/dummy/config/secrets.yml
+- spec/dummy/Rakefile
+- spec/dummy/config/application.rb
 - spec/dummy/config/puma.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environment.rb
+- spec/dummy/config/spring.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/spring.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/rabbit.yml
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/application.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/cable.yml
-- spec/teaspoon_env.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/package.json
+- spec/dummy/config.ru
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
+- spec/controllers/certificates_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/organizations_api_controller_spec.rb
 - spec/controllers/exam_authorization_requests_controller_spec.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/exam_registrations_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb
 - spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/exam_registrations_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/certificates_controller_spec.rb
-- spec/controllers/invitations_controller_spec.rb
 - spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/javascripts/elipsis-spec.js
-- spec/javascripts/bridge-spec.js
-- spec/javascripts/timeout-spec.js
-- spec/javascripts/results-renderers-spec.js
-- spec/javascripts/submissions-store-spec.js
-- spec/javascripts/kids-button-spec.js
-- spec/javascripts/speech-bubble-renderer-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/javascripts/events-spec.js
-- spec/javascripts/editors-spec.js
-- spec/javascripts/spec-helper.js
-- spec/javascripts/gamification-spec.js
-- spec/javascripts/i18n-spec.js
-- spec/javascripts/upload-spec.js
-- spec/javascripts/timer-spec.js
-- spec/javascripts/global-spec.js
-- spec/javascripts/exercise-spec.js
-- spec/javascripts/csrf-token-spec.js
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
 - spec/login_helper.rb
-- spec/spec_helper.rb
 - spec/mailers/previews/user_mailer_preview.rb
 - spec/mailers/user_mailer_spec.rb
+- spec/capybara_helper.rb
+- spec/helpers/icons_helper_spec.rb
+- spec/helpers/certificate_helper_spec.rb
+- spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
+- spec/helpers/with_navigation_spec.rb
+- spec/helpers/email_helper_spec.rb
+- spec/helpers/user_activity_helper_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/application_helper_spec.rb
+- spec/helpers/authors_helper_spec.rb
+- spec/api_helper.rb