mumuki-laboratory 9.6.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd241aca9a26c54188bd561d66bdd169636645a0a811ddfdda36380e0ce6cd0d
-  data.tar.gz: 1b0ac735778e2bf364174ee9477d2366dd98f2e8d6c81c8ee94cfadd96148a11
+  metadata.gz: 97ae0a63f9a16ede7d8866af0c7b8231abd7f8ae678da1a694ce0aebe923f61e
+  data.tar.gz: 1ce819ad7a32aaaf7ede7ac15105acb8087d4e5a1b62961a10a184512b70de9c
 SHA512:
-  metadata.gz: '0818e279bf73c4e53d29ac86f25f04204f011a3441fda6aa2a5d32003cd57ecd026f751ccca5beb58c84014f9102548ccaa965239dfc0289ee7efdbae191c501'
-  data.tar.gz: d071e2c07cb581cb023e5e81719a9e8d7f0d61cfcf8f10edcda4bf01629cd190a38b16ebfef87716d1f3b8d494b0d0fa7e7d114dbc716f3caa68569bc21bf963
+  metadata.gz: 1e87629f7ae2d0c24d5ef892909d04e2ac9118beffb15ef3dd06055032f292454fb9be04b6280ee476953aa0fbcee37fcda044b344d7316c3527ca9d277ef806
+  data.tar.gz: 663bc32b009d62762c386151b0c67f680c6b382c67e9360b218a8132f3aed209daaa7f8b25860245666c5c2529f62138de732d6ff8599e1dc2767f8d4c04f02a

data/app/controllers/application_controller.rb

@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
 
   before_action :set_current_organization!
   before_action :set_locale!
+  before_action :set_time_zone!
 
   before_action :ensure_user_enabled!, if: :current_user?
   before_action :validate_active_organization!
@@ -30,6 +31,7 @@ class ApplicationController < ActionController::Base
   before_action :visit_organization!, if: :current_user?
 
   after_action :leave_organization!
+  after_action :unset_time_zone!
 
   helper_method :current_workspace,
                 :login_button,
@@ -143,6 +145,14 @@ class ApplicationController < ActionController::Base
     I18n.locale = Organization.current.locale
   end
 
+  def set_time_zone!
+    Time.zone = Organization.current.time_zone
+  end
+
+  def unset_time_zone!
+    Time.zone = nil
+  end
+
   def subject #TODO may be used to remove breadcrumbs duplication
     nil
   end

data/app/controllers/exam_authorization_requests_controller.rb

@@ -1,4 +1,7 @@
 class ExamAuthorizationRequestsController < ApplicationController
+
+  before_action :verify_registration_opened!, on: [:create, :update]
+
   def create
     authorization_request = ExamAuthorizationRequest.find_or_create_by! create_authorization_request_params do |it|
       it.assign_attributes authorization_request_params
@@ -25,4 +28,9 @@ class ExamAuthorizationRequestsController < ApplicationController
         .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
         .merge(user: current_user, organization: Organization.current)
   end
+
+  def verify_registration_opened!
+    exam_registration = ExamRegistration.find(authorization_request_params[:exam_registration_id])
+    raise Mumuki::Domain::GoneError if exam_registration.end_time.past?
+  end
 end

data/app/helpers/exam_registration_helper.rb

