mumuki-laboratory 9.17.0 → 9.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d420aa36a1219b0a8984fa03062704f55b6227b0f8009ec7fa08b8c67d0780d6
-  data.tar.gz: 0e0d9d6aab2633b8081464b447a90db3be572ab5ec3f9dad92d77e3824c71ade
+  metadata.gz: de7e211f8a772b15e0018a75d15c69f1fd455bf4794362235e236c06bc125d06
+  data.tar.gz: 91b6b7564068e6fac29130c62639a17c277d0954fbf3900e07e947ae3cdc6da0
 SHA512:
-  metadata.gz: '084ffe85c17ed01338fa6ad45bfb6a24b92ec85c838432626436b216c9486b49babac048883ce1a40dd20336ebdb745bf3182d82c681c2d29b7306f6b9a9e783'
-  data.tar.gz: bfb035582b7227797d88fc2f66dd9912d6366f32d5b4428cee0e90a9d2c698f3b2989d2c60cf75d51570e3709f10bafb47fcc32db4cc819fd891c29a0a37167c
+  metadata.gz: 63dc960e1d91bd05a534d8ded2bfb9cfd13801ee2d3dfcb44da781642bcfa626f0bf80c7df642216bb7915a1ff2f32515668c6bb81b7615221e23ae44a3cd627
+  data.tar.gz: 7011fe8f2abadae8c93ac60192c0caa200a475a229183c257ccd74c0818291c9ced49507a75fc15f092405d9c10d8cad269b6723be45eac41dc022a120c7bd6e

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

