mumuki-laboratory 5.5.0 → 5.6.0

data/app/controllers/application_controller.rb

@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base
   include Mumukit::Login::AuthenticationHelpers
 
   include Mumuki::Laboratory::Controllers::Authorization
-  include Mumuki::Laboratory::Controllers::Messages
+  include Mumuki::Laboratory::Controllers::Notifications
   include Mumuki::Laboratory::Controllers::DynamicErrors
 
   before_action :set_current_organization!
@@ -13,12 +13,12 @@ class ApplicationController < ActionController::Base
   before_action :redirect_to_main_organization!, if: :should_redirect_to_main_organization?
   before_action :authorize_if_private!
   before_action :validate_user_profile!, if: :current_user?
-  before_action :validate_used_here!
   before_action :visit_organization!, if: :current_user?
 
   helper_method :login_button,
-                :messages_count,
-                :has_messages?,
+                :notifications_count,
+                :user_notifications_path,
+                :has_notifications?,
                 :subject,
                 :should_choose_organization?,
                 :theme_stylesheet_url,
@@ -38,11 +38,6 @@ class ApplicationController < ActionController::Base
       Mumukit::Platform.implicit_organization?(request)
   end
 
-  # ensures contents are in current organization's path
-  def validate_used_here!
-    raise Mumuki::Laboratory::NotFoundError if subject && !subject.used_in?(Organization.current)
-  end
-
   # ensures contents are accessible to current user
   def validate_accessible!
     accessible_subject.validate_accessible_for!(current_user) unless (current_user? && current_user.teacher_here?)

data/app/controllers/book_discussions_controller.rb

@@ -0,0 +1,7 @@
+class BookDiscussionsController < DiscussionsController
+  private
+
+  def set_debatable
+    @debatable = Organization.current.book
+  end
+end

data/app/controllers/chapters_controller.rb

@@ -1,6 +1,8 @@
 require 'addressable/uri'
 
 class ChaptersController < ApplicationController
+  include Mumuki::Laboratory::Controllers::Content
+
   def show
   end
 

data/app/controllers/discussions_controller.rb

@@ -0,0 +1,65 @@
+class DiscussionsController < AjaxController
+  include Mumuki::Laboratory::Controllers::Content
+
+  before_action :set_debatable, except: [:subscription]
+  before_action :authenticate!, only: [:update, :create]
+  before_action :discussion_filter_params, only: :index
+  before_action :read_discussion, only: :show
+
+  helper_method :discussion_filter_params
+
+  def index
+    @discussions = current_content_discussions.for_user(current_user)
+    @filtered_discussions = @discussions.scoped_query_by(discussion_filter_params)
+  end
+
+  def show
+  end
+
+  def update
+    subject.update_status! params[:status], current_user
+    redirect_to [@debatable, subject], notice: I18n.t(:discussion_updated)
+  end
+
+  def subscription
+    current_user&.toggle_subscription!(subject)
+    head :ok
+  end
+
+  def upvote
+    current_user&.toggle_upvote!(subject)
+    head :ok
+  end
+
+  def create
+    discussion = @debatable.discuss! current_user, discussion_params
+    redirect_to [@debatable, discussion]
+  end
+
+  private
+
+  def current_content_discussions
+    @debatable.discussions
+  end
+
+  def set_debatable
+    @debatable_class = params[:debatable_class]
+    @debatable = Discussion.debatable_for(@debatable_class, params)
+  end
+
+  def subject
+    @discussion ||= Discussion.find_by(id: params[:id])
+  end
+
+  def read_discussion
+    @discussion.subscription_for(current_user)&.read!
+  end
+
+  def discussion_params
+    params.require(:discussion).permit(:title, :description)
+  end
+
+  def discussion_filter_params
+    @filter_params ||= params.permit(Discussion.permitted_query_params)
+  end
+end

data/app/controllers/discussions_messages_controller.rb

@@ -0,0 +1,25 @@
+class DiscussionsMessagesController < AjaxController
+  before_action :set_discussion!, only: [:create, :destroy]
+
+  def create
+    @discussion.submit_message! message_params, current_user
+    redirect_back(fallback_location: root_path)
+  end
+
+  def destroy
+    message = Message.find(params[:id])
+    message.authorize!
+    message.destroy!
+    redirect_back(fallback_location: root_path)
+  end
+
+  private
+
+  def set_discussion!
+    @discussion ||= Discussion.find_by(id: params[:discussion_id])
+  end
+
+  def message_params
+    params.require(:message).permit(:content)
+  end
+end

data/app/controllers/exercises_controller.rb

@@ -1,4 +1,5 @@
 class ExercisesController < ApplicationController
+  include Mumuki::Laboratory::Controllers::Content
   include Mumuki::Laboratory::Controllers::ExerciseSeed
 
   before_action :set_guide!, only: :show

data/app/controllers/guide_container_controller.rb

@@ -1,4 +1,5 @@
 class GuideContainerController < ApplicationController
