mumuki-laboratory 9.5.0 → 9.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 598ef4d5c4426c6ea43779dc40f73a06e9ed5711d4e5888d093449095c05d5e9
-  data.tar.gz: eb8d8d5c9348f0408b299d1597c940961dd822787726f646f62e4a3072af8b93
+  metadata.gz: 056cc83a8d85f40686f296443a3d763a54c4468690c3ef910dc2904b34de11af
+  data.tar.gz: 1ed4f7722f9679d5270652b9d482a7feb80a4fbcf5d69dc1fa70216fdbf1c1d4
 SHA512:
-  metadata.gz: 0f330db4125a3b789d48a458f3de9c2106f2af89343a381d8cd2a89530ce185d8645cbaab42063ecdd2afb0c75ad40d1a52fb085bd29b656fb7e2953e6a0c92e
-  data.tar.gz: 7fe289dcbf8ec42865983f42cf4c27a37fb64dcafbe875588dba9c9cef85f74cfa75584da4d4a0a3cde6b598902876928e261ee5c2d01e460a9489f80b50335e
+  metadata.gz: 43c24f7a0781e0ebb34078c77e10947aaa1461d739446631d7d351717a077d8157da58dbc133778191d8c1775bb1b88b7b0a390fa5aafbc7eab41a32fa0f937b
+  data.tar.gz: 770f3e5e828ee275ce27504cf696983192b6e4a737d4e29ca20d0b97a5fe73eeb3190df4c63584f045b2a920f0846b7773f0fce7bb7a3ef84abf1f634310bae3

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

@@ -21,13 +21,8 @@
   width: 157px;
   border: none;
 }
+
 .mu-certificate-download-btn-icon {
-  border-right: 1px solid darken($mu-color-complementary, 10%);
   padding: 8px 6px 9px 6px;
   width: 35px;
 }
-.mu-certificate-download-btn-text {
-  display: inline-block;
-  width: 115px;
-  text-align: center;
-}

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/concerns/with_certificate_render.rb

@@ -10,7 +10,7 @@ module WithCertificateRender
   end
 
   def qr_for(certificate)
-    qr = RQRCode::QRCode.new(verify_certificate_url certificate.code).as_svg(color: '0B465D')
+    qr = RQRCode::QRCode.new(verify_certificate_url certificate.organization, certificate.code).as_svg(color: '0B465D')
     "data:image/svg+xml,#{URI.encode(qr)}"
   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/discussions_helper.rb

@@ -200,7 +200,7 @@ module DiscussionsHelper
     if discussion.responsible?(user)
       t('moderator_take_care.you_are')
     else
-      t('moderator_take_care.moderator_is', moderator: discussion_user_name(@discussion.responsible_moderator_by))
+      t('moderator_take_care.moderator_is', moderator: discussion_user_name(discussion.responsible_moderator_by))
     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/mailers/user_mailer.rb

@@ -23,7 +23,7 @@ class UserMailer < ApplicationMailer
   def certificate(certificate)
     with_locale certificate.user, certificate.organization do
       attachments[certificate.filename] = pdf_for(certificate)
-      mail to: certificate.user.email, subject: t(:certificate)
+      mail to: certificate.user.email, subject: certificate.description
     end
   end
 

data/app/views/certificates/_certificate.html.erb

@@ -38,7 +38,7 @@
 <div class="mu-certificate-box">
   <img src="<%= certificate.background_image_url %>" class="background-image"/>
   <%= render inline: certificate.template_html_erb, locals: certificate.template_locals %>
-  <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
+  <a href="<%= verify_certificate_url certificate.organization, certificate.code %>" target="_blank">
     <div><img class="qr-code" src="<%= qr_for certificate %>"/></div>
   </a>
 </div>

data/app/views/certificates/verify.html.erb

@@ -7,7 +7,7 @@
 <div class="container">
   <div class="row mu-certificate-data">
     <div class="col-md-6">
-      <div class="row text-center jumbotron">
+      <div class="row text-center bg-light p-4 rounded-3 mb-4">
         <div class="col-md-12">
           <h3 class="mu-certificate-name">
             <%= t :completed_by %>
@@ -18,13 +18,12 @@
         </div>
       </div>
       <% if @certificate.for_user? current_user %>
-        <div class="row mu-certificate-buttons">
-          <a href="<%= linkedin_post_url @certificate %>" target="_blank">
-            <img src="https://download.linkedin.com/desktop/add2profile/buttons/<%= t :linkedin_profile_button_locale %>.png" alt="LinkedIn Add to Profile button">
+        <div class="mu-certificate-buttons d-flex justify-content-evenly">
+          <a class="btn btn-complementary mu-certificate-download-btn mx-2" href="<%= download_certificate_path @certificate.code %>" target="_blank">
+            <%= fa_icon(:download, class: 'fa-fw fa-lg mu-certificate-download-btn-icon', text: t(:certificate)) %>
           </a>