@@ -70,6 +70,7 @@ mumuki.load(() => {
     discussionMessageToggleApprove: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
+        elem.attr('data-bs-original-title', '');
       });
     },
     discussionMessageToggleNotActuallyAQuestion: function (url, elem) {

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

@@ -1,9 +1,6 @@
 mumuki.startTimer = (() => {
-  function startTimer(endDate) {
-    var endTime = new Date(endDate).getTime();
-    var currentTime = Date.now();
-    var diffTime = endTime - currentTime;
-    var duration = moment.duration(diffTime, 'milliseconds');
+  function startTimer(seconds) {
+    var duration = moment.duration(seconds, 'seconds');
     var intervalDuration = 1000;
 
     var interval = mumuki.setInterval(function () {

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -34,14 +34,6 @@
   background-image: none;
 }
 
-.alert {
-  margin: 10px 50px 10px 15px;
-}
-
-.alert-danger a {
-  color: greenyellow;
-}
-
 .exercise-search-box {
   width: 263px;
   position: fixed

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

@@ -7,6 +7,7 @@
 
 .mu-profile-actions {
   margin-left: auto;
+  text-align: center;
 
   .btn {
     width: 150px;
@@ -18,15 +19,6 @@
       border-color: lighten($mu-color-complementary, 15%);
     }
   }
-
-  &.mobile {
-    text-align: center;
-    margin: 20px 5px -20px -10px;
-
-    .btn {
-      width: calc(50% - 20px);
-    }
-  }
 }
 
 .mu-profile-info {

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

@@ -13,5 +13,4 @@ $da-font-path: asset-path('assets');
 @import "application/invitations";
 @import "application/modules";
 @import "application/errors";
-@import "application/alerts";
 @import "application/codemirror-themes";

data/app/controllers/application_controller.rb

@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base
   # ensures contents are accessible to current user
   def validate_accessible!
     return if current_user&.teacher_here?
-    accessible_subject.validate_accessible_for! current_user
+    accessible_subject&.validate_accessible_for! current_user
   end
 
   def validate_active_organization!
@@ -129,7 +129,6 @@ class ApplicationController < ActionController::Base
   def validate_user_profile!
     unless current_user.profile_completed?
       save_location_before! :profile_completion
-      flash[:info] = I18n.t :please_fill_profile_data
       redirect_to edit_user_path
     end
   end

data/app/controllers/exam_authorization_requests_controller.rb

@@ -1,36 +1,41 @@
 class ExamAuthorizationRequestsController < ApplicationController
 
-  before_action :verify_registration_opened!, on: [:create, :update]
+  before_action :set_registration!
+  before_action :set_exam!
+  before_action :verify_registration_opened!
 
   def create
-    authorization_request = ExamAuthorizationRequest.find_or_create_by! create_authorization_request_params do |it|
-      it.assign_attributes authorization_request_params
-    end
-    current_user.read_notification! authorization_request.exam_registration
-    flash.notice = I18n.t :exam_authorization_request_created
-    redirect_to root_path
+    authorization_request = @registration.request_authorization! current_user, @exam
+    current_user.read_notification! @registration
+    flash.notice = friendly_flash_notice(:exam_authorization_request_created)
+    redirect_to exam_authorizations_user_path
   end
 
   def update
-    ExamAuthorizationRequest.update params[:id], authorization_request_params
-    flash.notice = I18n.t :exam_authorization_request_saved
-    redirect_to root_path
+    @registration.update_authorization_request_by_id! params[:id], @exam
+    flash.notice = friendly_flash_notice(:exam_authorization_request_saved)
+    redirect_to exam_authorizations_user_path
   end
 
   private
 
-  def create_authorization_request_params
-    authorization_request_params.slice :exam_registration_id, :user, :organization
+  def friendly_flash_notice(key)
+    I18n.t key, friendly_date: helpers.local_time(@exam.start_time)
   end
 
   def authorization_request_params
-    params
-        .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
-        .merge(user: current_user, organization: Organization.current)
+    params.require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
+  end
+
+  def set_registration!
+    @registration = Organization.current.exam_registrations.find(authorization_request_params[:exam_registration_id])
+  end
+
+  def set_exam!
+    @exam = @registration.exams.find(authorization_request_params[:exam_id])
   end
 
   def verify_registration_opened!
-    exam_registration = ExamRegistration.find(authorization_request_params[:exam_registration_id])
-    raise Mumuki::Domain::GoneError if exam_registration.ended?
+    raise Mumuki::Domain::GoneError if @registration.ended?
   end
 end

data/app/controllers/exam_registrations_controller.rb

@@ -1,6 +1,6 @@
 class ExamRegistrationsController < ApplicationController
   def show
-    @registration = ExamRegistration.find(params[:id])
+    @registration = Organization.current.exam_registrations.find(params[:id])
     @authorization_request = @registration.authorization_request_for(current_user)
   end
 end

data/app/controllers/exercises_controller.rb

@@ -6,7 +6,6 @@ class ExercisesController < ApplicationController
 
   before_action :set_guide!, only: :show
   before_action :set_assignment!, only: :show, if: :current_user?
-  before_action :validate_accessible!, only: :show
   before_action :start!, only: :show
 
   def show

data/app/helpers/exams_helper.rb

@@ -2,12 +2,8 @@ module ExamsHelper
   def exam_information_for(user, exam)
     %Q{
       #{course_information_for(user, exam)}
-      #{fa_icon('calendar-alt', class: 'fa-fw',
-                text: "<strong>#{t :date_and_time}:</strong> #{local_time_without_time_zone(exam.start_time)} - #{local_time(exam.end_time)}".html_safe)}
-      <br>
-      #{fa_icon(:stopwatch, class: 'fa-fw',
-                text: "<strong>#{t :available_time}:</strong> #{t :time_in_minutes, time: exam.duration}".html_safe)}
-      <br>
+      #{date_information_for(exam)}
+      #{duration_information_for(exam)}
     }.html_safe
   end
 
@@ -20,4 +16,18 @@ module ExamsHelper
       <br>"
     end
   end
+
+  def date_information_for(exam)
+    "#{fa_icon('calendar-alt', class: 'fa-fw',
+               text: "<strong>#{t :date_and_time}:</strong> #{local_time_without_time_zone(exam.start_time)} - #{local_time(exam.end_time)}".html_safe)}
+    <br>"
+  end
+
+  def duration_information_for(exam)
+    if exam.duration?
+      "#{fa_icon(:stopwatch, class: 'fa-fw',
+                 text: "<strong>#{t :available_time}:</strong> #{t :time_in_minutes, time: exam.duration}".html_safe)}
+      <br>"
+    end
+  end
 end

data/app/helpers/profile_helper.rb

@@ -4,7 +4,7 @@ module ProfileHelper
   end
 
   def cancel_edit_profile_button
-    link_to t(:cancel), :user, class: 'btn btn-secondary' if current_user.profile_completed?
+    link_to t(:cancel), :user, class: 'btn btn-outline-complementary' if current_user.profile_completed?
   end
 
   def save_edit_profile_button(form)

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

