mumuki-laboratory 9.0.3 → 9.1.1

data/app/helpers/menu_bar_helper.rb

@@ -40,7 +40,7 @@ module MenuBarHelper
   end
 
   def menu_item(icon, name, url, translation_params = {})
-    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1'
+    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1', class: 'dropdown-item'
   end
 
   def any_menu_bar_links?

data/app/helpers/messages_helper.rb

@@ -4,7 +4,7 @@ module MessagesHelper
   end
 
   def hidden_pending(assignment)
-    assignment.pending_messages? ? '' : 'hidden'
+    assignment.pending_messages? ? '' : 'd-none'
   end
 
   def disabled_submit_class(assignment)

data/app/helpers/multiple_file_editor_helper.rb

@@ -9,6 +9,7 @@ module MultipleFileEditorHelper
 
   def multifile_hidden_inputs
     hidden_field_tag('highlight-modes', highlight_modes.to_json) +
-    hidden_field_tag('multifile-locales', multifile_locales.to_json)
+    hidden_field_tag('multifile-locales', multifile_locales.to_json) +
+    hidden_field_tag('multifile-default-content', @files.to_json)
   end
 end

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,25 +1,35 @@
 module OverlappedButtonsHelper
   def expand_icon
-    overlapped_button_icon :fullscreen, :expand
+    overlapped_link :fullscreen, :expand, class: 'editor-resize'
   end
 
-  def restart_icon(data_placement='left')
-    overlapped_button_icon :restart, :undo, data_placement
+  def format_icon
+    overlapped_link :format, :indent, class: 'editor-format'
   end
 
-  def format_icon
-    overlapped_button_icon :format, :indent
+  def restart_icon(source='console', **options)
+    overlapped_link :restart, :undo, class: "#{source}-reset submission-reset", **options
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon('top'),
-            guide_progress_path(guide),
-            class: 'mu-content-toolbar-item mu-restart-guide',
-            data: {confirm: t(:confirm_restart)},
-            method: :delete
+    all_options = tooltip_options(:restart).merge!(
+      {class: 'mu-content-toolbar-item mu-restart-guide',
+       data: {confirm: t(:confirm_restart)}, method: :delete, 'data-bs-placement': 'top'})
+
+    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options
+  end
+
+  private
+
+  def overlapped_link(key, icon, **options)
+    content_tag :a, overlapped_button_icon(icon), tooltip_options(key).merge!(options)
+  end
+
+  def overlapped_button_icon(icon)
+    fa_icon icon, class: 'fa-fw', role: 'button'
   end
 
-  def overlapped_button_icon(key, icon, data_placement='left')
-    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': data_placement)
+  def tooltip_options(key)
+    {title: t(key), 'aria-label': t(key), 'data-bs-toggle': 'tooltip', 'data-bs-placement': 'left'}
   end
 end

data/app/helpers/profile_helper.rb

@@ -1,13 +1,13 @@
 module ProfileHelper
   def edit_profile_button
-    link_to t(:edit_profile), :edit_user, class: 'btn btn-success'
+    link_to t(:edit_profile), :edit_user, class: 'btn btn-complementary'
   end
 
   def cancel_edit_profile_button
-    link_to t(:cancel), :user, class: 'btn btn-default' if current_user.profile_completed?
+    link_to t(:cancel), :user, class: 'btn btn-secondary' if current_user.profile_completed?
   end
 
   def save_edit_profile_button(form)
-    form.submit t(:save), disabled: true, class: 'btn btn-success mu-edit-profile-btn'
+    form.submit t(:save), disabled: true, class: 'btn btn-complementary mu-edit-profile-btn'
   end
 end

data/app/helpers/toast_helper.rb