-          <a class="btn btn-complementary mu-certificate-download-btn pull-right" href="<%= download_certificate_path @certificate.code %>" target="_blank">
-            <i class="fas fa-fw fa-lg fa-download mu-certificate-download-btn-icon"></i>
-            <span class="mu-certificate-download-btn-text"><%= t :certificate %></span>
+          <a href="<%= linkedin_post_url @certificate %>" class="mx-2" target="_blank">
+            <img src="https://download.linkedin.com/desktop/add2profile/buttons/<%= t :linkedin_profile_button_locale %>.png" alt="LinkedIn Add to Profile button">
           </a>
         </div>
       <% 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, 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, 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,28 @@
 
 <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, 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, 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/user_mailer/certificate.html.erb

@@ -76,20 +76,7 @@
                         <table border="0" cellpadding="0" cellspacing="0" class="muMailCaptionRightContentOuter" width="100%">
                           <tbody><tr>
                             <td valign="top" class="muMailCaptionRightContentInner" style="padding:0 9px ;">
-                              <table align="left" border="0" cellpadding="0" cellspacing="0" class="muMailCaptionRightImageContentContainer" width="264">
-                                <tbody><tr>
-                                  <td class="muMailCaptionRightImageContent" align="center" valign="top">
-
-
-
-                                    <img alt="" src="https://gallery.mailchimp.com/046b6c670d9f80ebd6c5d075b/images/225fe60f-780a-451e-90aa-afb01f88a1b4.png" width="159" style="max-width:159px;" class="muMailImage">
-
-
-
-                                  </td>
-                                </tr>
-                                </tbody></table>
-                              <table class="muMailCaptionRightTextContentContainer" align="right" border="0" cellpadding="0" cellspacing="0" width="264">
+                              <table class="muMailCaptionRightTextContentContainer" align="center" border="0" cellpadding="0" cellspacing="0" width="264">
                                 <tbody><tr>
                                   <td valign="top" class="muMailTextContent">
                                     <h3 class="null" style="text-align: center;"><br>
@@ -115,6 +102,15 @@
                     <tbody class="muMailButtonBlockOuter">
                     <tr>
                       <td style="padding-top:0; padding-right:18px; padding-bottom:18px; padding-left:18px;" valign="top" align="center" class="muMailButtonBlockInner">
+                        <table border="0" cellpadding="0" cellspacing="0" class="muMailButtonContentContainer" style="border-collapse: separate !important;border-radius: 3px;background-color: #FF5B81;">
+                          <tbody>
+                          <tr>
+                            <td align="center" valign="middle" class="muMailButtonContent" style="font-family: Helvetica; font-size: 18px; padding: 18px;">
+                              <a class="muMailButton " title=<%= t :my_profile %> href=<%= @organization.url_for('/user') %> target="_self" style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"><%= t :my_profile %></a>
+                            </td>
+                          </tr>
+                          </tbody>
+                        </table>
                       </td>
                     </tr>
                     </tbody>

data/config/initializers/wicked_pdf.rb

@@ -0,0 +1,5 @@
+require 'wicked_pdf'
+
+WickedPdf.config = {
+  encoding: 'utf8'
+}

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.
@@ -216,6 +217,9 @@ en:
   need_help: I need help!
   never: never
   new: New
+  new_certificate_mailer_title: 'Congratulations'
+  new_certificate_mailer_p1: 'Your new certificate is ready'
+  new_certificate_mailer_p2: 'You can find it attached to this email or you can view it in your Mumuki profile'
   new_message_placeholder: Write a message for your teacher...
   new_message_received: You have a new message from %{sender}
   next_exercise: Next

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á
@@ -220,6 +221,9 @@ es-CL:
   new: Nuevo
   new_discussion: Nueva consulta
   new_message: ¿Tienes dudas? ¡Levanta la mano!
+  new_certificate_mailer_title: 'Felicitaciones'
+  new_certificate_mailer_p1: 'Ya está listo tu nuevo certificado'
+  new_certificate_mailer_p2: 'Podés descargarlo desde el adjunto de este mail o bien visualizarlo en tu perfil de Mumuki'
   new_message_placeholder: Escribe el mensaje para tu docente acá...
   new_message_received: Tienes un nuevo mensaje de %{sender}
   next_exercise: Siguiente

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á
@@ -228,6 +229,9 @@ es:
   need_help: No entiendo, ¡necesito ayuda!
   never: nunca
   new: Nuevo