@@ -0,0 +1,13 @@
+module ExamRegistrationHelper
+  def exam_registration_view
+    if @registration.end_time.past?
+      { icon: :times_circle, class: :danger, t: :exam_registration_finished_html }
+    else
+      { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }
+    end
+  end
+
+  def current_time_zone_html
+    %Q{(<span class="select-date-timezone">#{Organization.current&.time_zone}</span>)}.html_safe
+  end
+end

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

@@ -1 +1,2 @@
-<%= t :exam_authorization_request_approved_html, date: l(authorization_request.exam.start_time.in_time_zone(-3), format: :long) %>
+<%= t :exam_authorization_request_approved_html, date: l(authorization_request.exam.start_time, format: :long),
+                                                 location: Organization.current.time_zone %>

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

@@ -1,4 +1,5 @@
 <%= t :exam_authorization_pending_explanation_html,
-      date: l(authorization_request.exam.start_time.in_time_zone(-3), format: :long),
-      end_time: l(authorization_request.exam_registration.end_time.in_time_zone(-3), format: :long),
+      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) %>

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

@@ -12,25 +12,27 @@
 
 <div class="row">
   <div class="col-lg-12">
-    <div class="bs-callout bs-callout-info">
-      <h4 class="text-info">
-        <strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>
-      </h4>
+    <div class="bs-callout bs-callout-<%= exam_registration_view[:class] %>">
+        <h4 class="text-<%= exam_registration_view[:class] %>">
+          <strong><%= fa_icon exam_registration_view[:icon] %> <%= t :important_info %></strong>
+        </h4>
       <p>
-        <%= t :exam_registration_explanation_html, date: l(@registration.end_time.in_time_zone(-3), format: :long) %>
+        <%= t exam_registration_view[:t], date: l(@registration.end_time, format: :long), location: Organization.current.time_zone %>
       </p>
     </div>
-    <%= 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.in_time_zone(-3), format: :long), class: 'form-check-label' %>
-        </div>
+    <% unless @registration.end_time.past? %>
+      <%= 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 %>
+        <button class="btn btn-complementary"> <%= t :save %> </button>
       <% end %>
-      <button class="btn btn-complementary"> <%= t :save %> </button>
     <% end %>
   </div>
 </div>

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

@@ -22,7 +22,7 @@
                 <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<%= "exam_authorization_collapse_item_#{index}" %>" aria-expanded="false" aria-controls="<%= "exam_authorization_collapse_item_#{index}" %>">
                   <span class="fa fa-fw fa-<%= it.icon[:class] %> text-<%= it.icon[:type] %>" data-bs-toggle="tooltip" title="<%= t(it.status).humanize %>"></span>
                   <span class="divider-vertical"></span>
-                  <span><strong><%= it.exam_registration.description %></strong> - <small><%= l(it.exam.start_time.in_time_zone(-3), format: :long) %></small></span>
+                  <span><strong><%= it.exam_registration.description %></strong> - <small><%= l(it.exam.start_time, format: :long) %></small></span>
                 </button>
               </h2>
               <div id="<%= "exam_authorization_collapse_item_#{index}" %>" class="accordion-collapse collapse" aria-labelledby="<%= "exam_authorization_accordion_item_#{index}" %>" data-bs-parent="#exam_authorization_accordion">

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

@@ -108,14 +108,15 @@ en:
   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_pending_explanation_html: You have until <strong>%{end_time}</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_authorization_request_approved_html: Your request was approved, don't forget to log in at <strong>%{date}</strong>. Good luck!
+  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_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_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_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!
+  exam_registration_finished_html: Registration for this exam ended on <strong>%{date}</strong> (%{location} time)
   exam_registration_open: Registrations open for %{description}!
   exam_registration_to: Registration to %{description}
   exams_will_be_here: Your exams in the organization will appear here.

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

@@ -108,14 +108,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> para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
-  exam_authorization_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong>. ¡Buena suerte!
+  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_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_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_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_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}!
   exam_registration_to: Inscripción a %{description}
   exams_will_be_here: Tus exámenes en esta organización aparecerán acá

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

@@ -116,14 +116,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> 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_request_approved_html: Tu solicitud fue aprobada, no olvides conectarte el <strong>%{date}</strong>. ¡Buena suerte!
+  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_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_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_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: Tenés tiempo hasta el <strong>%{date}</strong> 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_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}!
   exam_registration_to: Inscripción a %{description}
   exams_will_be_here: Tus exámenes en esta organización aparecerán acá

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

@@ -111,14 +111,15 @@ pt:
   error_500: erro 500
   error_description: Isto é o que é conhecido como <span class = "error-link"> %{error} </ span>.
   errored: Opa! Sua solução não pode ser executada