@@ -0,0 +1,27 @@
+module ToastHelper
+  def toast_notice(text)
+    toast_for('success', 'check-circle', text)
+  end
+
+  def toast_alert(text)
+    toast_for('error', 'times-circle', text)
+  end
+
+  def toast_info(text)
+    toast_for('info', 'info-circle', text)
+  end
+
+  private
+
+  def toast_for(type, icon, text)
+    "<div class='toast mu-toast-#{type}' role='alert'>
+       <div class='toast-body'>
+         <div class='d-flex align-items-center'>
+           #{fa_icon icon, class: 'fa-lg me-3'}
+           <span class='flex-grow-1 text-break'>#{text}</span>
+           <button type='button' class='btn-close btn-close-white mx-2 flex-shrink-0' data-bs-dismiss='toast' aria-label='Close'></button>
+         </div>
+       </div>
+     </div>".html_safe
+  end
+end

data/app/helpers/user_activity_helper.rb

@@ -0,0 +1,48 @@
+module UserActivityHelper
+  def activity_selector_week_range_for(organization = Organization.current)
+    start = organization.activity_start_date min_week
+    (start.prev_occurring(:monday) + 1..Date.today)
+        .step(7)
+        .to_a
+        .reverse
+        .map { |it| [it, it + 7.days] }
+  end
+
+  def mark_period_if_active(period_start)
+    active_period?(period_start) ? 'nav-link active' : 'nav-link'
+  end
+
+  def solved_exercises_percentage
+    percentage = @activity[:exercises][:solved_count].to_f / @activity[:exercises][:count] * 100
+    "#{percentage.ceil}%"
+  end
+
+  def exercises_activity_stats
+    solved_count = {
+        name: t(:solved_exercises_count, count: @activity[:exercises][:solved_count]),
+        value: @activity[:exercises][:solved_count] }
+    solved_percentage = {
+        name: t(:solved_exercises_percentage),
+        value: solved_exercises_percentage }
+
+    @date_from ? [solved_count] : [solved_count, solved_percentage]
+  end
+
+  def messages_activity_stats
+    count = @activity[:messages][:count]
+    approved = @activity[:messages][:approved]
+
+    [{name: t(:messages_pluralized, count: count), value: count},
+     {name: t(:approved_messages, count: approved), value: approved}]
+  end
+
+  private
+
+  def active_period?(period_start)
+    period_start ? @date_from == period_start : !@date_from
+  end
+
+  def min_week
+    8.week.ago.to_date
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -19,6 +19,10 @@ module UserMenuHelper
     user_menu_item t(:discussions), discussions_user_path, 'discussions' if current_user&.can_discuss_here?
   end
 
+  def activity_user_menu_link
+    user_menu_item t(:activity), activity_user_path, 'activity'
+  end
+
   def certificates_user_menu_link
     user_menu_item t(:certificates), certificates_user_path, 'certificates'
   end

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

@@ -2,12 +2,12 @@
   <%= header_breadcrumbs(link_for_organization: false) %>
 <% end %>
 
-<div class="col-md-offset-2 col-md-8">
+<div class="col-lg-8 offset-lg-2">
   <%= render partial: 'book/header' %>
 
   <% @book.next_lesson_for(current_user).try do |lesson| %>
     <div class="actions">
-      <a href="<%= lesson_path(lesson) %>" class="btn btn-success">
+      <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
         <%= t book_practice_key_for(current_user) %>
       </a>
     </div>

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

@@ -22,7 +22,7 @@
           <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">
           </a>
-          <a class="btn btn-success mu-certificate-download-btn pull-right" href="<%= download_certificate_path @certificate.code %>" target="_blank">
+          <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>

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

@@ -4,8 +4,8 @@
 
 <div class="row">
   <div class="mu-inline-block-left">
-    <h1 class="hidden-xs"><%= full_title_for @chapter %></h1>
-    <h1 class="visible-xs"><%= short_title_for @chapter %></h1>
+    <h1 class="d-none d-sm-block"><%= full_title_for @chapter %></h1>
+    <h1 class="d-block d-sm-none"><%= short_title_for @chapter %></h1>
 
     <% if @chapter.monolesson? %>
       <%= render partial: 'guides/guide_title_icons' %>

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.initiator.name %>
+        <%= 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">
-        <%= user.name %>
+        <%= discussion_user_name user %>
         <% if user.moderator_here? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
