mumuki-laboratory 9.3.0 → 9.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fcf8057854fbb65bd0ddb801770c0d7a9de320735217bb50ac239d3c303651d
-  data.tar.gz: 6466a0bfca548fce3eb105daa98b9f9790616ad0009928efd7c46719fc9526d7
+  metadata.gz: 37091ade7a9c0bad80f16a5276b2748692a49cc11708613036dacd1042b9cdc2
+  data.tar.gz: 949f97b3a7e9e920f47cb1748a66d0f6951f4d45a2021cacad43e4a1122b4a8f
 SHA512:
-  metadata.gz: fe7ff6eb305b615a33cea3d90be11d06b58acbeb7e6e6add7049bf632055d676e6a9cc475c88649a8341ca8038fe7d8b6ce7b8616ceef1a6d3094bdffba75422
-  data.tar.gz: d7fba0d3d8a4e3223efc8987649a482794be90958d5e6b618b4bce519e72b72b7e42cddaecf8f4f151ca864a8caa9a4b18369abe2c281c5c5d9e9cba99ca4f6a
+  metadata.gz: 34d25e182a43788fc032bd77c6472c497a55d08cb6d776575441aee4b5ec11aa55a3f95a7b3d1300a47e43006764494dab809f1a8114076d50cadeb0b59d1021
+  data.tar.gz: c9dd87e5ac8d17873aaa3e28a442b4c87225bb31b4573385e0906e852fa58b9c778ad61cf2e0c8e48ca2c90edba9844064ed260ca276ff95511c69ba4af5f44a

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

@@ -1,6 +1,7 @@
 mumuki.load(() => {
   var $subscriptionButtons = $('.discussion-subscription > button');
   var $upvoteButtons = $('.discussion-upvote > button');
+  var $responsibleButton = $('.discussion-responsible > button');
   let $messagePreviewButton = $('.discussion-new-message-preview-button.preview');
   let $messageEditButton = $('.discussion-new-message-preview-button.edit');
   let $newMessageContent = $('.discussion-new-message-content');
@@ -53,9 +54,23 @@ mumuki.load(() => {
     discussionUpvote: function (url) {
       Forum.discussionPostAndToggle(url, $upvoteButtons);
     },
+    discussionResponsible: function (url) {
+      Forum.discussionPostToggleAndRenderToast(url, $responsibleButton);
+      $('.responsible-moderator-badge').toggleClass('d-none');
+    },
     discussionPostAndToggle: function (url, elem) {
       Forum.discussionPost(url).done(Forum.toggleButton(elem));
     },
+    discussionPostToggleAndRenderToast: function (url, elem) {
+      Forum.discussionPost(url)
+        .done(function (response) {
+          Forum.toggleButton(elem);
+          mumuki.toast.addToast(response);
+        })
+        .fail(function (response) {
+          mumuki.toast.addToast(response.responseText);
+        });
+    },
     discussionMessageToggleApprove: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");

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/javascripts/mumuki_laboratory/application/toast.js

@@ -1,3 +1,14 @@
+mumuki.toast = {
+  load() {
+    document.querySelectorAll('.toast').forEach((toast) => new bootstrap.Toast(toast).show());
+  },
+
+  addToast(content) {
+    $('.toast-container').html(content);
+    mumuki.toast.load();
+  }
+};
+
 mumuki.load(() => {
-  document.querySelectorAll('.toast').forEach((toast) => new bootstrap.Toast(toast).show());
+  mumuki.toast.load();
 });

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/controllers/discussions_controller.rb

@@ -2,10 +2,11 @@ class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include WithUserDiscussionValidation
 
-  before_action :set_debatable, except: [:subscription]
+  before_action :set_debatable, except: [:subscription, :responsible]
   before_action :authenticate!, only: [:update, :create]
   before_action :discussion_filter_params, only: :index
   before_action :read_discussion, only: :show
+  before_action :authorize_moderator!, only: [:responsible]
 
   helper_method :discussion_filter_params
 
@@ -19,7 +20,6 @@ class DiscussionsController < ApplicationController
   end
 
   def show
-    @discussion.update_last_moderator_access! current_user
   end
 
   def update
@@ -37,6 +37,20 @@ class DiscussionsController < ApplicationController
     head :ok
   end
 
+  def responsible
+    if subject.can_toggle_responsible? current_user
+      subject.toggle_responsible! current_user
+
+      set_flash_responsible_confirmation!
+      status = :ok
+    else
+      set_flash_responsible_alert!
+      status = :conflict
+    end
+
+    render :partial => 'layouts/toast', status: status
+  end
+
   def create
     discussion = @debatable.discuss! current_user, discussion_params
     redirect_to [@debatable, discussion]
@@ -57,6 +71,19 @@ class DiscussionsController < ApplicationController
     @debatable = Discussion.debatable_for(@debatable_class, params)
   end
 
+  def set_flash_responsible_confirmation!
+    subject.any_responsible? ?
+      flash.now.notice = I18n.t('moderator_take_care.you_will_confirmation') :
+      flash.now.notice = I18n.t('moderator_take_care.you_wont_confirmation')
+
+  end
+
+  def set_flash_responsible_alert!
+    subject.any_responsible? ?
+      flash.now.alert = I18n.t('moderator_take_care.someone_else_will') :
+      flash.now.alert = I18n.t('moderator_take_care.status_changed')
+  end
+
   def subject
     @discussion ||= Discussion.find_by(id: params[:id])
   end

data/app/controllers/exam_authorization_requests_controller.rb

@@ -1,6 +1,8 @@
 class ExamAuthorizationRequestsController < ApplicationController
   def create
-    authorization_request = ExamAuthorizationRequest.create! authorization_request_params
+    authorization_request = ExamAuthorizationRequest.find_or_create_by! create_authorization_request_params do |it|
+      it.assign_attributes authorization_request_params
+    end
     current_user.read_notification! authorization_request.exam_registration
     flash.notice = I18n.t :exam_authorization_request_created
     redirect_to root_path
@@ -14,6 +16,10 @@ class ExamAuthorizationRequestsController < ApplicationController
 
   private
 
+  def create_authorization_request_params
+    authorization_request_params.slice :exam_registration_id, :user, :organization
+  end
+
   def authorization_request_params
     params
         .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)

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,26 @@ module DiscussionsHelper
     user.abbreviated_name
   end
 
+  def linked_discussion_user_name(user)
+    content_tag :a, discussion_user_name(user)
+  end
+
+  def responsible_moderator_text_for(discussion, user)
+    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))
+    end
+  end
+
+  def responsible_icon
+    fa_icon 'hand-paper', text: t('moderator_take_care.i_will')
+  end
+
+  def not_responsible_icon
+    fa_icon 'hand-rock', type: :regular, text: t('moderator_take_care.i_wont')
+  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/discussions/show.html.erb

@@ -15,6 +15,12 @@
     <h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
     <% if current_user && @discussion.persisted? %>
       <span class="d-flex">
+        <% if @discussion.can_toggle_responsible?(current_user) %>
+          <div class="discussion-responsible me-1">
+            <%= btn_toggle responsible_icon, not_responsible_icon, @discussion.any_responsible?, class: 'btn-sm',
+                           onclick: "mumuki.Forum.discussionResponsible('#{responsible_discussion_url(@discussion)}')" %>
+          </div>
+        <% end %>
         <% if @discussion.subscribable? %>
           <div class="discussion-subscription me-1">
             <%= btn_toggle subscription_icon, unsubscription_icon, current_user.subscribed_to?(@discussion), class: 'btn-sm',

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

@@ -1 +1 @@
-<%= 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.in_time_zone(-3), format: :long) %>

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

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

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