+  new_certificate_mailer_title: 'Felicitaciones'
+  new_certificate_mailer_p1: 'Ya está listo tu nuevo certificado'
+  new_certificate_mailer_p2: 'Podés descargarlo desde el adjunto de este mail o bien visualizarlo en tu perfil de Mumuki'
   new_discussion: Nueva consulta
   new_message: ¿Tenés dudas? ¡Levantá la mano!
   new_message_placeholder: Escribí el mensaje para tu docente 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
@@ -222,6 +223,9 @@ pt:
   need_help: Não entendo, preciso de ajuda!
   never: nunca
   new: Novo
+  new_certificate_mailer_title: 'Parabéns'
+  new_certificate_mailer_p1: 'Seu novo certificado está pronto'
+  new_certificate_mailer_p2: 'Você pode baixá-lo do anexo deste e-mail ou visualizá-lo em seu perfil Mumuki'
   new_message: Você tem dúvidas? Levante a mão!
   new_message_placeholder: Escreva sua mensagem para o seu professor aqui ...
   new_message_received: Você tem uma nova mensagem de %{sender}

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.5.0'
+    VERSION = '9.7.2'
   end
 end

data/lib/tasks/messages.rake

@@ -6,11 +6,9 @@ namespace :laboratory do
       logger.info 'Listening to messages'
 
       Mumukit::Nuntius::Consumer.start 'teacher-messages', 'teacher-messages' do |_delivery_info, _properties, body|
-        begin
-          Message.import_from_resource_h!(body)
-        rescue ActiveRecord::RecordInvalid => e
-          logger.info e
-        end
+        ApplicationRecord.with_pg_retry { Message.import_from_resource_h!(body) }
+      rescue ActiveRecord::RecordInvalid => e
+        logger.info e
       end
     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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.7.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.5.0
+        version: 9.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.5.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
@@ -726,6 +727,7 @@ files:
 - config/initializers/inflections.rb
 - config/initializers/omniauth.rb
 - config/initializers/session_store.rb
+- config/initializers/wicked_pdf.rb
 - config/routes.rb
 - lib/mumuki/laboratory.rb
 - lib/mumuki/laboratory/controllers.rb
@@ -961,134 +963,134 @@ signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/discussions_messages_controller_spec.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
-- spec/controllers/certificates_controller_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/exam_registrations_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/invitations_controller_spec.rb
-- spec/controllers/exam_authorization_requests_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/capybara_helper.rb
-- spec/evaluation_helper.rb
-- spec/mailers/previews/user_mailer_preview.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/spec_helper.rb
-- spec/api_helper.rb
-- spec/features/not_found_public_flow_spec.rb
-- spec/features/invitations_flow_spec.rb
-- spec/features/immersive_redirection_spec.rb
-- spec/features/runner_assets_spec.rb
-- spec/features/certificate_programs_flow_spec.rb
-- spec/features/chapters_flow_spec.rb
-- spec/features/links_flow_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/standard_flow_spec.rb
-- spec/features/complements_flow_spec.rb
-- spec/features/profile_flow_spec.rb
-- spec/features/progressive_tips_spec.rb
-- spec/features/exams_flow_spec.rb
-- spec/features/guide_reset_spec.rb
-- spec/features/disable_user_flow_spec.rb
-- spec/features/discussion_flow_spec.rb
-- spec/features/home_private_flow_spec.rb
-- spec/features/menu_bar_spec.rb
-- spec/features/exercise_flow_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/disabled_organization_flow_spec.rb
-- spec/features/notifications_flow_spec.rb
-- spec/features/user_activity_flow_spec.rb
-- spec/features/terms_flow_spec.rb
-- spec/features/guides_flow_spec.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/home_public_flow_spec.rb
-- spec/features/not_found_private_flow_spec.rb
-- spec/features/dynamic_exam_spec.rb
-- spec/javascripts/spec-helper.js
-- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/kids-button-spec.js
+- spec/javascripts/elipsis-spec.js
+- spec/javascripts/sync-mode-spec.js
 - spec/javascripts/i18n-spec.js
-- spec/javascripts/timeout-spec.js
-- spec/javascripts/global-spec.js
+- spec/javascripts/timer-spec.js
+- spec/javascripts/editors-spec.js
+- spec/javascripts/results-renderers-spec.js
 - spec/javascripts/csrf-token-spec.js
-- spec/javascripts/submissions-store-spec.js
-- spec/javascripts/events-spec.js
 - spec/javascripts/gamification-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/javascripts/elipsis-spec.js
