mumuki-laboratory 9.3.0 → 9.5.1

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

@@ -0,0 +1,7 @@
+<% if notice %>
+  <%= toast_notice(notice) %>
+<% elsif alert %>
+  <%= toast_alert(alert) %>
+<% elsif info %>
+  <%= toast_info(info) %>
+<% end %>

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

@@ -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, format: :long) %></small></span>
+                  <span><strong><%= it.exam_registration.description %></strong> - <small><%= l(it.exam.start_time.in_time_zone(-3), 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/config/routes.rb

@@ -12,6 +12,8 @@ Rails.application.routes.draw do
       end
     end
 
+    post '/discussions/:id/responsible' => 'discussions#responsible', as: :responsible_discussion
+
     get '/discussions/terms' => 'book_discussions#terms'
     concerns :debatable, controller: 'book_discussions', only: :index
 

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

@@ -168,7 +168,6 @@ en:
   kids_default_success: You did it great!
   language: Language
   last_name: Last Name
-  last_seen: "Seen by %{name}"
   last_submission_date: Last submission
   latest_exercises: Latest exercises
   learning: Learning
@@ -186,18 +185,24 @@ 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
   messages_error: Previous messages are unavailable. Please try again later.
-  moderation: Mentoring
   messages_pluralized:
     one: Message
     other: Messages
+  moderation: Mentoring
   moderator: Mentor
+  moderator_take_care:
+    i_will: I'll take care of it
+    i_wont: I won't take care of it
+    moderator_is: "%{moderator} is taking care of it"
+    status_changed: The discussion status changed. Please refresh the page.
+    someone_else_will: Someone else already marked they'll take care of it.
+    you_are: You're taking care of it
+    you_will_confirmation: You'll take care of this discussion. If you change your mind, click the button again.
+    you_wont_confirmation: You won't take care of this discussion.
   more_messages: More
   my_account: My account
   my_doubts: My doubts
@@ -255,6 +260,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

@@ -186,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
@@ -200,6 +197,15 @@ es-CL:
   minutes: minutos
   moderation: Mentoría
   moderator: Mentor
+  moderator_take_care:
+    i_will: Yo me ocupo
+    i_wont: Mejor no me ocupo
+    moderator_is: "%{moderator} se está ocupando"
+    status_changed: La consulta cambió de estado. Por favor, actualiza la página.
+    someone_else_will: Alguien más ya marcó que se va a ocupar.
+    you_are: Te estás ocupando
+    you_will_confirmation: Te vas a ocupar de esta consulta. Si cambias de parecer, toca nuevamente el botón.
+    you_wont_confirmation: No te vas a ocupar de esta consulta.
   more_messages: Ver mensajes anteriores
   my_account: Mi cuenta
   my_doubts: Mis consultas
@@ -262,6 +268,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

@@ -179,7 +179,6 @@ es:
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido
-  last_seen: "Visto por %{name}"
   last_submission_date: Última solución
   latest_exercises: Últimos ejercicios
   learning: Aprendizaje
@@ -197,9 +196,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
@@ -211,6 +207,15 @@ es:
   minutes: minutos
   moderation: Mentoría
   moderator: Mentor
+  moderator_take_care:
+    i_will: Yo me ocupo
+    i_wont: Mejor no me ocupo
+    moderator_is: "%{moderator} se está ocupando"
+    status_changed: La consulta cambió de estado. Por favor, actualizá la página.
+    someone_else_will: Alguien más ya marcó que se va a ocupar.
+    you_are: Te estás ocupando
+    you_will_confirmation: Te vas a ocupar de esta consulta. Si cambiás de parecer, tocá nuevamente el botón.
+    you_wont_confirmation: No te vas a ocupar de esta consulta.
   more_messages: Ver mensajes anteriores
   my_account: Mi cuenta
   my_doubts: Mis consultas
@@ -274,6 +279,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

@@ -172,7 +172,6 @@ pt:
   language: Linguagem
   languages: Linguagens
   last_name: Sobrenome
-  last_seen: "Visto por %{name}"
   last_submission_date: Última solução
   latest_exercises: Últimos exercícios
   learning: Aprendendo
@@ -190,9 +189,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
@@ -205,6 +201,15 @@ pt:
   minutes: minutos
   moderation: Mentoria
   moderator: Mentor
+  moderator_take_care:
+    i_will: Eu cuidarei disso
+    i_wont: Eu não vou cuidar
+    moderator_is: "%{moderator} está cuidando"
+    status_changed: A consulta mudou de estado. Por favor, atualize para ver a consulta atualizada.
+    someone_else_will: Alguém já marcou que vai cuidar disso.
+    you_are: Você está cuidando
+    you_will_confirmation: Você vai cuidar dessa consulta. Se mudar de ideia, clique no botão novamente.
+    you_wont_confirmation: Você não vai cuidar dessa consulta.
   more_messages: Ver as mensagens anteriores
   my_account: Minha conta
   my_doubts: Minhas duvidas
@@ -265,6 +270,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.3.0'
+    VERSION = '9.5.1'
   end
 end

data/lib/tasks/exams.rake

@@ -0,0 +1,15 @@
+logger = ::Logger.new(STDOUT)
+
+namespace :laboratory do
+  namespace :exams do
+    task authorize_requests: :environment do
+      logger.info "Exam Authorization Requests task"
+      ExamRegistration.should_process.find_each do |exam_registration|
+        logger.info "Processing exam registration '#{exam_registration.description}'"
+        exam_registration.process_requests!
+      rescue
+        logger.error "Something wrong happened while processing '#{exam_registration.description}'"
+      end
+    end
+  end
+end

data/spec/controllers/discussions_controller_spec.rb

@@ -62,6 +62,48 @@ describe DiscussionsController, organization_workspace: :test do
     end
   end
 
+  describe 'responsible' do
+    let(:discussion) { create(:discussion, {organization: Organization.current}) }
+
+    describe 'user wants to be responsible' do
+      before { post :responsible, params: {id: discussion.id} }
+
+      it { expect(response.status).to eq 403 }
+      it { expect(discussion.reload.responsible? user).to be false }
+    end
+
+    describe 'moderator' do
+      let(:moderator) { create(:user, permissions: {student: '*', moderator: '*'}) }
+      before { set_current_user! moderator }
+
+      describe 'wants to be responsible' do
+        before { post :responsible, params: {id: discussion.id} }
+
+        it { expect(response.status).to eq 200 }
+        it { expect(discussion.reload.responsible? moderator).to be true }
+      end
+
+      describe 'wants to be responsible but changes their mind' do
+        before { 2.times{ post :responsible, params: {id: discussion.id} } }
+
+        it { expect(response.status).to eq 200 }
+        it { expect(discussion.reload.responsible? moderator).to be false }
+      end
+
+      describe 'wants to be responsible but someone else already is' do
+        let(:another_moderator) { create(:user, permissions: {student: '*', moderator: '*'}) }
+        before do
+          discussion.toggle_responsible! another_moderator
+          post :responsible, params: {id: discussion.id}
+        end
+
+        it { expect(response.status).to eq 409 }
+        it { expect(discussion.reload.responsible? moderator).to be false }
+        it { expect(discussion.reload.responsible? another_moderator).to be true }
+      end
+    end
+  end
+
   describe 'when the minimal role for discussions is teacher' do
     before { Organization.current.tap { |it| it.forum_discussions_minimal_role = 'teacher' }.save! }
 

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: 20210330175706) do
+ActiveRecord::Schema.define(version: 20210518100153) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -151,8 +151,8 @@ ActiveRecord::Schema.define(version: 20210330175706) do
     t.integer "messages_count", default: 0
     t.integer "validated_messages_count", default: 0
     t.boolean "requires_moderator_response", default: true
