mumuki-laboratory 7.6.2 → 7.7.4

data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss

@@ -19,6 +19,7 @@
 @import "modules/breadcrumb";
 @import "modules/gs-board";
 @import "modules/kids";
+@import "modules/kindergarten";
 @import "modules/kids_results";
 @import "modules/discussion";
 @import "modules/popover";

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

@@ -201,10 +201,6 @@ $moderator-star-color: #dd9900;
   }
 }
 
-.discussion-create {
-  cursor: pointer;
-}
-
 .discussion-context {
   margin-top: 40px;
 }
@@ -331,9 +327,9 @@ summary.discussion-summary {
         float: right;
         a {
           margin-left: 5px;
+          cursor: pointer;
         }
         .discussion-message-approved {
-          cursor: pointer;
           text-decoration: none;
           &.selected {
             i {
@@ -341,6 +337,29 @@ summary.discussion-summary {
             }
           }
         }
+        .discussion-message-not-actually-a-question {
+          text-decoration: none;
+          i {
+            position: relative;
+            &:after {
+              position: absolute;
+              left: 6px;
+              content: ' ';
+              height: 19px;
+              width: 2px;
+              transform: rotate(-45deg);
+              background-color: #aaaaaa;
+            }
+          }
+          &.selected {
+            i {
+              color: $brand-primary;
+              &:after {
+                background-color: $brand-primary;
+              }
+            }
+          }
+        }
         i {
           color: #aaaaaa
         }
@@ -383,4 +402,23 @@ $statuses: (
   }
 }
 
+.no-margin {
+  margin: 0 !important;
+}
+
+.discussion-requires-attention {
+  margin-right: 20px;
+  label {
+    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/_kids.scss

@@ -182,17 +182,17 @@ $kids-speech-tabs-width: 40px;
           cursor: pointer;
         }
       }
-      div.mu-kids-character-speech-bubble-normal {
+      .mu-kids-character-speech-bubble-normal {
         width: 100%;
         height: 100%;
         overflow: hidden;
       }
-      div.mu-kids-character-speech-bubble-failed {
+      .mu-kids-character-speech-bubble-failed {
         width: 100%;
         height: 100%;
         overflow: hidden;
       }
-      ul.mu-kids-character-speech-bubble-tabs {
+      .mu-kids-character-speech-bubble-tabs {
         display: flex;
         flex-direction: column;
         justify-content: center;

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

@@ -0,0 +1,55 @@
+.mu-kids-exercise.mu-kindergarten {
+
+  // layout
+
+  display: flex;
+  flex-flow: column;
+
+  .mu-kids-exercise-workspace {
+    display: flex;
+    flex-flow: row;
+    height: 100%;
+    width: 100%;
+  }
+
+  .mu-kids-single-state,
+  .mu-kids-blocks {
+    width: 50%;
+    height: 100%
+  }
+
+  .mu-kids-blocks {
+    margin-top: 0;
+  }
+
+  // no board numbers,
+  // but a thicker border instead
+
+  table.gbs_board.style-scope.gs-board {
+    padding: 3px;
+  }
+
+  .gbs_lv.gbs_lvl.style-scope.gs-board,
+  .gbs_lv.gbs_lvr.style-scope.gs-board,
+  tr.style-scope.gs-board:first-child,
+  tr.style-scope.gs-board:last-child {
+    display: none
+  }
+
+  // no final state,
+  // initial state fills its area
+
+  .mu-kids-state.mu-state-initial {
+    height: 100%;
+  }
+
+  .mu-kids-state.mu-state-final {
+    display: none;
+  }
+
+  .mu-kids-compass-rose {
+    display: none;
+  }
+}
+
+

data/app/controllers/assets_controller.rb

@@ -2,6 +2,8 @@ class AssetsController < ApplicationController
 
   protect_from_forgery except: [:theme_stylesheet, :extension_javascript]
   skip_before_action :authorize_if_private!
+  skip_before_action :validate_user_profile!
+  skip_before_action :validate_active_organization!
 
   def theme_stylesheet
     render inline: Organization.current.theme_stylesheet.to_s, content_type: 'text/css'

data/app/controllers/concerns/with_authorization.rb

@@ -13,6 +13,10 @@ module WithAuthorization
     authorize! :owner
   end
 
+  def authorize_moderator!
+    authorize! :moderator
+  end
+
   def authorization_slug
     protection_slug || '_/_'
   end

data/app/controllers/concerns/with_user_discussion_validation.rb

@@ -0,0 +1,14 @@
+module WithUserDiscussionValidation
+  extend ActiveSupport::Concern
+
+  included do
+    # discussions are not enabled for all organizations nor all users
+    before_action :validate_user_can_discuss!
+  end
+
+  private
+
+  def validate_user_can_discuss!
+    raise Mumuki::Domain::NotFoundError unless current_user&.can_discuss_here?
+  end
+end

data/app/controllers/discussions_controller.rb

@@ -1,11 +1,6 @@
 class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
-
-  # discussions are not enabled for all organitions nor all users
-  # there is no need to validate forum existance when creating; next validation is stronger
-  before_action :validate_forum_enabled!, except: :create
-  before_action :validate_can_create_discusssion!, only: :create
-
+  include WithUserDiscussionValidation
   # users are not allowed to access discussions during exams
   before_action :validate_not_in_exam!
 
@@ -21,7 +16,12 @@ class DiscussionsController < ApplicationController
     @filtered_discussions = @discussions.scoped_query_by(discussion_filter_params)
   end
 
+  def new
+    @discussion = @debatable.new_discussion_for current_user
+  end
+
   def show
+    @discussion.update_last_moderator_access! current_user
   end
 
   def update
@@ -71,14 +71,6 @@ class DiscussionsController < ApplicationController
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
 
-  def validate_forum_enabled!
-    raise Mumuki::Domain::NotFoundError unless Organization.current.forum_enabled?
-  end
-
-  def validate_can_create_discusssion!
-    raise Mumuki::Domain::NotFoundError unless Organization.current.can_create_discussions?(current_user)
-  end
-
   def validate_not_in_exam!
     raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
   end

data/app/controllers/discussions_messages_controller.rb

@@ -1,6 +1,10 @@
 class DiscussionsMessagesController < AjaxController
+  include WithAuthorization
+  include WithUserDiscussionValidation
+
   before_action :set_discussion!, only: [:create, :destroy]
-  before_action :authorize_user!, only: [:destroy, :approve]
+  before_action :authorize_user!, only: [:destroy]
+  before_action :authorize_moderator!, only: [:question, :approve]
 
   def create
     @discussion.submit_message! message_params, current_user
@@ -17,6 +21,11 @@ class DiscussionsMessagesController < AjaxController
     head :ok
   end
 
+  def question
+    current_message.toggle_not_actually_a_question!
+    head :ok
+  end
+
   private
 
   def set_discussion!

data/app/controllers/exercise_solutions_controller.rb

@@ -22,7 +22,9 @@ class ExerciseSolutionsController < AjaxController
   end
 
   def solution_params
-    params_h = params.require(:solution).permit!.to_h
-    {content: params_h[:content]}
+    {
+      content: params.require(:solution).permit!.to_h[:content],
+      client_result: params[:client_result].try { |it| it.permit(:status, test_results: [:title, :status, :result, :summary]).to_h }
+    }
   end
 end

data/app/helpers/application_helper.rb

@@ -7,10 +7,14 @@ module ApplicationHelper
   end
 
   def profile_picture
-    image_tag(current_user.profile_picture, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
+    profile_picture_for current_user
   end
 
-  def paginate(object, options={})
+  def profile_picture_for(user, height = 40)
+    image_tag(user.profile_picture, height: height, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
+  end
+
+  def paginate(object, options = {})
     "<div class=\"text-center\">#{super(object, {theme: 'twitter-bootstrap-3'}.merge(options))}</div>".html_safe
   end
 
@@ -32,10 +36,10 @@ module ApplicationHelper
     t :chapter_finished_html, chapter: link_to_path_element(chapter) if chapter
   end
 
-  def span_toggle(hidden_text, active_text, active)
+  def span_toggle(hidden_text, active_text, active, **options)
     %Q{
-      <span class="#{'hidden' if active}">#{hidden_text}</span>
-      <span class="#{'hidden' unless active}">#{active_text}</span>
+      <span class="#{'hidden' if active} #{options[:class]}">#{hidden_text}</span>
+      <span class="#{'hidden' unless active} #{options[:class]}">#{active_text}</span>
     }.html_safe
   end
 end

data/app/helpers/discussions_helper.rb

@@ -23,31 +23,32 @@ module DiscussionsHelper
     fixed_fa_icon 'comment', text: text
   end
 
-  def discussions_link(item, path, html_options=nil, organization=Organization.current)
-    link_to item, path, html_options if organization.forum_enabled?
+  def discussions_link(item, path, html_options = nil)
+    return unless current_user&.can_discuss_here?
+    link_to item, path, html_options
   end
 
-  def item_discussion_path(discussion, params={})
+  def item_discussion_path(discussion, params = {})
     polymorphic_path([discussion.item, discussion], params)
   end
 
-  def item_discussions_path(item, params={})
+  def item_discussions_path(item, params = {})
     polymorphic_path([item, :discussions], params)
   end
 
   def solve_discussion_params_for(user)
     if user&.moderator_here?
-      { status: :pending_review, sort: :created_at_asc }
+      {status: :pending_review, sort: :responses_count_asc, requires_moderator_response: true}
     else
-      { status: :opened, sort: :created_at_asc }
+      {status: :opened, sort: :responses_count_desc}
     end
   end
 
   def default_discussions_params
-    { status: :solved, sort: :upvotes_count_desc }
+    {status: :solved, sort: :upvotes_count_desc}
   end
 
-  def user_avatar(user, image_class='')
+  def user_avatar(user, image_class = '')
     image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
   end
 
@@ -67,7 +68,7 @@ module DiscussionsHelper
     %Q{
       <span class="discussion-icon fa-stack fa-xs">
         <i class="fa fa-comment-o fa-stack-2x"></i>
-        <i class="fa fa-stack-1x">#{discussion.messages.size}</i>
+        <i class="fa fa-stack-1x">#{discussion.validated_messages_count}</i>
       </span>
     }.html_safe
   end
@@ -91,22 +92,16 @@ module DiscussionsHelper
   end
 
   def new_discussion_link(teaser_text, link_text)
-    return '' unless Organization.current.can_create_discussions?(current_user)
-
     %Q{
       <h4>
         <span>#{t(teaser_text)}</span>
-        <a>
-          <span class="discussion-create">
-            #{t(link_text)}
-          </span>
-        </a>
+        #{link_to t(link_text), new_exercise_discussion_path(@debatable, anchor: 'new-discussion-description-container') }
       </h4>
     }.html_safe
   end
 
   def discussion_count_for_status(status, discussions)
-    discussions.scoped_query_by(discussion_filter_params, :status).by_status(status).count
+    discussions.scoped_query_by(discussion_filter_params, excluded_params: [:status], excluded_methods: [:page]).by_status(status).count
   end
 
   def discussions_reset_query_link
@@ -117,8 +112,10 @@ module DiscussionsHelper
     Mumuki::Domain::Status::Discussion::STATUSES
   end
 
+  #TODO: this one uses a long method chain in order to take advantage of eager load
+  # Delegate it once again when polymorphic association is removed
   def discussions_languages(discussions)
-    discussions.map { |it| it.language.name }.uniq
+    @languages ||= discussions.map { |it| it.exercise.language.name }.uniq
   end
 
   def discussion_status_filter_link(status, discussions)
@@ -132,14 +129,14 @@ module DiscussionsHelper
 
   def discussion_status_filter(status, discussions_count)
     %Q{
-      #{discussion_status_fa_icon(status)}
+    #{discussion_status_fa_icon(status)}
       <span>
         #{t("#{status}_count", count: discussions_count)}
       </span>
     }.html_safe
   end
 
-  def discussion_dropdown_filter(label, filters, &block)
+  def discussion_dropdown_filter(label, filters, can_select_all = false, &block)
     if filters.present?
       %Q{
         <div class="dropdown discussions-toolbar-filter">
@@ -147,6 +144,7 @@ module DiscussionsHelper
             #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
           </a>
           <ul class="dropdown-menu" aria-labelledby="dropdown-#{label}">
+            #{discussion_filter_unselect_item(label, can_select_all)}
             #{discussion_filter_list(label, filters, &block)}
           </ul>
         </div>
@@ -159,7 +157,15 @@ module DiscussionsHelper
   end
 
   def discussion_filter_item(label, filter, &block)
-    content_tag(:li, discussion_filter_link(label, filter, &block), class: "#{'selected' if discussion_filter_selected?(label, filter)}")
+    content_tag(:li, discussion_filter_link(label, filter, &block), class: ('selected' if discussion_filter_selected?(label, filter)))
+  end
+
+  def discussion_filter_unselect_item(label, can_select_all)
+    if can_select_all
+      content_tag(:li,
+                  link_to(t(:all), discussion_filter_params_without_page.except(label)),
+                  class: ('selected' unless discussion_filter_params.include?(label)))
+    end
   end
 
   def discussion_filter_selected?(label, filter)
@@ -167,10 +173,18 @@ module DiscussionsHelper
   end
 
   def discussion_filter_link(label, filter, &block)
-    link_to capture(filter, &block), discussion_filter_params.merge(Hash[label, filter])
+    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter])
   end
 
   def discussion_info(discussion)
-     "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.messages.size)}"
+    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.messages.size)}"
+  end
+
+  def discussion_filter_params_without_page
+    discussion_filter_params.except(:page)
+  end
+
+  def should_show_approved_for?(user, message)
+    !user&.moderator_here? && message.approved? && !message.from_moderator?
   end
 end