-- spec/javascripts/kids-button-spec.js
-- spec/javascripts/upload-spec.js
-- spec/javascripts/editors-spec.js
+- spec/javascripts/submissions-store-spec.js
 - spec/javascripts/bridge-spec.js
+- spec/javascripts/upload-spec.js
 - spec/javascripts/exercise-spec.js
-- spec/javascripts/timer-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/events-spec.js
 - spec/javascripts/speech-bubble-renderer-spec.js
+- spec/javascripts/spec-helper.js
+- spec/javascripts/timeout-spec.js
+- spec/teaspoon_env.rb
+- spec/helpers/certificate_helper_spec.rb
+- spec/helpers/application_helper_spec.rb
 - spec/helpers/breadcrumbs_helper_spec.rb
-- spec/helpers/email_helper_spec.rb
 - spec/helpers/authors_helper_spec.rb
-- spec/helpers/avatar_helper_spec.rb
-- spec/helpers/with_choices_spec.rb
 - spec/helpers/icons_helper_spec.rb
-- spec/helpers/with_navigation_spec.rb
+- spec/helpers/email_helper_spec.rb
 - spec/helpers/exercise_input_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/helpers/application_helper_spec.rb
+- spec/helpers/with_navigation_spec.rb
 - spec/helpers/user_activity_helper_spec.rb
-- spec/helpers/certificate_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/avatar_helper_spec.rb
+- spec/login_helper.rb
+- spec/features/not_found_public_flow_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/links_flow_spec.rb
+- spec/features/terms_flow_spec.rb
+- spec/features/home_private_flow_spec.rb
+- spec/features/notifications_flow_spec.rb
+- spec/features/runner_assets_spec.rb
+- spec/features/exams_flow_spec.rb
+- spec/features/menu_bar_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/guides_flow_spec.rb
+- spec/features/exercise_flow_spec.rb
+- spec/features/invitations_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/topic_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/lessons_flow_spec.rb
+- spec/features/certificate_programs_flow_spec.rb
+- spec/features/user_activity_flow_spec.rb
+- spec/features/disable_user_flow_spec.rb
+- spec/features/guide_reset_spec.rb
+- spec/features/profile_flow_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/immersive_redirection_spec.rb
+- spec/features/home_public_flow_spec.rb
+- spec/features/chapters_flow_spec.rb
+- spec/features/standard_flow_spec.rb
+- spec/api_helper.rb
+- spec/spec_helper.rb
+- spec/capybara_helper.rb
+- spec/evaluation_helper.rb
+- spec/dummy/config.ru
+- spec/dummy/Rakefile
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/config.ru
-- spec/dummy/bin/yarn
-- spec/dummy/bin/update
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/config/rabbit.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
+- spec/dummy/config/rabbit.yml
+- spec/dummy/config/application.rb
 - spec/dummy/config/puma.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/boot.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/locales/en.yml
-- spec/dummy/config/secrets.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/database.yml
-- spec/dummy/config/application.rb
-- spec/dummy/package.json
-- spec/dummy/Rakefile
-- spec/dummy/public/character/kibi/failure.svg
+- spec/dummy/config/initializers/cookies_serializer.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/routes.rb
+- spec/dummy/public/medal/outline.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/jump.svg
-- spec/dummy/public/character/kibi/success_l.svg
+- spec/dummy/public/character/kibi/context.svg
 - spec/dummy/public/character/kibi/passed_with_warnings.svg
+- spec/dummy/public/character/kibi/failure.svg
 - spec/dummy/public/character/kibi/success2_l.svg
-- spec/dummy/public/character/kibi/context.svg
-- spec/dummy/public/character/magnifying_glass/apparition.svg
-- spec/dummy/public/character/magnifying_glass/loop.svg
-- spec/dummy/public/character/animations.json
+- spec/dummy/public/character/kibi/success_l.svg
+- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/410.svg
 - spec/dummy/public/error/timeout_1.svg
+- spec/dummy/public/error/401.svg
 - spec/dummy/public/error/timeout_2.svg
+- spec/dummy/public/error/timeout_3.svg
 - spec/dummy/public/error/500.svg
 - spec/dummy/public/error/403.svg
-- spec/dummy/public/error/401.svg
-- spec/dummy/public/error/timeout_3.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/error/410.svg
-- spec/dummy/public/medal/outline.svg
-- spec/teaspoon_env.rb
-- spec/login_helper.rb
+- spec/dummy/package.json
+- spec/dummy/bin/yarn
+- spec/dummy/bin/setup
+- spec/dummy/bin/bundle
+- spec/dummy/bin/update
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/certificates_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/exam_authorization_requests_controller_spec.rb
+- spec/controllers/exam_registrations_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb