mumuki-laboratory 9.8.0 → 9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf699468e8c7bb82501af07ac560eb1a4d0eeb76e132de4471313601b305b0b8
-  data.tar.gz: 2dc39959670941c08b30d163905bf76b45ed1bcd2c22a73904124717847de23b
+  metadata.gz: fb8cf028976b13658a28a48a6bf235276d1732ce1256a463cd348b8d915fcba7
+  data.tar.gz: 990a6400b5f4fa76f7f17cd5dc97575c9cb475bc7588a15d4ae8102d434583b7
 SHA512:
-  metadata.gz: 72ddf7aa48d50a43378a814d009f3f535905cbbb070fd159a38210b4f7d1204d391bb7c57fa2a469eef0931840f3876b9c068e54f815a69bc06e3342b7cba8c2
-  data.tar.gz: 747b4074fcd68c4763ca6d539e8bb6b6f16ba4888e8c5289f4cd4dfc2748a3da0bbd097048860a6f59a2affe0e73c4a9fc8510e9f78dbfcf1bb7b78171e91058
+  metadata.gz: 371681f22a60126bad63d241eee30f52f5a8c674077648a2bad413f15375fb704276af6149fc04046f0fc6d72d1562f76ccfcb1ec4d013a7bdcd4480dd817766
+  data.tar.gz: 40875a8558cb07951d09ca67bfe2c10405b9fb75d225ff1afd9f4ede4803ba87b9a1460a8aae18268027c3e4380b9a00d20eb9d03d8c2d5561d4ee023453d4a6

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