@@ -13,6 +13,10 @@
           <% if message.authorized?(current_user) && !message.deleted? %>
             <% if current_user&.moderator_here? %>
               <a class="discussion-message-approved <%= 'selected' if message.approved? %>"
+                 <% if message.approved? && current_user&.forum_supervisor_here? %>
+                   data-bs-toggle="tooltip" data-bs-placement="left"
+                   title="<%= t :approved_by, validator: message.approved_by.name, date: local_time(message.approved_at) %>"
+                 <% end %>
                  onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
                 <%= fa_icon(:check, class: 'fa-lg') %>
               </a>

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

@@ -25,7 +25,7 @@
         <%= f.hidden_field :exam_registration_id, value: @registration.id %>
         <div class="mb-4">
           <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
-          <% @registration.exams.each do |exam| %>
+          <% @registration.available_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) %>

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

@@ -9,7 +9,7 @@
 <% @stats = @exercise.stats_for(current_user) %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
-  <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: { duration: @exercise.navigable_parent.time_left(current_user) } %>
 <% end %>
 
 <% unless @exercise.input_kids? %>

data/app/views/guides/_guide.html.erb

@@ -3,7 +3,7 @@
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
 <% if subject.timed? && @stats.started? && !current_user.teacher? %>
-  <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: { duration: subject.time_left(current_user) } %>
 <% end %>
 
 <%= yield if block_given? %>

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

@@ -4,7 +4,7 @@
     <i class="timer timer-text text-center"><%= t :time_left %></i>
     <i id="timer" class="timer timer-text text-center"></i>
     <script>
-      mumuki.startTimer('<%= end_time&.iso8601 %>');
+      mumuki.startTimer(<%= duration %>);
     </script>
   </div>
 </div>

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

@@ -1,19 +1,23 @@
-<fieldset>
-  <div><%= form.label(t :first_name) %></div>
-  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :last_name) %></div>
-  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :gender) %></div>
-  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
-</fieldset>
-<fieldset>
-  <div><%= form.label(t :birthdate) %></div>
-  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
-</fieldset>
+<div class="row">
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :first_name) %></div>
+    <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-6">
+    <div><%= form.label(t :last_name) %></div>
+    <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
+  </fieldset>
+</div>
+<div class="row">
+  <fieldset class="col-lg-4">
+    <div><%= form.label(t :birthdate) %></div>
+    <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
+  </fieldset>
+  <fieldset class="col-lg-4 offset-lg-2">
+    <div><%= form.label(t :gender) %></div>
+    <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
+  </fieldset>
+</div>
 <fieldset>
   <div><%= form.label(t :email) %></div>
   <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>

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