-  exam_authorization_pending_explanation_html: Você tem tempo até <strong>%{date}</strong> 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>. Boa sorte!
+  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_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_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> 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_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!
+  exam_registration_finished_html: A inscrição para este exame terminou na <strong>%{date}</strong> (horário de %{location})
   exam_registration_open: "¡Inscrições abertas para %{description}!"
   exam_registration_to: Inscrição a %{description}
   exams_will_be_here: Seus Examesca nesta organização aparecerão aqui

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.6.0'
+    VERSION = '9.7.0'
   end
 end

data/spec/controllers/exam_authorization_requests_controller_spec.rb

@@ -10,14 +10,64 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
   describe 'create' do
     let!(:notification) { create(:notification, target: exam_registration, user: user) }
 
-    before do
+    def do_post
       post :create, params: {
         exam_authorization_request: { exam_id: exam.id, exam_registration_id: exam_registration.id }
       }
     end
 
+    before { do_post }
+
+    describe 'called once' do
+      it { expect(response.status).to eq 302 }
+      it { expect(exam_registration.authorization_requests.size).to be 1 }
+      it { expect(notification.reload.read).to be_truthy }
+    end
+
+    describe 'called twice' do
+      before { do_post }
+      it { expect(response.status).to eq 302 }
+      it { expect(exam_registration.authorization_requests.size).to be 1 }
+      it { expect(notification.reload.read).to be_truthy }
+    end
+  end
+
+  describe 'update' do
+    let(:exam_authorization_request) { create :exam_authorization_request, exam: exam, exam_registration: exam_registration, user: user }
+
+    before do
+      put :update, params: {
+        id: exam_authorization_request.id,
+        exam_authorization_request: { exam_id: exam.id, exam_registration_id: exam_registration.id }
+      }
+    end
+
     it { expect(response.status).to eq 302 }
-    it { expect(exam_registration.authorization_requests.length).to be 1 }
-    it { expect(notification.reload.read).to be_truthy }
+    it { expect(exam_registration.authorization_requests.size).to be 1 }
+  end
+
+  describe 'fails if exam_registration time ended' do
+    let(:exam_registration) { create(:exam_registration, exams: [exam], end_time: 2.minutes.ago) }
+    let(:exam_authorization_request) { create :exam_authorization_request, exam: exam, exam_registration: exam_registration, user: user }
+
+    describe 'create' do
+      before do
+        post :create, params: {
+          exam_authorization_request: { exam_id: exam.id, exam_registration_id: exam_registration.id }
+        }
+      end
+      it { expect(response.status).to eq 410 }
+    end
+
+    describe 'update' do
+      before do
+        put :update, params: {
+          id: exam_authorization_request.id,
+          exam_authorization_request: { exam_id: exam.id, exam_registration_id: exam_registration.id }
+        }
+      end
+      it { expect(response.status).to eq 410 }
+    end
   end
+
 end

data/spec/controllers/organizations_api_controller_spec.rb

@@ -198,6 +198,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
                 terms_of_service: 'A TOS',
                 public: false,
                 login_methods: ['facebook', 'user_pass'],
+                time_zone: 'UTC',
                 book: book }
       let(:updated_organizaton) { organization.reload }
       let(:update_json) { {contact_email: 'second_email@gmail.com', immersive: true, locale: 'en'} }
@@ -214,7 +215,8 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
                                               description: "a great org",
                                               locale: 'en',
                                               contact_email: "second_email@gmail.com",
-                                              terms_of_service: 'A TOS'
+                                              terms_of_service: 'A TOS',
+                                              time_zone: 'UTC'
                                             },
                                             settings: {
                                               login_methods: ["facebook", "user_pass"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.7.0
 platform: ruby
 authors:
 - Franco Bulgarelli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.6.0
+        version: 9.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.6.0
+        version: 9.7.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -553,6 +553,7 @@ files:
 - app/helpers/editor_helper.rb
 - app/helpers/editor_tabs_helper.rb
 - app/helpers/email_helper.rb
+- app/helpers/exam_registration_helper.rb
 - app/helpers/exercise_input_helper.rb
 - app/helpers/gamification_helper.rb
 - app/helpers/globals_helper.rb