mumuki-laboratory 9.1.1 → 9.3.1

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

@@ -5,7 +5,7 @@
 <div class="row">
   <%= render partial: 'layouts/user_menu' %>
 
-  <div class="col-md-9">
+  <div class="col-md-9 mu-tab-body">
     <div class="mu-user-header">
       <h1><%= t(:activity) %></h1>
     </div>
@@ -17,11 +17,13 @@
                      stats: exercises_activity_stats
                    } %>
 
-        <%= render partial: 'activity_indicator',
-                   locals: {
-                     title: t(:forum),
-                     stats: messages_activity_stats
-                   } %>
+        <% if Organization.current.forum_enabled? %>
+          <%= render partial: 'activity_indicator',
+                     locals: {
+                       title: t(:forum),
+                       stats: messages_activity_stats
+                     } %>
+          <% end %>
       </div>
       <div class="col-lg-4 mu-tab-body">
         <div class="nav nav-pills flex-column">

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

@@ -0,0 +1,42 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
+
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:exam_registrations) %></h1>
+    </div>
+    <% if @exam_authorization_requests.empty? %>
+      <div class="mu-tab-body">
+        <%= t :exams_will_be_here %>
+      </div>
+    <% else %>
+      <div class="col-md-12">
+        <div class="accordion" id="exam_authorization_accordion">
+          <% @exam_authorization_requests.each_with_index do |it, index| %>
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="<%= "exam_authorization_accordion_item_#{index}" %>">
+                <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, 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">
+                <div class="accordion-body p-0">
+                  <div class="m-0 border-bottom-0 border-top-0 border-right-0 bs-callout bs-callout-<%= it.icon[:type] %>">
+                    <p><%= render partial: "exam_authorization_requests/#{it.status}", locals: { authorization_request: it } %></p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        </div>
+
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/routes.rb

@@ -24,7 +24,7 @@ Rails.application.routes.draw do
     get '/discussions/messages/preview', to: 'discussions_messages#preview', as: :preview_discussion_message
 
     resources :exam_registrations, only: [:show]
-    resources :exam_authorization_requests, only: [:show, :create, :update]
+    resources :exam_authorization_requests, only: [:create, :update]
 
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
@@ -68,6 +68,7 @@ Rails.application.routes.draw do
       get :discussions
       get :activity
       get :certificates
+      get :exam_authorizations
 
     end
 

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

@@ -108,15 +108,17 @@ 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_request_created: Your registration to the exam has been saved!
-  exam_authorization_request_rejected: Your request was rejected.
+  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_open: Registrations open for %{description}!
   exam_registration_to: Registration to %{description}
+  exams_will_be_here: Your exams in the organization will appear here.
   exams: Exams
   exercise: Exercise
   exercises: Exercises
@@ -184,9 +186,6 @@ en:
   male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   medal: Medal
-  message_count:
-    one: 1 message
-    other: '%{count} messages'
   message: Message
   message_deleted: This message was deleted because it %{motive}, which violates the %{forum_terms}.
   messages: Messages
@@ -253,6 +252,9 @@ en:
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
+  reply_count:
+    one: 1 reply
+    other: '%{count} replies'
   requires_attention: Requires attention
   reset_query: Clear current search filters
   responses_count_asc: By less validated replies

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

@@ -108,15 +108,17 @@ 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_request_created: ¡Tu inscripción al exámen se registró exitosamente!
-  exam_authorization_request_rejected: Tu solicitud fue rechazada.
+  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_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á
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios
@@ -184,9 +186,6 @@ es-CL:
   male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   medal: Medalla
-  message_count:
-    one: 1 mensaje
-    other: '%{count} mensajes'
   message: Mensaje
   message_deleted: Este mensaje fue eliminado porque %{motive}, lo cual infringe las %{forum_terms}.
   messages: Mensajes
@@ -260,6 +259,9 @@ es-CL:
   read: Leído
   read_messages: Ver mensajes
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presiona F5
+  reply_count:
+    one: 1 respuesta
+    other: '%{count} respuestas'
   reset_query: Borrar los filtros de búsqueda actuales
   restart: Reiniciar
   results_hidden: ¡Tu solución fue enviada con éxito!

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

@@ -116,15 +116,17 @@ 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_request_created: ¡Tu inscripción al exámen se registró exitosamente!
-  exam_authorization_request_rejected: Tu solicitud fue rechazada.
+  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_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á
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios
@@ -195,9 +197,6 @@ es:
   male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   medal: Medalla
-  message_count:
-    one: 1 mensaje
-    other: '%{count} mensajes'
   message: Mensaje
   message_deleted: Este mensaje fue eliminado porque %{motive}, lo cual infringe las %{forum_terms}.
   messages: Mensajes
@@ -272,6 +271,9 @@ es:
   read: Leido
   read_messages: Ver mensajes
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
+  reply_count:
+    one: 1 respuesta
+    other: '%{count} respuestas'
   requires_attention: Requiere atención
   reset_query: Borrar los filtros de búsqueda actuales
   responses_count_asc: Con menos respuestas validadas

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

@@ -111,15 +111,17 @@ 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_request_created: Seu registro de exame foi salvo com sucesso!
-  exam_authorization_request_rejected: Seu pedido foi rejeitado.
+  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_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
   exams: Examesca
   exercise: Exercício
   exercise_count: exercícios
@@ -188,9 +190,6 @@ pt:
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   medal: Medalha
-  message_count:
-    one: 1 mensagem
-    other: '%{count} mensagens'
   message: Mensagem
   message_deleted: Esta mensagem foi excluída porque %{motive}, o que viola as %{forum_terms}.
   messages: Mensagens
@@ -263,6 +262,9 @@ pt:
   read: Ler
   read_messages: Ver mensagens
   refresh_or_wait: Se não mostrar automaticamente em alguns segundos, pressione F5
+  reply_count:
+    one: 1 resposta
+    other: '%{count} respostas'
   requires_attention: Requer atenção
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.1.1'
+    VERSION = '9.3.1'
   end
 end

data/spec/controllers/exam_authorization_requests_controller_spec.rb

@@ -7,23 +7,6 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
 
   before { set_current_user! user }
 
-  describe 'show' do
-    context 'when authorization does not exist' do
-      before { get :show, params: {id: 0} }
-      it { expect(response.status).to eq 404 }
-    end
-
-    context 'when authorization exists' do
-      let(:exam_authorization_request) { create(:exam_authorization_request, user: user, exam_registration: exam_registration) }
-      let!(:notification) { create(:notification, target: exam_authorization_request, user: user) }
-
-      before { get :show, params: {id: exam_authorization_request.id} }
-
-      it { expect(response.status).to eq 200 }
-      it { expect(notification.reload.read).to be_truthy }
-    end
-  end
-
   describe 'create' do
     let!(:notification) { create(:notification, target: exam_registration, user: user) }
 
@@ -33,7 +16,7 @@ describe ExamAuthorizationRequestsController, type: :controller, organization_wo
       }
     end
 
-    it { expect(response.status).to eq 204 }
+    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 }
   end

data/spec/controllers/organizations_api_controller_spec.rb

@@ -143,7 +143,8 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
              logo_url: 'http://a-logo-url.com',
              theme_stylesheet: '.theme { color: red }',
              extension_javascript: 'window.a = function() { }',
-             terms_of_service: 'A TOS'}
+             terms_of_service: 'A TOS',
+             faqs: 'some faqs'}
           end
 
           it { expect(organization.public?).to eq false }
@@ -153,6 +154,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
           it { expect(organization.theme_stylesheet).to eq ".theme { color: red }" }
           it { expect(organization.extension_javascript).to eq "window.a = function() { }" }
           it { expect(organization.terms_of_service).to eq 'A TOS' }
+          it { expect(organization.faqs).to eq 'some faqs' }
         end
 
         context 'with missing values' do

data/spec/controllers/users_controller_spec.rb

@@ -18,4 +18,5 @@ describe UsersController, type: :controller, organization_workspace: :test do
     it { expect(User.last.first_name).to eq 'foo' }
     it { expect(User.last.verified_first_name).to be_nil }
   end
+
 end

data/spec/features/notifications_flow_spec.rb

@@ -37,10 +37,9 @@ feature 'Notifications Flow', organization_workspace: :test do
       expect(page).to have_text 'Choose date and time to attend to the exam'
     end
 
-    scenario 'removes notification after target is processed' do
-      # Notification for exam authorization request is considered read after user click
+    scenario 'does not remove exam authorization notification after click it ' do
       find_notification_number(1).click
-      expect(notifications_bell).to have_text('1')
+      expect(notifications_bell).to have_text('2')
     end
   end
 end

data/spec/features/profile_flow_spec.rb

@@ -73,19 +73,12 @@ feature 'Profile Flow', organization_workspace: :test do
     context 'user with uncompleted profile after saving' do
       before { user.update! last_name: 'last_name', birthdate: Time.now - 20.years, gender: 'female' }
 
-      let(:button_options) do
-        # Match :first is used because there are two buttons: mobile and desktop.
-        { class: 'mu-edit-profile-btn', match: :first }.tap do |options|
-          options.merge!(disabled: true) unless run_with_selenium?
-        end
-      end
-
       context 'when visiting an exercise' do
         scenario 'is redirected to previous path' do
           visit "/exercises/#{exercise.transparent_id}"
           fill_in('user_first_name', with: 'first_name')
 
-          click_on(button_options)
+          click_on(class: 'mu-edit-profile-btn', match: :first)
           expect(page).to have_text(exercise.description)
         end
       end
@@ -95,7 +88,7 @@ feature 'Profile Flow', organization_workspace: :test do
           visit "/user/edit"
           fill_in('user_first_name', with: 'first_name')
 
-          click_on(button_options)
+          click_on(class: 'mu-edit-profile-btn', match: :first)
           expect(page).to have_text('Your data was updated successfully')
           expect(page).to have_text('My profile')
         end

data/spec/features/user_activity_flow_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 feature 'User Activity Flow', organization_workspace: :test do
   let(:user) { create(:user) }
+  let(:organization) { Organization.locate!('test') }
+
   before { set_current_user!(user) }
 
   let(:fake_stats) { double('stats') }
@@ -30,21 +32,39 @@ feature 'User Activity Flow', organization_workspace: :test do
       expect(page).to have_text('solved')
     end
 
-    scenario 'displays messages count' do
-      expect(page).to have_text('12')
-      expect(page).to have_text('messages')
-    end
-
-    scenario 'displays validated messages count' do
-      expect(page).to have_text('6')
-      expect(page).to have_text('validated')
-    end
-
     scenario 'displays recent weeks' do
       expect(page).to have_text 'Week of 2020-10-12'
       expect(page).to have_text 'Week of 2020-10-05'
       expect(page).to have_text 'Week of 2020-09-28'
     end
+
+    context 'on organization with no forum' do
+      scenario 'does not display messages count' do
+        expect(page).to_not have_text('messages')
+      end
+
+      scenario 'does not display validated messages count' do
+        expect(page).to_not have_text('validated')
+      end
+    end
+
+    context 'on organization with forum' do
+      before do
+        organization.update! forum_enabled: true
+        visit activity_user_path
+      end
+
+      scenario 'displays messages count' do
+        expect(page).to have_text('12')
+        expect(page).to have_text('messages')
+      end
+
+      scenario 'displays validated messages count' do
+        expect(page).to have_text('6')
+        expect(page).to have_text('validated')
+      end
+    end
+
   end
 
   context 'selecting a specific week' do

data/spec/helpers/with_navigation_spec.rb

@@ -116,5 +116,42 @@ describe WithStudentPathNavigation, organization_workspace: :test do
 
       it { expect(next_button(lesson_1)).to include "<a class=\"btn btn-complementary w-100\" role=\"button\" href=\"/chapters/#{chapter_2.friendly_name}\"><span class=\"fa5-text-r\">Next: #{chapter_2.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
     end
+
+    context "when finishing an exam" do
+      let!(:organization) { create :organization, exams: [exam] }
+
+      let(:exam) { create(:exam, exercises: [ exercise ]) }
+      let(:exercise) { create(:exercise) }
+
+      before do
+        organization.switch!
+        exercise.submit_solution!(current_user).passed!
+      end
+
+      it { expect { next_button(exercise) }.to_not raise_error }
+      it { expect(next_button(exercise)).to be_nil }
+    end
+
+    context "when there are manual_evaluation exercises" do
+      let(:book) { create :book, topics: [topic] }
+      let(:topic) { create :topic, lessons: [lesson_1, lesson_2] }
+      let(:lesson_1) { create :lesson, exercises: [create(:exercise, manual_evaluation: true)] }
+      let(:lesson_2) { create :lesson, exercises: [regular_exercise] }
+      let(:regular_exercise) { create :exercise }
+
+      before { organization.switch!.reindex_usages! }
+
+      context 'on organization with prevent_manual_evaluation_content' do
+        let(:organization) { create :organization, prevent_manual_evaluation_content: true, book: book }
+
+        it { expect(next_button(lesson_2)).to be_nil }
+      end
+
+      context 'on organization without prevent_manual_evaluation_content' do
+        let(:organization) { create :organization, book: book }
+
+        it { expect(next_button(lesson_2)).to eq "<a class=\"btn btn-warning w-100\" role=\"button\" href=\"/lessons/#{lesson_1.friendly_name}\"><span class=\"fa5-text-r\">Next pending: #{lesson_1.name}</span><i class=\"fas fa-chevron-right\"></i></a>" }
+      end
+    end
   end
 end