@@ -1,22 +1,24 @@
 <%= form_for :user, url: user_path, :html => { id: 'mu-user-form', class: 'mu-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
-    <div class="mu-profile-actions d-none d-md-block">
-      <%= cancel_edit_profile_button %>
-      <%= save_edit_profile_button f %>
-    </div>
   </div>
   <div class="row mu-tab-body">
-    <div class="col-md-6 col-lg-4 mu-user-avatar-container">
+    <div class="col-md-6 col-lg-4 mu-user-avatar-container mb-3">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
       <button class="fas fa-pencil-alt fa-2x btn mu-edit-avatar" type="button" data-bs-toggle="modal" data-bs-target="#mu-avatar-picker" tabindex="0"></button>
     </div>
-    <div class="col-md-6 col-lg-8">
+    <div class="col-md-6 col-lg-8 mb-4">
+      <% unless current_user.profile_completed? %>
+        <div class="alert alert-info alert-dismissible fade show" role="alert">
+          <%= fa_icon 'info-circle', class: 'fa-lg me-2 align-middle', text: t(:please_fill_profile_data) %>
+          <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+      <% end %>
       <%= render partial: 'profile_fields', locals: {form: f} %>
       <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
-  <div class="mu-profile-actions mobile d-block d-md-none">
+  <div class="mu-profile-actions">
     <%= cancel_edit_profile_button %>
     <%= save_edit_profile_button f %>
   </div>

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

@@ -7,9 +7,14 @@ module Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   def validate_accessible!
     current_access_mode.validate_content_here! subject_container
+    super
   end
 
   def subject_container
     subject
   end
+
+  def accessible_subject
+    nil
+  end
 end

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

@@ -13,6 +13,7 @@ en:
   all: All
   appendix: Appendix
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
+  approved_by: Validated by %{validator} at %{date}
   approved_message: Validated by mentor
   approved_messages:
     other: validated
@@ -120,9 +121,9 @@ en:
   errored: Oops, your solution didn't work
   exam_authorization_pending_explanation_html: You have until <strong>%{end_time}</strong> (%{location} time) 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_authorization_request_approved_html: Your request was approved, don't forget to log in at <strong>%{date}</strong> (%{location} time). Good luck!
-  exam_authorization_request_created: Your registration to the exam has been saved!
+  exam_authorization_request_created: You registered for the exam on %{friendly_date}
   exam_authorization_request_rejected: Your request was rejected because you didn't meet the requirements.
-  exam_authorization_request_saved: Your registration to the exam has been updated!
+  exam_authorization_request_saved: You've changed your registration to the exam to %{friendly_date}
   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> (%{location} time) to register. After that date, your request will be processed and you will receive a confirmation. <br> Don't forget to check the notifications!

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

@@ -11,6 +11,7 @@ es-CL:
   and: y
   appendix: Apéndice
   appendix_teaser: ¿Quieres saber más? <a href="%{link}">Consulta el apéndice de este capítulo</a>
+  approved_by: Validado por %{validator} el %{date}
   approved_message: Validado por mentorías
   approved_messages:
     one: validado
@@ -123,9 +124,9 @@ es-CL:
   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 examen se registró exitosamente!
+  exam_authorization_request_created: Te has inscripto al examen del día %{friendly_date}
   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 examen se modificó exitosamente!
+  exam_authorization_request_saved: Has cambiado tu inscripción al examen al día %{friendly_date}
   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 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!

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

@@ -14,6 +14,7 @@ es:
   and: y
   appendix: Apéndice
   appendix_teaser: ¿Querés saber más? <a href="%{link}">Consultá el apéndice de este capítulo</a>
+  approved_by: Validado por %{validator} el %{date}
   approved_message: Validado por mentorías
   approved_messages:
     one: validado
@@ -130,9 +131,9 @@ es:
   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 examen se registró exitosamente!
+  exam_authorization_request_created: Te inscribiste al examen del día %{friendly_date}
   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 examen se modificó exitosamente!
+  exam_authorization_request_saved: Cambiaste tu inscripción al examen al día %{friendly_date}
   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 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!

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

@@ -13,6 +13,7 @@ pt:
   and: e
   appendix: Apêndice
   appendix_teaser: Você quer saber mais? <a href="%{link}"> Consulte o apêndice deste capítulo </a>
+  approved_by: Validado pelo %{validator} em %{date}
   approved_message: Validado pelo mentor
   approved_messages:
     one: validado
@@ -123,9 +124,9 @@ pt:
   errored: Opa! Sua solução não pode ser executada
   exam_authorization_pending_explanation_html: Você tem tempo até <strong>%{date}</strong> (horário de %{location}) para se inscrever. Após essa data, sua inscrição será avaliada e você receberá uma confirmação. <br> Não se esqueça de verificar as notificações!
   exam_authorization_request_approved_html: Sua solicitação foi aprovada, não se esqueça de conectar em <strong>%{date}</strong> (horário de %{location}). Boa sorte!
-  exam_authorization_request_created: Seu registro de exame foi salvo com sucesso!
+  exam_authorization_request_created: Você se inscreveu para o exame do dia %{friendly_date}
   exam_authorization_request_rejected: Sua solicitação foi rejeitada porque você não atendeu aos requisitos.
-  exam_authorization_request_saved: Seu registro de exame foi modificado com sucesso!
+  exam_authorization_request_saved: Você alterou seu registro de exame para o dia %{friendly_date}
   exam_authorization_request_updated: Há notícias sobre seu registro para %{description}
   exam_registration_choose_exam: Selecione o dia e a hora em que gostaria de fazer o exame
   exam_registration_explanation_html: Você tem tempo até <strong>%{date}</strong> (horário de %{location}) para se inscrever. Após essa data, sua inscrição será avaliada e você receberá uma confirmação. <br> Não se esqueça de verificar as notificações!

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.17.0'
+    VERSION = '9.20.0'
   end
 end

data/spec/controllers/exam_authorization_requests_controller_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe ExamAuthorizationRequestsController, type: :controller, organization_workspace: :test do
   let(:user) { create(:user) }
   let(:exam) { create(:exam) }
-  let(:exam_registration) { create(:exam_registration, exams: [exam]) }
+  let(:exam_id) { exam.id }
+  let(:organization) { Organization.current }
+  let(:exam_registration) { create(:exam_registration, exams: [exam], organization: organization) }
 
   before { set_current_user! user }
 
@@ -12,12 +14,24 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
 
     def do_post
       post :create, params: {
-        exam_authorization_request: { exam_id: exam.id, exam_registration_id: exam_registration.id }
+        exam_authorization_request: { exam_id: exam_id, exam_registration_id: exam_registration.id }
       }
     end
 
     before { do_post }
 
+    describe 'called once in wrong organization' do
+      let(:organization) { create(:organization, name: 'other') }
+      it { expect(response.status).to eq 404 }
+      it { expect(exam_registration.authorization_requests.size).to be 0 }
+    end
+
+    describe 'called once with wrong exam' do
+      let(:exam_id) { create(:exam).id }
+      it { expect(response.status).to eq 404 }
+      it { expect(exam_registration.authorization_requests.size).to be 0 }
+    end
+
     describe 'called once' do
       it { expect(response.status).to eq 302 }
       it { expect(exam_registration.authorization_requests.size).to be 1 }

data/spec/controllers/exercises_controller_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe ExercisesController, organization_workspace: :test do
+  let(:user) { create(:user) }
+
+  let(:problem) { create(:problem) }
+  let!(:exam) { create :exam, exercises: [problem], duration: 10, start_time: 1.hour.ago, end_time: 1.hour.since }
+
+  before { reindex_current_organization! }
+  before { set_current_user! user }
+
+
+  describe 'show' do
+    context 'when user is in the middle of an exam' do
+
+      let!(:exam_authorization) { create :exam_authorization, exam: exam, user: user, started: true, started_at: started_at }
+      before { get :show, params: { id: problem.id } }
+
+      context 'when user is not out of time yet' do
+        let(:started_at) { 5.minutes.ago }
+
+        it { expect(response.status).to eq 200 }
+      end
+
+      context 'when user is out of time' do
+        let(:started_at) { 20.minutes.ago }
+
+        it { expect(response.status).to eq 410 }
+      end
+    end
+  end
+end

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: 20210803175124) do
+ActiveRecord::Schema.define(version: 20210929223144) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -194,6 +194,7 @@ ActiveRecord::Schema.define(version: 20210803175124) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "processed", default: false
+    t.integer "authorization_requests_limit"
     t.index ["organization_id"], name: "index_exam_registrations_on_organization_id"
   end
 

data/spec/dummy/db/seeds.rb

@@ -9,22 +9,30 @@ Organization.find_or_create_by!(name: 'base') do |org|
   org.public = true
   org.login_methods = Mumukit::Login::Settings.login_methods
   org.locale = 'es'
+  org.time_zone = 'Buenos Aires'
 end
 
 Organization.find_or_create_by!(name: 'private') do |org|
-  org.book = Book.find_by!(slug: 'mumukiproject/mumuki-libro-aprende-a-programar-recorrido-extendido')
+  org.book = Book.find_by!(slug: 'mumuki/mumuki-libro-programacion')
   org.public = false
+  org.time_zone = 'Buenos Aires'
 end
 
-  Organization.find_or_create_by!(name: 'primaria') do |org|
-    org.book = Book.find_by!(slug: 'mumukiproject/mumuki-libro-primaria')
-    org.login_methods = Mumukit::Login::Settings.login_methods
-    org.public = true
-  end
+Organization.find_or_create_by!(name: 'primaria') do |org|
+  org.book = Book.find_by!(slug: 'mumukiproject/mumuki-libro-primaria')
+  org.login_methods = Mumukit::Login::Settings.login_methods
+  org.public = true
+  org.time_zone = 'Buenos Aires'
+end
 
-Organization.find_or_create_by!(name: 'central')
+Organization.find_or_create_by!(name: 'central') do |org|
+  org.book = Book.find_by!(slug: 'mumuki/mumuki-libro-programacion')
+  org.login_methods = Mumukit::Login::Settings.login_methods
+  org.public = true
+  org.time_zone = 'Buenos Aires'
+end
 