+  include Mumuki::Laboratory::Controllers::Content
 
   before_action :set_guide
 

data/app/controllers/messages_controller.rb

@@ -22,7 +22,7 @@ class MessagesController < AjaxController
   private
 
   def set_exercise!
-    exercise_id = params.dig(:message, :exercise_id)  || params[:exercise_id]
+    exercise_id = params.dig(:message, :exercise_id) || params[:exercise_id]
     @exercise = Exercise.find(exercise_id)
   end
 

data/app/controllers/users_controller.rb

@@ -4,6 +4,7 @@ class UsersController < ApplicationController
 
   def show
     @messages = current_user.messages || []
+    @watched_discussions = current_user.watched_discussions
   end
 
   def update

data/app/helpers/application_helper.rb

@@ -40,4 +40,11 @@ module ApplicationHelper
   def chapter_finished(chapter)
     t :chapter_finished_html, chapter: link_to_path_element(chapter) if chapter
   end
+
+  def span_toggle(hidden_text, active_text, active)
+    %Q{
+      <span class="#{'hidden' if active}">#{hidden_text}</span>
+      <span class="#{'hidden' unless active}">#{active_text}</span>
+    }.html_safe
+  end
 end

data/app/helpers/assignment_result_helper.rb

@@ -1,34 +1,4 @@
 module AssignmentResultHelper
-  def t_expectation(expectation)
-    raw Mumukit::Inspection::Expectation.parse(expectation).translate
-  end
-
-  def render_feedback?(assignment)
-    StatusRenderingVerbosity.render_feedback?(assignment.feedback)
-  end
-
-  def t_assignment_status(assignment)
-    t assignment_status assignment
-  end
-
-  def assignment_status(assignment)
-    if assignment.exercise.hidden?
-      :hidden_done
-    elsif assignment.exercise.choices?
-      assignment.passed? ? :correct_answer : :wrong_answer
-    else
-      assignment.status
-    end
-  end
-
-  def render_test_results(assignment)
-    if assignment.test_results.present?
-      render partial: 'layouts/test_results', locals: { assignment: assignment }
-    else
-      render partial: 'layouts/result', locals: { assignment: assignment }
-    end
-  end
-
   def solution_download_link(assignment)
     link_to fa_icon(:download, text: t(:download)),
             solution_octet_data(assignment),
@@ -49,6 +19,16 @@ module AssignmentResultHelper
     end
   end
 
+  def report_bug_link(assignment, organization=Organization.current)
+    if organization.report_issue_enabled?
+      mail_to contact_email,
+        fa_icon(:bug, text: t(:notify_problem_with_exercise), class: 'fa-fw'),
+        subject: t(:problem_with_exercise, title: @exercise.name),
+        body: assignment_help_email_body(assignment),
+        class: 'warning'
+    end
+  end
+
   def manual_evaluation_comment(assignment)
     if assignment.manual_evaluation_comment?
       Mumukit::ContentType::Markdown.to_html assignment.manual_evaluation_comment

data/app/helpers/breadcrumbs_helper.rb

@@ -22,16 +22,20 @@ module BreadcrumbsHelper
 HTML
   end
 
+  def breadcrumb_list_item(last, item)
+    "<li #{breadcrumb_item_class(last)}>#{item}</li>".html_safe
+  end
+
   private
 
   def breadcrumbs0(e, extra=nil, last='')
-    return "#{breadcrumbs0(e)}<li #{breadcrumb_item_class(last)} >#{extra}</li>".html_safe if extra
+    return "#{breadcrumbs0(e)} #{breadcrumb_list_item(last, extra)}".html_safe if extra
 
     base = link_to_path_element e
     if e.navigation_end?
-      "#{home_breadcrumb}<li #{breadcrumb_item_class(last)}>#{base}</li>".html_safe
+      "#{home_breadcrumb} #{breadcrumb_list_item(last, base)}".html_safe
     else
-      "#{breadcrumbs0(e.navigable_parent)} <li #{breadcrumb_item_class(last)}>#{base}</li>".html_safe
+      "#{breadcrumbs0(e.navigable_parent)} #{breadcrumb_list_item(last, base)}".html_safe
     end
   end
 end

data/app/helpers/contextualization_result_helper.rb

@@ -0,0 +1,31 @@
+module ContextualizationResultHelper
+  def humanized_expectation_result_item(expectation_result)
+    %Q{<li>#{status_icon(expectation_result[:result])} #{expectation_result[:explanation]}</li>}.html_safe
+  end
+
+  def render_feedback?(contextualization)
+    contextualization.feedback.present?
+  end
+
+  def t_contextualization_status(contextualization)
+    t contextualization_status contextualization
+  end
+
+  def contextualization_status(contextualization)
+    if contextualization.exercise.hidden?
+      :hidden_done
+    elsif contextualization.exercise.choices?
+      contextualization.passed? ? :correct_answer : :wrong_answer
+    else
+      contextualization.submission_status
+    end
+  end
+
+  def render_test_results(contextualization)
+    if contextualization.test_results.present?
+      render partial: 'layouts/test_results', locals: { contextualization: contextualization}
+    else
+      render partial: 'layouts/result', locals: { contextualization: contextualization }
+    end
+  end
+end

data/app/helpers/discussions_helper.rb

@@ -0,0 +1,163 @@
+module DiscussionsHelper
+  def read_discussions_link(item)
+    discussions_link t(:solve_your_doubts), item_discussions_path(item, default_discussions_params)
+  end
+
+  def solve_discussions_link
+    discussions_link t(:solve_doubts), discussions_path(solve_discussion_params_for(current_user))
+  end
+
+  def discussions_icon(text)
+    fixed_fa_icon 'comments', text: text
+  end
+
+  def discussions_link(text, path, organization=Organization.current)
+    link_to discussions_icon(text), path if organization.forum_enabled?
+  end
+
+  def item_discussion_path(discussion, params={})
+    polymorphic_path([discussion.item, discussion], params)
+  end
+
+  def item_discussions_path(item, params={})
+    polymorphic_path([item, :discussions], params)
+  end
+
+  def solve_discussion_params_for(user)
+    if user&.moderator?
+      { status: :pending_review, sort: :created_at_asc }
+    else
+      { status: :opened, sort: :created_at_asc }
+    end
+  end
+
+  def default_discussions_params
+    { status: :solved, sort: :upvotes_count_desc }
+  end
+
+  def user_avatar(user, image_class='')
+    image_tag user.image_url, height: 40, class: "img-circle #{image_class}"
+  end
+
+  def discussions_link_with_teaser(item)
+    %Q{
+      <div>
+        <h3>#{t(:discussions)}</h3>
+        <p>
+          #{t(:solve_your_doubts_teaser)}
+          #{read_discussions_link(item)}
+        </p>
+      </div>
+    }.html_safe
+  end
+
+  def discussion_messages_icon(discussion)
+    %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>
+      </span>
+    }.html_safe
+  end
+
+  def discussion_upvotes_icon(discussion)
+    if discussion.upvotes_count > 0
+      %Q{
+        <span class="discussion-icon fa-stack fa-xs">
+          <i class="fa fa-star-o fa-stack-2x"></i>
+          <i class="fa fa-stack-1x">#{discussion.upvotes_count}</i>
+        </span>
+      }.html_safe
+    end
+  end
+
+  def discussion_update_status_button(status)
+    button_to t("to_#{status}"),
+              item_discussion_path(@discussion, {status: status}),
+              class: "btn btn-discussion-#{status}",
+              method: :put
+  end
+
+  def new_discussion_link(teaser_text, link_text)
+    %Q{
+      <h4>
+        <span>#{t(teaser_text)}</span>
+        <a>
+          <span class="discussion-create">
+            #{t(link_text)}
+          </span>
+        </a>
+      </h4>
+    }.html_safe
+  end
+
+  def discussion_count_for_status(status, discussions)
+    discussions.scoped_query_by(discussion_filter_params, :status).by_status(status).count
+  end
+
+  def discussions_reset_query_link
+    link_to fa_icon(:times, text: t(:reset_query)), {}, class: 'discussions-reset-query' unless discussion_filter_params.blank?
+  end
+
+  def discussions_statuses
+    Mumuki::Laboratory::Status::Discussion::STATUSES
+  end
+
+  def discussions_languages(discussions)
+    discussions.map { |it| it.language.name }.uniq
+  end
+
+  def discussion_status_filter_link(status, discussions)
+    discussions_count = discussion_count_for_status(status, discussions)
+    if status.should_be_shown?(discussions_count, current_user)
+      discussion_filter_item(:status, status) do
+        discussion_status_filter(status, discussions_count)
+      end
+    end
+  end
+
+  def discussion_status_filter(status, discussions_count)
+    %Q{
+      #{status_fa_icon(status)}
+      <span>
+        #{discussions_count}
+        #{t status}
+      </span>
+    }.html_safe
+  end
+
+  def discussion_dropdown_filter(label, filters, &block)
+    if filters.present?
+      %Q{
+        <div class="dropdown discussions-toolbar-filter">
+          <a id="dropdown-#{label}" data-toggle="dropdown" role="menu">
+            #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="dropdown-#{label}">
+            #{discussion_filter_list(label, filters, &block)}
+          </ul>
+        </div>
+      }.html_safe
+    end
+  end
+
+  def discussion_filter_list(label, filters, &block)
+    filters.map { |it| discussion_filter_item(label, it, &block) }.join("\n")
+  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)}")
+  end
+
+  def discussion_filter_selected?(label, filter)
+    filter.to_s == discussion_filter_params[label]
+  end
+
+  def discussion_filter_link(label, filter, &block)
+    link_to capture(filter, &block), discussion_filter_params.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)}"
+  end
+end