@@ -10,22 +10,28 @@
           <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
         </span>
         <span class="actions">
-          <% if message.authorized? current_user %>
+          <% if message.authorized?(current_user) && !message.deleted? %>
             <% if current_user&.moderator_here? %>
-              <a class="discussion-message-approved <%= 'selected' if message.approved? %>" onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
+              <a class="discussion-message-approved <%= 'selected' if message.approved? %>"
+                 onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
                 <%= fa_icon(:check, class: 'fa-lg') %>
               </a>
               <% if message.from_initiator? %>
-                <a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>" onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
+                <a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>"
+                   onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
                   <%= fa_icon('question-circle', type: 'regular', class: 'fa-lg') %>
                 </a>
               <% end %>
             <% end %>
-            <%= link_to fa_icon('trash-alt', type: :regular, class: 'fa-lg'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) }, class: 'discussion-delete-message' %>
+            <% if message.from_user? current_user %>
+              <%= discussion_delete_message_link @discussion, message %>
+            <% else %>
+              <%= discussion_delete_message_dropdown @discussion, message %>
+            <% end %>
           <% end %>
           <% if should_show_approved_for?(current_user, message) %>
             <span class="discussion-message-approved selected">
-              <%= fa_icon(:check, class: 'fa-lg', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
+              <%= fa_icon(:check, class: 'fa-lg', 'data-bs-toggle': 'tooltip', title: (t :approved_message)) %>
             </span>
           <% end %>
         </span>
@@ -33,7 +39,26 @@
     </div>
     <div class="discussion-message-bubble-content">
       <div class="discussion-message-content">
-        <%= message.content_html %>
+        <% if message.deleted? %>
+          <em><%= message_deleted_text message %></em>
+          <% if message.from_user? current_user %>
+            <p><%= t :deleted_message_warning %></p>
+          <% end %>
+          <% if current_user&.moderator_here? %>
+            <hr>
+            <%= t :deleted_by, deleter: message.deleted_by.name %>
+            <%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
+            <a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
+              <%= t :show_message %>
+            </a>
+            <div id='<%= "deletedMessage#{message.id}" %>' class="collapse">
+              <hr>
+              <%= message.content_html %>
+            </div>
+          <% end %>
+        <% else %>
+          <%= message.content_html %>
+        <% end %>
       </div>
     </div>
   </div>

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

@@ -10,12 +10,23 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :content, '', { id: 'new-discussion-message', class: 'form-control', placeholder: t(:message) } %>
+              <%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
             </div>
+            <div class="discussion-message-content d-none" id="discussion-new-message-preview"></div>
           </div>
         </div>
       </div>
     </div>
-    <button class="btn btn-success btn-block discussion-new-message-button"> <%= t :comment %> </button>
+    <div class="discussion-new-message-buttons">
+      <% if user.moderator_here? %>
+        <button class="btn btn-secondary discussion-new-message-preview-button preview" type="button" error-text="<%= t :preview_error %>"
+                onclick="mumuki.Forum.discussionMessagePreview('<%= preview_discussion_message_url %>')"> <%= fa_icon('eye', text: t(:preview)) %> </button>
+        <button class="btn btn-secondary discussion-new-message-preview-button edit d-none" type="button"
+                onclick="mumuki.Forum.hidePreviewAndShowEditor()"> <%= fa_icon('pencil-alt', text: t(:edit_message)) %> </button>
+      <% end %>
+      <%= button_tag type: 'submit', class: 'btn btn-complementary discussion-new-message-button', data: { disable: true } do %>
+        <%= fa_icon('comment', text: t(:comment)) %>
+      <% end %>
+    </div>
   <% end %>
 <% end %>

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

@@ -3,22 +3,20 @@
 <% end %>
 
 <div class="row">
-  <div class="mu-inline-block-left">
-    <h1><%= t :forum %></h1>
-  </div>
+  <h1><%= t :forum %></h1>
 </div>
-<div class="row">
-  <% if @debatable.respond_to? :language %>
-    <div class="mu-inline-block-right hidden-xs">
-      <h3><%= language_icon @debatable.language %></h3>
-    </div>
-  <% end %>
+<div class="d-flex">
   <div class="mu-inline-block-left">
     <h3>
-      <span class="hidden-xs"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
+      <span class="d-none d-sm-inline"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
       <span><%= @debatable.name %></span>
     </h3>
   </div>
+  <% if @debatable.respond_to? :language %>
+    <div class="d-none d-sm-block ms-3">
+      <h3><%= language_icon @debatable.language %></h3>
+    </div>
+  <% end %>
 </div>
 
 <% if @discussions.empty? %>

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

@@ -22,12 +22,12 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :description, '', {id: 'new-discussion-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
+              <%= f.editor :description, '', {id: 'discussion-new-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
             </div>
           </div>
         </div>
       </div>
     </div>
-    <%= f.submit t(:save), class: 'btn btn-success btn-block discussion-new-message-button' %>
+    <%= f.submit t(:save), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
   <% end %>
 <% end %>

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

@@ -11,16 +11,24 @@
 <% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
   <hr class="message-divider">
 
-  <div>
-    <h3>
-      <%= t :messages %>
-      <% if @discussion.last_moderator_access_visible_for?(current_user) %>
-        <small class="pull-right">
-          <span><%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %></span>
-          <span><%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %></span>
-        </small>
-      <% end %>
-    </h3>
+  <div class="d-flex flex-wrap">
+    <h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
+    <% if current_user && @discussion.persisted? %>
+      <span class="d-flex">
+        <% if @discussion.subscribable? %>
+          <div class="discussion-subscription me-1">
+            <%= btn_toggle subscription_icon, unsubscription_icon, current_user.subscribed_to?(@discussion), class: 'btn-sm',
+                           onclick: "mumuki.Forum.discussionSubscription('#{subscription_discussion_url(@discussion)}')" %>
+          </div>
+        <% end %>
+        <% if @discussion.solved? %>
+          <div class="discussion-upvote">
+            <%= btn_toggle upvote_icon, undo_upvote_icon, current_user.upvoted?(@discussion), class: 'btn-sm',
+                           onclick: "mumuki.Forum.discussionUpvote('#{upvote_discussion_url(@discussion)}')" %>
+          </div>
+        <% end %>
+      </span>
+    <% end %>
   </div>
 
   <% if @discussion.has_messages? %>
@@ -28,8 +36,8 @@
       <% if @discussion.description.present? %>
         <%= render partial: 'discussions/description_message', locals: {discussion: @discussion} %>
       <% end %>
-      <% @discussion.messages.each do |message| %>
-        <%= render partial: 'discussions/message', locals: {user: message.sender_user, message: message} %>
+      <% @discussion.visible_messages.each do |message| %>
+          <%= render partial: 'discussions/message', locals: {user: message.sender_user, message: message} %>
       <% end %>
       <% if @discussion.commentable_by?(current_user) %>
         <hr class="message-divider">

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

@@ -20,18 +20,17 @@
         <%= t :exam_registration_explanation_html, date: l(@registration.end_time, format: :long) %>
       </p>
     </div>
-    <%= form_for @authorization_request do |f| %>
+    <%= form_for @authorization_request, html: {class: 'mu-form'} do |f| %>
       <%= f.hidden_field :exam_registration_id, value: @registration.id %>
-      <div class="form-group">
-        <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
-        <% @registration.exams.each do |exam| %>
-          <div class="field radio complementary complementary-radio">
-            <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, checked: @authorization_request.exam_id == exam.id) %>
-            <%= label_tag exam.id, l(exam.start_time, format: :long) %>
-          </div>
-        <% end %>
-      </div>
-      <button class="btn btn-success"> <%= t :save %> </button>
+      <%= 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>
+      <% end %>
+      <button class="btn btn-complementary"> <%= t :save %> </button>
     <% end %>
   </div>
 </div>