-    t.string "last_moderator_access_by_id"
-    t.datetime "last_moderator_access_at"
+    t.string "responsible_moderator_by_id"
+    t.datetime "responsible_moderator_at"
     t.bigint "status_updated_by_id"
     t.datetime "status_updated_at"
     t.index ["initiator_id"], name: "index_discussions_on_initiator_id"

data/spec/features/discussion_flow_spec.rb

@@ -174,6 +174,7 @@ feature 'Discussion Flow', organization_workspace: :test do
           expect(page).to have_text(problem_2.name)
           expect(page).to have_text('Open')
           expect(page).to have_text('Messages')
+          expect(page).to_not have_text('I\'ll take care')
           expect(page).not_to have_text('Preview')
           expect(page).to have_text(problem_2_discussion_message.content)
           expect(page).not_to have_text(another_problem_2_discussion_message.content)
@@ -188,20 +189,43 @@ feature 'Discussion Flow', organization_workspace: :test do
         context 'for moderator' do
           before { set_current_user! moderator }
 
-          scenario 'newly created discussion' do
-            visit current_path
-            expect(page).to have_text(problem_2.name)
-            expect(page).to have_text('Open')
-            expect(page).to have_text('Messages')
-            expect(page).to have_text('Preview')
-            expect(page).to have_text(problem_2_discussion_message.content)
-            expect(page).to have_text(another_problem_2_discussion_message.content)
-            expect(page).to have_xpath("//div[@class='discussion-actions']")
-            expect(page).to have_text('Includes inappropriate content')
-            expect(page).to have_text('Shares the correct solution')
-            expect(page).to have_text('Discloses personal information')
-            expect(page).to have_text('included inappropriate content')
-            expect(page).to have_text ("Deleted by #{moderator.name}")
+          context 'on a newly created discussion' do
+            scenario do
+              visit current_path
+              expect(page).to have_text(problem_2.name)
+              expect(page).to have_text('Open')
+              expect(page).to have_text('Messages')
+              expect(page).to have_text('I\'ll take care')
+              expect(page).to have_text('Preview')
+              expect(page).to have_text(problem_2_discussion_message.content)
+              expect(page).to have_text(another_problem_2_discussion_message.content)
+              expect(page).to have_xpath("//div[@class='discussion-actions']")
+              expect(page).to have_text('Includes inappropriate content')
+              expect(page).to have_text('Shares the correct solution')
+              expect(page).to have_text('Discloses personal information')
+              expect(page).to have_text('included inappropriate content')
+              expect(page).to have_text ("Deleted by #{moderator.name}")
+            end
+          end
+
+          context 'on a discussion where they are responsible' do
+            before { problem_2_discussions.first.toggle_responsible! moderator }
+
+            scenario do
+              visit current_path
+              expect(page).to have_text('I won\'t take care')
+            end
+          end
+
+          context 'on a discussion where someone else is responsible' do
+            let(:another_moderator) { create(:user, permissions: {moderator: '*', student: '*'}) }
+            before { problem_2_discussions.first.toggle_responsible! another_moderator }
+
+            scenario do
+              visit current_path
+              expect(page).not_to have_text('I\'ll take care')
+              expect(page).not_to have_text('I won\'t take care')
+            end
           end
         end
       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