-User.find_or_create_by!(uid: 'dev.student@mumuki.org') { |org| org.permissions = {student: 'central/*'} }
+User.find_or_create_by!(uid: 'dev.student@mumuki.org') { |org| org.permissions = {student: 'private/*'} }
 User.find_or_create_by!(uid: 'dev.teacher@mumuki.org') { |org| org.permissions = {teacher: 'private/*'} }
 User.find_or_create_by!(uid: 'dev.admin@mumuki.org') { |org| org.permissions = {admin: '*/*'} }
 User.find_or_create_by!(uid: 'dev.owner@mumuki.org') { |org| org.permissions = {owner: '*/*'} }

data/spec/features/read_only_flow_spec.rb

@@ -470,20 +470,22 @@ feature 'Read Only Flow' do
 
       context 'and user is ex student of organization' do
         before { user.update! permissions: { ex_student: slug } }
-        scenario 'avatar dorpdown' do
+        scenario 'avatar dropdown' do
           visit "/"
           find('#profileDropdown').click
-          expect(page).not_to have_text('My account')
-          expect(page).not_to have_text('FAQs')
-          expect(page).not_to have_text('Classroom')
-          expect(page).not_to have_text('Solve other\'s doubts')
+          expect(page).to have_text('My account')
+          expect(page).to have_text('FAQs')
           expect(page).not_to have_text('My doubts')
+          expect(page).not_to have_text('Classroom')
           expect(page).not_to have_text('Bibliotheca')
+          expect(page).not_to have_text('Solve other\'s doubts')
           expect(page).to have_text('Sign Out')
         end
         scenario 'show book' do
           visit "/"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).not_to have_text('Chapter 1')
+          expect(page).not_to have_text('Chapter 2')
+          expect(page).not_to have_text('Practicing!')
         end
         scenario 'show chapter' do
           visit "/chapters/#{chapter1.id}"
@@ -503,27 +505,23 @@ feature 'Read Only Flow' do
         end
         scenario 'show profile' do
           visit "/user"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('My profile')
         end
         scenario 'show faqs' do
           visit "/faqs"
-          expect(page).to have_text('You are not allowed to see this content')
-        end
-        scenario 'show discussion' do
-          visit "/discussions"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('FAQs')
         end
         scenario 'show discussion in existent exercise' do
           visit "/exercises/#{exercise111.id}/discussions/#{discussion111.id}"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
         scenario 'show discussion in existent exercise' do
           visit "/exercises/#{exercise112.id}/discussions/#{discussion112.id}"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
         scenario 'new discussion' do
           visit "/exercises/#{exercise112.id}/discussions/new"
-          expect(page).to have_text('You are not allowed to see this content')
+          expect(page).to have_text('Page was not found')
         end
       end
 
@@ -740,7 +738,7 @@ feature 'Read Only Flow' do
 
       context 'and user is ex student of organization' do
         before { user.update! permissions: { ex_student: slug } }
-        scenario 'avatar dorpdown' do
+        scenario 'avatar dorpdownz' do
           visit "/"
           find('#profileDropdown').click
           expect(page).to have_text('My account')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.17.0
+  version: 9.20.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.17.0
+        version: 9.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.17.0
+        version: 9.19.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -438,7 +438,6 @@ files:
 - app/assets/javascripts/mumuki_laboratory/application/upload.js
 - app/assets/javascripts/mumuki_laboratory/application/user.js
 - app/assets/stylesheets/mumuki_laboratory/application.scss
-- app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_errors.scss
 - app/assets/stylesheets/mumuki_laboratory/application/_fonts.scss
@@ -800,6 +799,7 @@ files:
 - spec/controllers/exam_authorization_requests_controller_spec.rb
 - spec/controllers/exam_registrations_controller_spec.rb
 - spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/exercises_controller_spec.rb
 - spec/controllers/guide_progress_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
 - spec/controllers/messages_controller_spec.rb
@@ -984,135 +984,136 @@ signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/features/disable_user_flow_spec.rb
-- spec/features/exercise_flow_spec.rb
-- spec/features/certificate_programs_flow_spec.rb
-- spec/features/progressive_tips_spec.rb
-- spec/features/runner_assets_spec.rb
-- spec/features/guide_reset_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/notifications_flow_spec.rb
-- spec/features/menu_bar_spec.rb
-- spec/features/profile_flow_spec.rb
-- spec/features/terms_flow_spec.rb
-- spec/javascripts/results-renderers-spec.js
+- spec/evaluation_helper.rb
+- spec/spec_helper.rb
+- spec/capybara_helper.rb
+- spec/login_helper.rb
+- spec/javascripts/events-spec.js
 - spec/javascripts/i18n-spec.js