@@ -19,6 +19,7 @@ mumuki.load(() => {
       $('.pending-messages-filter').removeClass('pending-messages-filter');
       $('button.btn-submit').removeClass('disabled');
       $('.pending-messages-text').remove();
+      $("a[data-bs-target='#messages']")[0].click();
     },
     readMessages: function (url) {
       Chat.tokenRequest({
@@ -47,35 +48,6 @@ mumuki.load(() => {
     setMessagesInterval: function () {
       mumuki.setInterval(Chat.getMessages, 60000);
     },
-    submitMessagesForm: function (url, readUrl, errorUrl) {
-      var $container = $('.mu-view-messages');
-
-      function renderHTML(data) {
-        $container.empty();
-        $container.html(data);
-        $("a[data-bs-target='#messages']").click();
-      }
-
-      function success(data) {
-        renderHTML(data);
-        Chat.readMessages(readUrl);
-      }
-
-      function error(_xhr) {
-        Chat.tokenRequest({
-          url: errorUrl,
-          success: renderHTML,
-          xhrFields: {withCredentials: true}
-        });
-      }
-
-      $.ajax({
-        url: url,
-        success: success,
-        error: error,
-        xhrFields: {withCredentials: true}
-      });
-    },
     openNewMessageModal: function () {
       Chat.$newMessageModal().modal({backdrop: false, keyboard: false});
       Chat.$body().addClass("new-message-modal-open");
@@ -90,4 +62,3 @@ mumuki.load(() => {
   mumuki.Chat = Chat;
 
 });
-

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

@@ -50,36 +50,28 @@ $moderator-badge-color: #dd9900;
     }
   }
 
-  .discussion-pagination {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-  }
-
   .discussion-language-icon {
-    float: right;
-    margin-right: 10px;
-    margin-top: 6px;
-    -ms-transform: scale(1.4, 1.4);
-    -webkit-transform: scale(1.4, 1.4);
-    transform: scale(1.4, 1.4);
+    display: inline;
+    padding-right: 5px;
   }
 
-  .discussion-icon {
-    -ms-transform: scale(0.8, 0.8);
-    -webkit-transform: scale(0.8, 0.8);
-    transform: scale(0.8, 0.8);
-    margin-left: 5px;
-    float: right;
-    .fa-stack-1x {
-      -ms-transform: scale(0.9, 0.9);
-      -webkit-transform: scale(0.9, 0.9);
-      transform: scale(0.9, 0.9);
+  .discussion-validated-messages-count {
+    .fa-check {
+      font-size: calc(#{$font-size-base} * 0.5);
+      position: absolute;
+      margin-left: -13px;
+      margin-top: 10px;
     }
   }
 }
 
+.discussion-pagination {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
 .discussions-no-filtered-results {
   padding: 20px;
   border: 1px solid $discussion-toolbar-border-color;
@@ -96,7 +88,7 @@ $moderator-badge-color: #dd9900;
 }
 
 .discussion-status-icon {
-  padding-right: 10px;
+  padding-left: 2px;
 }
 
 .discussion-row {
@@ -106,11 +98,26 @@ $moderator-badge-color: #dd9900;
     font-size: 18px;
     font-weight: bold;
   }
+  .discussion-title-icons {
+    display: flex;
+    flex-shrink: 0;
+    align-items: center;
+    font-size: calc(#{$font-size-base} * 0.95);
+
+    > * {
+      padding-left: 20px;
+    }
+  }
   .discussion-description {
     overflow: hidden;
     display: block;
     text-overflow: ellipsis;
     white-space: nowrap;
+    margin-bottom: 20px;
+    font-size: calc(#{$font-size-base} * 0.95);
+  }
+  .discussion-initiator {
+    font-size: calc(#{$font-size-base} * 0.85);
   }
 }
 
@@ -308,6 +315,7 @@ $moderator-badge-color: #dd9900;
   border: 1px solid $discussion-message-border-color;
   border-radius: 3px;
   position: relative;
+  margin-bottom: 20px;
   .discussion-message-bubble-header {
     background-color: $mu-color-highlight-background;
     height: 40px;
@@ -400,13 +408,3 @@ $moderator-badge-color: #dd9900;
     font-weight: normal;
   }
 }
-
-.discussion-moderator-access {
-  margin-right: 20px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .moderator-initials {
-    font-size: 14px;
-  }
-}

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

@@ -115,3 +115,6 @@ body.fullscreen {
   }
 }
 
+.pending-messages-text {
+  top: auto;
+}

data/app/controllers/messages_controller.rb

@@ -2,7 +2,8 @@ class MessagesController < AjaxController
   before_action :set_exercise!, only: [:create, :read_messages]
 
   def index
-    render json: {has_messages: has_messages?, messages_count: messages_count}
+    pending_messages = current_user.unread_messages
+    render json: {has_messages: pending_messages.present?, messages_count: pending_messages.count}
   end
 
   def read_messages
@@ -15,10 +16,6 @@ class MessagesController < AjaxController
     redirect_to @exercise
   end
 
-  def errors
-    render 'messages/errors', layout: false
-  end
-
   private
 
   def set_exercise!

data/app/controllers/users_controller.rb

@@ -27,7 +27,7 @@ class UsersController < ApplicationController
   end
 
   def discussions
-    @watched_discussions = current_user.watched_discussions_in_organization
+    @watched_discussions = current_user.watched_discussions_in_organization.scoped_query_by(discussion_filter_params).unread_first
   end
 
   def activity
@@ -71,4 +71,8 @@ class UsersController < ApplicationController
       nil
     end
   end
+
+  def discussion_filter_params
+    @filter_params ||= params.permit([:page])
+  end
 end

data/app/helpers/application_helper.rb

@@ -48,4 +48,8 @@ module ApplicationHelper
   def notification_preview_for(target)
     render "notifications/#{target.class.name.underscore}", { target: target }
   end
+
+  def current_time_zone_html
+    %Q{(<span class="select-date-timezone">#{Organization.current.time_zone}</span>)}.html_safe
+  end
 end

data/app/helpers/discussions_helper.rb

@@ -60,11 +60,18 @@ module DiscussionsHelper
     }.html_safe
   end
 
-  def discussion_messages_icon(discussion)
+  def discussion_messages_count(discussion)
     %Q{
-      <span class="discussion-icon fa-stack fa-xs">
-        <i class="far fa-comment fa-stack-2x"></i>
-        <i class="fas fa-stack-1x">#{discussion.validated_messages_count}</i>
+      <span class="discussion-messages-count">
+        #{fa_icon :comments, type: :regular, text: discussion.messages_count}
+      </span>
+    }.html_safe
+  end
+
+  def discussion_validated_messages_count(discussion)
+    %Q{
+      <span class="discussion-validated-messages-count">
+        #{fa_icon :comment, type: :regular}#{fa_icon :check, text: discussion.validated_messages_count}
       </span>
     }.html_safe
   end

data/app/helpers/exam_registration_helper.rb

@@ -6,8 +6,4 @@ module ExamRegistrationHelper
       { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }
     end
   end
-
-  def current_time_zone_html
-    %Q{(<span class="select-date-timezone">#{Organization.current&.time_zone}</span>)}.html_safe
-  end
 end

data/app/helpers/icons_helper.rb

@@ -50,6 +50,6 @@ module IconsHelper
   end
 
   def icon_for_read(read)
-    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope")
+    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope#{read ? '-open' : ''}")
   end
 end

data/app/helpers/menu_bar_helper.rb

@@ -48,6 +48,6 @@ module MenuBarHelper
   end
 
   def menu_link_to_faqs
-    li_tag menu_item('question', :faqs, faqs_path)
+    li_tag menu_item(:info, :faqs_abbreviated, faqs_path)
   end
 end

data/app/helpers/messages_helper.rb

@@ -1,8 +1,4 @@
 module MessagesHelper
-  def messages_url(exercise)
-    exercise.messages_url_for(current_user) if current_user?
-  end
-
   def hidden_pending(assignment)
     assignment.pending_messages? ? '' : 'd-none'
   end
@@ -15,11 +11,11 @@ module MessagesHelper
     'pending-messages-filter' if assignment.pending_messages?
   end
 
-  def read_messages_caption(assignment)
-    assignment.pending_messages? ? :read_messages : :exit
-  end
-
   def sender_class(message)
     message.blank? || message.from_user?(current_user) ? 'self' : 'other'
   end
+
+  def staleness_class(message)
+    'mu-stale' if message.stale?
+  end
 end

data/app/helpers/profile_helper.rb

@@ -10,4 +10,8 @@ module ProfileHelper
   def save_edit_profile_button(form)
     form.submit t(:save), class: 'btn btn-complementary mu-edit-profile-btn'
   end
+
+  def show_verified_full_name_notice?(user, organization)
+    user.has_verified_full_name? && organization.private?
+  end
 end

data/app/helpers/user_discussions_helper.rb

@@ -0,0 +1,38 @@
+module UserDiscussionsHelper
+  def user_discussions_table_title(discussion, user, last_read)
+    %Q{
+      <tr></tr>
+      <thead>
+        <tr>
+          <td class="#{last_read.nil? ? '' : 'pt-5'}" colspan="4">
+            <strong>#{discussion.read_by?(user) ? t(:discussions_read) : t(:discussions_unread)}</strong>
+          </td>
+        </tr>
+      </thead>
+    }.html_safe
+  end
+
+  def user_discussions_table_header
+    %Q{
+      <tr class="fw-bold">
+        <td></td>
+        <td>#{t(:exercise)}</td>
+        <td>#{t(:discussion_created_by)}</td>
+        <td>#{t(:last_message)}</td>
+      </tr>
+    }.html_safe
+  end
+
+  def user_discussions_table_item(discussion, user)
+    %Q{
+      <tr>
+        <td class="text-center">
+          #{icon_for_read(discussion.read_by?(user))}
+        </td>
+        <td>#{link_to discussion.item.name, item_discussion_path(discussion)}</td>
+        <td>#{discussion_user_name discussion.initiator}</td>
+        <td>#{t(:time_since, time: time_ago_in_words(discussion.last_message_date))}</td>
+      </tr>
+    }.html_safe
+  end
+end

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

@@ -28,6 +28,6 @@
         </div>
       </div>
     </div>
-    <%= f.submit t(:save), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
+    <%= f.submit t(:publish_discussion), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
   <% end %>
 <% end %>

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

@@ -1,2 +1,2 @@
-&copy; 2015-<%= DateTime.now.year %>
+&copy; 2015-<%= Time.current.year %>
 <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki</a>

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

@@ -40,43 +40,7 @@
       </span>
     </div>
   <% else %>
-    <div class="discussions">
-      <% @filtered_discussions.each do |discussion| %>
-        <%= link_to exercise_discussion_path(discussion.exercise.id, discussion) do %>
-          <div class="discussion">
-            <div class="discussion-row">
-              <%= discussion_messages_icon(discussion) %>
-              <% unless @debatable.respond_to? :language %>
-                <div class="discussion-language-icon">
-                  <%= language_icon(discussion.exercise.language) %>
-                </div>
-              <% end %>
-              <div>
-                <div class="discussion-title">
-                  <span class="discussion-status-icon">
-                    <%= discussion_status_fa_icon(discussion) %>
-                  </span>
-                  <span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
-                  <span><%= discussion.exercise.name %></span>
-                  <% if discussion.current_responsible_visible_for?(current_user) %>
-                    <div class="float-end discussion-moderator-access" >
-                      <%= profile_picture_for(discussion.responsible_moderator_by, height: 32) %>
-                      <span class="moderator-initials">
-                        <%= discussion.responsible_moderator_by.name_initials %>
-                      </span>
-                    </div>
-                  <% end %>
-
-                </div>
-                <span class="discussion-description">
-                  <%= discussion.description %>
-                </span>
-              </div>
-            </div>
-          </div>
-        <% end %>
-      <% end %>
-    </div>
+    <%= render partial: 'layouts/discussions_list' %>
 
     <div class="discussion-pagination">
       <%= paginate @filtered_discussions, nav_class: 'pagination' %>

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

@@ -0,0 +1,38 @@
+<div class="discussions">
+  <% @filtered_discussions.each do |discussion| %>
+    <%= link_to exercise_discussion_path(discussion.exercise.id, discussion), class: 'discussion-link' do %>
+      <div class="discussion">
+        <div class="discussion-row">
+          <div class="d-flex justify-content-between">
+            <div class="discussion-title">
+              <div class="discussion-language-icon">
+                <%= language_icon(discussion.exercise.language) %>
+              </div>
+              <span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
+              <span><%= discussion.exercise.name %></span>
+              <% if discussion.current_responsible_visible_for?(current_user) %>
+                <span class="badge ms-1 bg-dark">
+                  <%= responsible_moderator_text_for(discussion, current_user)%>
+                </span>
+              <% end %>
+            </div>
+            <div class="discussion-title-icons">
+              <%= discussion_messages_count(discussion) %>
+              <%= discussion_validated_messages_count(discussion) %>
+            </div>
+          </div>
+          <span class="discussion-description">
+            <%= discussion.description %>
+          </span>
+          <span class="discussion-initiator">
+            <strong><%= discussion_user_name discussion.initiator %></strong>
+            <%= t(:asked_time_since, time: time_ago_in_words(discussion.created_at)) %>
+            <span class="discussion-status-icon">
+              <%= discussion_status_fa_icon(discussion) %>
+            </span>
+          </span>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</div>