@@ -17,7 +17,7 @@
         <strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>
       </h4>
       <p>
-        <%= t :exam_registration_explanation_html, date: l(@registration.end_time, format: :long) %>
+        <%= t :exam_registration_explanation_html, date: l(@registration.end_time.in_time_zone(-3), format: :long) %>
       </p>
     </div>
     <%= form_for @authorization_request, html: {class: 'mu-form'} do |f| %>
@@ -27,10 +27,11 @@
         <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' %>
+          <%= label_tag exam.id, l(exam.start_time.in_time_zone(-3), format: :long), class: 'form-check-label' %>
         </div>
       <% end %>
       <button class="btn btn-complementary"> <%= t :save %> </button>
     <% end %>
   </div>
 </div>
+

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

@@ -26,16 +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) %>
+          <% if @discussion.current_responsible_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 :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %>
+              <span class="badge bg-primary text-wrap responsible-moderator-badge">
+                <%= responsible_moderator_text_for(@discussion, current_user) %>
               </span>
             </h5>
           <% end %>

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/layouts/_discussions.html.erb

@@ -58,11 +58,11 @@
                   </span>
                   <span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
                   <span><%= discussion.exercise.name %></span>
-                  <% if discussion.last_moderator_access_visible_for?(current_user) %>
+                  <% if discussion.current_responsible_visible_for?(current_user) %>
                     <div class="float-end discussion-moderator-access" >
-                      <%= profile_picture_for(discussion.last_moderator_access_by, height: 32) %>
+                      <%= profile_picture_for(discussion.responsible_moderator_by, height: 32) %>
                       <span class="moderator-initials">
-                        <%= discussion.last_moderator_access_by.name_initials %>
+                        <%= discussion.responsible_moderator_by.name_initials %>
                       </span>
                     </div>
                   <% end %>

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

@@ -28,17 +28,11 @@
 
 <%= yield :navbar %>
 
-<div class="<%= exercise_container_type %><%= ' mb-5' unless input_kids? %>" id="wrap">
-  <div class="toast-container bottom-0 start-0 p-3">
-    <% if notice %>
-      <%= toast_notice(notice) %>
-    <% elsif alert %>
-      <%= toast_alert(alert) %>
-    <% elsif info %>
-      <%= toast_info(info) %>
-    <% end %>
-  </div>
+<div class="toast-container bottom-0 start-0 p-3">
+  <%= render partial: 'layouts/toast' %>
+</div>
 
+<div class="<%= exercise_container_type %><%= ' mb-5' unless input_kids? %>" id="wrap">
   <%= yield %>
 </div>