-- spec/javascripts/gamification-spec.js
-- spec/javascripts/global-spec.js
-- spec/javascripts/elipsis-spec.js
+- spec/javascripts/bridge-spec.js
 - spec/javascripts/kids-button-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/javascripts/spec-helper.js
+- spec/javascripts/gamification-spec.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/results-renderers-spec.js
 - spec/javascripts/upload-spec.js
+- spec/javascripts/sync-mode-spec.js
+- spec/javascripts/submissions-store-spec.js
+- spec/javascripts/elipsis-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/public/medal/outline.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/error/500.svg
+- spec/javascripts/csrf-token-spec.js
+- spec/javascripts/editors-spec.js
+- spec/javascripts/timeout-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/spec-helper.js
+- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/email_helper_spec.rb
+- spec/helpers/certificate_helper_spec.rb
+- spec/helpers/authors_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
+- spec/helpers/with_navigation_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
+- spec/helpers/icons_helper_spec.rb
+- spec/helpers/user_activity_helper_spec.rb
+- spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/application_helper_spec.rb
 - spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/timeout_1.svg
-- spec/dummy/public/error/timeout_2.svg
+- spec/dummy/public/error/500.svg
 - spec/dummy/public/error/401.svg
-- spec/dummy/public/error/403.svg
+- spec/dummy/public/error/404.svg
 - spec/dummy/public/error/410.svg
-- spec/dummy/public/character/animations.json
-- spec/dummy/public/character/magnifying_glass/apparition.svg
-- spec/dummy/public/character/magnifying_glass/loop.svg
-- spec/dummy/public/character/kibi/failure.svg
+- spec/dummy/public/error/403.svg
+- spec/dummy/public/error/timeout_2.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/failure.svg
 - spec/dummy/public/character/kibi/success2_l.svg
+- spec/dummy/public/character/kibi/jump.svg
+- spec/dummy/public/character/magnifying_glass/loop.svg
+- spec/dummy/public/character/magnifying_glass/apparition.svg
+- spec/dummy/public/character/animations.json
+- spec/dummy/public/medal/outline.svg
 - spec/dummy/Rakefile
 - spec/dummy/config/application.rb
-- spec/dummy/config/puma.rb
+- 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/cable.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/puma.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/rabbit.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/cable.yml
-- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.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/config/locales/en.yml
 - spec/dummy/bin/rails
+- spec/dummy/bin/yarn
 - 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/dummy/bin/bundle
+- spec/dummy/package.json
+- spec/dummy/db/schema.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/config.ru
+- spec/controllers/discussions_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/messages_controller_spec.rb
 - spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/exam_registrations_controller_spec.rb
+- spec/controllers/invitations_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/discussions_messages_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
 - spec/controllers/guide_progress_controller_spec.rb
 - spec/controllers/chapters_controller_spec.rb
-- spec/login_helper.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/exercises_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/exam_registrations_controller_spec.rb
+- spec/controllers/certificates_controller_spec.rb
+- spec/controllers/exam_authorization_requests_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/api_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
+- spec/features/login_flow_spec.rb
+- spec/features/links_flow_spec.rb
+- spec/features/notifications_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/immersive_redirection_spec.rb
+- spec/features/invitations_flow_spec.rb
+- spec/features/chapters_flow_spec.rb
+- spec/features/read_only_flow_spec.rb
+- spec/features/home_public_flow_spec.rb
+- spec/features/runner_assets_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
+- spec/features/user_activity_flow_spec.rb
+- spec/features/guides_flow_spec.rb
+- spec/features/terms_flow_spec.rb
+- spec/features/home_private_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/exercise_flow_spec.rb
+- spec/features/profile_flow_spec.rb
+- spec/features/certificate_programs_flow_spec.rb
+- spec/features/guide_reset_spec.rb
+- spec/features/topic_flow_spec.rb
+- spec/features/not_found_public_flow_spec.rb
+- spec/features/disable_user_flow_spec.rb
+- spec/features/lessons_flow_spec.rb
+- spec/features/menu_bar_spec.rb
+- spec/features/standard_flow_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/exams_flow_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/teaspoon_env.rb

data/app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss

@@ -1,3 +0,0 @@
-.alert {
-  margin-right: 15px;
-}