mumuki-laboratory 9.3.0 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fcf8057854fbb65bd0ddb801770c0d7a9de320735217bb50ac239d3c303651d
-  data.tar.gz: 6466a0bfca548fce3eb105daa98b9f9790616ad0009928efd7c46719fc9526d7
+  metadata.gz: 72cf517c032d4c5173d14f33d52060ad7f2ee504beeed5425ebb91a4e3591359
+  data.tar.gz: b74980c8331ac7dd02f6e56ba249cb1e7c8a788eecb2e7a88c7b263451069d8c
 SHA512:
-  metadata.gz: fe7ff6eb305b615a33cea3d90be11d06b58acbeb7e6e6add7049bf632055d676e6a9cc475c88649a8341ca8038fe7d8b6ce7b8616ceef1a6d3094bdffba75422
-  data.tar.gz: d7fba0d3d8a4e3223efc8987649a482794be90958d5e6b618b4bce519e72b72b7e42cddaecf8f4f151ca864a8caa9a4b18369abe2c281c5c5d9e9cba99ca4f6a
+  metadata.gz: a92eb701dfaf5fc7666c9e5193908c979018825e9d8a6926eb453ece500dc6431ad149eb43b1eae942e862e6eb8904e57052d3d235b5fb53d54ef0d3c0fe7c77
+  data.tar.gz: 023e52805e6213623bda1e6b9bc2e954b032880f7df6ece9c54e8a007c71740aeb5952b0e58365367405e0821d4739480518ac24267bd4839a32b9bb418d8af3

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

@@ -25,9 +25,9 @@ mumuki.faqs = class {
   _createNavbar() {
     const $faqsNavbar = $(".mu-faqs-navbar nav ul");
     $('.mu-faqs-group').each((_index, faqGroup) => {
-      const $navItem = this._createNavbarItem($faqsNavbar, faqGroup)
+      const $navItem = this._createNavbarItem($faqsNavbar, faqGroup);
       const $faqGroup = $(faqGroup);
-      this._configureClickFor($navItem, $faqGroup, $faqsNavbar)
+      this._configureClickFor($navItem, $faqGroup, $faqsNavbar);
     });
   }
 
@@ -56,12 +56,12 @@ mumuki.faqs = class {
   }
 
   _createFaqsIcons() {
-    const $faqIcon = $('<i class="mu-faqs-group-icon fa fa-plus">');
+    const $faqIcon = $('<i class="mu-faqs-group-icon fas fa-chevron-down">');
     $faqIcon.click(function(e){
       const $elem = $(this);
-      $elem.toggleClass('fa-plus fa-minus');
+      $elem.toggleClass('fa-chevron-down fa-chevron-up');
       $elem.closest('.mu-faqs-group').toggleClass('active');
-    })
+    });
     $('.mu-faqs-group').prepend($faqIcon);
   }
 
@@ -75,7 +75,7 @@ mumuki.faqs = class {
         newGroup = [];
       }
       newGroup.push(elem);
-      previousNodeName = elem.nodeName
+      previousNodeName = elem.nodeName;
     });
 
     elemsGroups.push(newGroup);

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

@@ -394,31 +394,6 @@ $moderator-badge-color: #dd9900;
   }
 }
 
-$statuses: (
-  closed: ($danger white $danger),
-  opened: (white #333333 #eaeaea),
-  solved: ($success white $success),
-  pending_review: ($success white $success)
-);
-
-@each $status, $style in $statuses {
-  $background-color: nth($style, 1);
-  $font-color: nth($style, 2);
-  $border-color: nth($style, 3);
-
-  .btn-discussion-#{$status} {
-    background-color: $background-color;
-    color: $font-color;
-    border-color: $border-color;
-    margin-left: 5px;
-    &:hover {
-      color: $font-color;
-      border-color: darken($border-color, 3%);
-      background-color: darken($background-color, 3%);
-    }
-  }
-}
-
 .discussion-requires-attention {
   margin-right: 20px;
   label {

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

@@ -8,7 +8,7 @@
 
     width: 100%;
 
-    @media (min-width: 768px) {
+    @include media-breakpoint-up(md) {
       width: 75%;
       float: right;
     }
@@ -17,8 +17,9 @@
       padding: 32px;
       box-shadow: 0 0.375em 2.8125em 0 #d2d5d9;
       margin-bottom: 32px;
+      word-wrap: anywhere;
 
-      @media (max-width: 767px) {
+      @include media-breakpoint-down(md) {
         &:not(.active) {
           h3, p {
             display: none
@@ -44,7 +45,7 @@
         margin-top: 10px;
         cursor: pointer;
         display: none;
-        @media (max-width: 767px) {
+        @include media-breakpoint-down(md) {
           display: unset;
         }
       }

data/app/helpers/discussions_helper.rb

@@ -83,10 +83,14 @@ module DiscussionsHelper
   def discussion_update_status_button(status)
     button_to t("to_#{status}"),
               item_discussion_path(@discussion, {status: status}),
-              class: "btn btn-discussion-#{status}",
+              class: "btn btn-#{btn_type_for_discussion_statuses[status.to_sym]}",
               method: :put
   end
 
+  def btn_type_for_discussion_statuses
+    { closed: 'danger', solved: 'success', opened: 'light' }
+  end
+
   def new_discussion_link(teaser_text, link_text)
     %Q{
       <h4>
@@ -173,7 +177,7 @@ module DiscussionsHelper
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.visible_messages.size)}"
+    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:reply_count, count: discussion.visible_messages.size)}"
   end
 
   def discussion_filter_params_without_page
@@ -188,6 +192,10 @@ module DiscussionsHelper
     user.abbreviated_name
   end
 
+  def linked_discussion_user_name(user)
+    content_tag :a, discussion_user_name(user)
+  end
+
   def subscription_icon
     fa_icon :bell, text: t(:subscribe)
   end

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

@@ -2,7 +2,7 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= discussion_user_name(discussion.initiator) %>
+        <%= linked_discussion_user_name(discussion.initiator) %>
         <span class="message-date">
           <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
         </span>

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

@@ -2,7 +2,7 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= discussion_user_name user %>
+        <%= linked_discussion_user_name user %>
         <% if user.moderator_here? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>

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

@@ -3,7 +3,7 @@
     <div class="discussion-message-bubble">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">
-          <%= user.name %>
+          <%= discussion_user_name user %>
         </div>
       </div>
       <div class="discussion-message-bubble-content">

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

@@ -15,7 +15,7 @@
     <div class="discussion-message-bubble" id="new-discussion-description-container">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">
-          <%= @discussion.initiator.name %>
+          <%= discussion_user_name @discussion.initiator %>
         </div>
       </div>
       <div class="discussion-message-bubble-content">

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

@@ -26,15 +26,15 @@
             <%= label_for_contextualization(@discussion, class: 'd-none d-sm-inline') %> ·
             <span class="discussion-info">
               <span class="discussion-initiator-name">
-                <%= @discussion.initiator.name %>
+                <%= discussion_user_name @discussion.initiator %>
               </span>
-              <span class="d-none d-sm-inline"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
+              <span><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
             </span>
           </div>
           <% if @discussion.last_moderator_access_visible_for?(current_user) %>
             <h5 class="my-2 me-3">
               <span class="badge bg-primary text-wrap">
-                <%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %>
+                <%= t :last_seen, name: discussion_user_name(@discussion.last_moderator_access_by) %>
                 <%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %>
               </span>
             </h5>

data/app/views/faqs/index.html.erb

@@ -9,7 +9,7 @@
     <div class="mu-faqs-content">
       <%= @faqs %>
     </div>
-    <div class="mu-faqs-navbar hidden-xs">
+    <div class="mu-faqs-navbar d-none d-md-block">
       <nav>
         <ul>
         </ul>

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/lib/mumuki/laboratory/locales/en.yml

@@ -186,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
@@ -255,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

@@ -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
@@ -262,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

@@ -197,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
@@ -274,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

@@ -190,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
@@ -265,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.3.0'
+    VERSION = '9.3.1'
   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

data/spec/helpers/with_navigation_spec.rb

@@ -131,5 +131,27 @@ describe WithStudentPathNavigation, organization_workspace: :test do
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.3.1
 platform: ruby
 authors:
 - Franco Bulgarelli
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.2.0
+        version: 9.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.2.0
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -939,7 +939,7 @@ homepage: https://mumuki.io
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -955,7 +955,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files: