mumuki-laboratory 5.7.0 → 5.8.0

data/app/controllers/discussions_messages_controller.rb

@@ -1,5 +1,6 @@
 class DiscussionsMessagesController < AjaxController
   before_action :set_discussion!, only: [:create, :destroy]
+  before_action :authorize!, only: [:destroy, :approve]
 
   def create
     @discussion.submit_message! message_params, current_user
@@ -7,18 +8,29 @@ class DiscussionsMessagesController < AjaxController
   end
 
   def destroy
-    message = Message.find(params[:id])
-    message.authorize! current_user
-    message.destroy!
+    current_message.destroy!
     redirect_back(fallback_location: root_path)
   end
 
+  def approve
+    current_message.toggle_approved!
+    head :ok
+  end
+
   private
 
   def set_discussion!
     @discussion ||= Discussion.find_by(id: params[:discussion_id])
   end
 
+  def authorize!
+    current_message.authorize! current_user
+  end
+
+  def current_message
+    @message ||= Message.find(params[:id])
+  end
+
   def message_params
     params.require(:message).permit(:content)
   end

data/app/helpers/application_helper.rb

@@ -16,7 +16,7 @@ module ApplicationHelper
   end
 
   def profile_picture
-    image_tag(@current_user.image_url, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
+    image_tag(current_user.image_url, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
   end
 
   def paginate(object, options={})

data/app/helpers/discussions_helper.rb

@@ -1,18 +1,26 @@
 module DiscussionsHelper
   def read_discussions_link(item)
-    discussions_link t(:solve_your_doubts), item_discussions_path(item, default_discussions_params)
+    discussions_link others_discussions_icon(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))
+    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user))
   end
 
-  def discussions_icon(text)
+  def user_discussions_link
+    discussions_link user_discussions_icon(t(:my_doubts)), user_path(anchor: 'discussions') if current_user.watched_discussions.present?
+  end
+
+  def others_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?
+  def user_discussions_icon(text)
+    fixed_fa_icon 'comment', text: text
+  end
+
+  def discussions_link(item, path, organization=Organization.current)
+    link_to item, path if organization.forum_enabled?
   end
 
   def item_discussion_path(discussion, params={})

data/app/helpers/multiple_file_editor_helper.rb

@@ -0,0 +1,9 @@
+module MultipleFileEditorHelper
+  def highlight_modes
+    Language.all.map { |it| { extension: it.extension, highlight_mode: it.highlight_mode } }
+  end
+
+  def multifile_locales
+    :insert_file_name.try { |it| { it => t(it) } }
+  end
+end

data/app/models/application_record.rb

@@ -1,6 +1,8 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
+  delegate :whitelist_attributes, to: :class
+
   def self.defaults(&block)
     after_initialize :defaults, if: :new_record?
     define_method :defaults, &block
@@ -77,4 +79,7 @@ class ApplicationRecord < ActiveRecord::Base
     obj
   end
 
+  def self.whitelist_attributes(a_hash, options={})
+    a_hash.slice(*attribute_names).except(*options[:except])
+  end
 end

data/app/models/concerns/with_assignments.rb

@@ -6,15 +6,13 @@ module WithAssignments
   end
 
   def current_content_for(user)
-    assignment_for(user).try(&:solution) ||
-      default_content_for(user)
+    assignment_for(user)&.solution || default_content_for(user)
   end
 
   def files_for(user)
     language
       .directives_sections
-      .split_sections(assignment_for(user)&.solution || default_content_for(user))
-      .except('content')
+      .split_sections(current_content_for user)
       .map { |name, content| Mumuki::Laboratory::File.new name, content }
   end
 
@@ -55,24 +53,8 @@ module WithAssignments
     assignments.find_by(submitter: user)
   end
 
-  def solved_by?(user)
-    !!assignment_for(user).try(&:passed?)
-  end
-
-  def assigned_to?(user)
-    assignments.exists?(submitter: user)
-  end
-
   def status_for(user)
-    assignment_for(user).defaulting(Mumuki::Laboratory::Status::Submission::Unknown, &:status) if user
-  end
-
-  def last_submission_date_for(user)
-    assignment_for(user).try(&:updated_at)
-  end
-
-  def submissions_count_for(user)
-    assignment_for(user).try(&:submissions_count) || 0
+    assignment_for(user).defaulting(Mumuki::Laboratory::Status::Submission::Pending, &:status) if user
   end
 
   def find_or_init_assignment_for(user)

data/app/models/discussion.rb

@@ -2,7 +2,7 @@ class Discussion < ApplicationRecord
   include WithDiscussionStatus, ParentNavigation, WithScopedQueries, Contextualization
 
   belongs_to :item, polymorphic: true
-  has_many :messages
+  has_many :messages, -> { order(:created_at) }
   belongs_to :initiator, class_name: 'User'
   belongs_to :exercise, foreign_type: :exercise, foreign_key: 'item_id'
   has_many :subscriptions

data/app/models/exam.rb

@@ -30,6 +30,10 @@ class Exam < ApplicationRecord
     enabled_range_for(user).cover? DateTime.now
   end
 
+  def in_progress_for?(user)
+    accessible_for?(user) && started?(user)
+  end
+
   def validate_accessible_for!(user)
     if user.present?
       raise Mumuki::Laboratory::ForbiddenError unless authorized?(user)
@@ -97,25 +101,22 @@ class Exam < ApplicationRecord
   end
 
   def self.import_from_json!(json)
-    json.except!(:social_ids, :sender)
-    organization = Organization.find_by!(name: json.delete(:organization))
+    exam_data = json.with_indifferent_access
+    organization = Organization.find_by!(name: exam_data[:organization])
     organization.switch!
-    exam_data = parse_json json
+    adapt_json_values exam_data
     remove_previous_version exam_data[:eid], exam_data[:guide_id]
-    users = exam_data.delete(:users)
-    exam = where(classroom_id: exam_data.delete(:eid)).update_or_create! exam_data
-    exam.process_users users
+    exam = where(classroom_id: exam_data[:eid]).update_or_create!(whitelist_attributes(exam_data))
+    exam.process_users exam_data[:users]
     exam.index_usage! organization
     exam
   end
 
-  def self.parse_json(exam_json)
-    exam = exam_json.except(:name, :language)
-    exam[:guide_id] = Guide.find_by(slug: exam.delete(:slug)).id
+  def self.adapt_json_values(exam)
+    exam[:guide_id] = Guide.find_by(slug: exam[:slug]).id
     exam[:organization_id] = Organization.current.id
-    exam[:users] = exam.delete(:uids).map { |uid| User.find_by(uid: uid) }.compact
+    exam[:users] = exam[:uids].map { |uid| User.find_by(uid: uid) }.compact
     [:start_time, :end_time].each { |param| exam[param] = exam[param].to_time }
-    exam
   end
 
   def self.remove_previous_version(eid, guide_id)

data/app/models/exercise.rb

@@ -82,7 +82,7 @@ class Exercise < ApplicationRecord
 
     reset!
 
-    attrs = json.except('type', 'id', 'solution', 'language', 'teacher_info', 'choices')
+    attrs = whitelist_attributes(json, except: %w(type id))
     attrs['choices'] = json['choices'].map { |choice| choice['value'] } if json['choices'].present?
     attrs['bibliotheca_id'] = json['id']
     attrs['number'] = number

data/app/models/guide.rb

@@ -58,7 +58,7 @@ class Guide < Content
   end
 
   def import_from_json!(json)
-    self.assign_attributes json.except('exercises', 'language', 'id_format', 'id', 'teacher_info', 'collaborators')
+    self.assign_attributes whitelist_attributes(json, except: ['id'])
     self.language = Language.for_name(json['language'])
     self.save!
 

data/app/models/message.rb

@@ -33,7 +33,7 @@ class Message < ApplicationRecord
   end
 
   def as_platform_json
-    as_json(except: [:id, :type, :discussion_id],
+    as_json(except: [:id, :type, :discussion_id, :approved],
             include: {exercise: {only: [:bibliotheca_id]}})
       .merge(organization: Organization.current.name)
   end
@@ -42,6 +42,10 @@ class Message < ApplicationRecord
     update! read: true
   end
 
+  def toggle_approved!
+    toggle! :approved
+  end
+
   def self.parse_json(json)
     message = json.delete 'message'
     json

data/app/models/stats.rb

@@ -1,49 +1,24 @@
 class Stats
   include ActiveModel::Model
 
-  attr_accessor :passed, :passed_with_warnings, :failed, :unknown
-
-  def total
-    submitted + unknown
-  end
+  attr_accessor :passed, :passed_with_warnings, :failed, :pending
 
   def submitted
-    failed + resolved
-  end
-
-  def pending
-    failed + unknown
-  end
-
-  def resolved
-    passed + passed_with_warnings
+    passed + passed_with_warnings + failed
   end
 
   def done?
-    pending == 0
+    failed + pending == 0
   end
 
   def started?
     submitted > 0
   end
 
-  def to_h(&key)
-    {key.call(:passed) => passed,
-     key.call(:passed_with_warnings) => passed_with_warnings,
-     key.call(:failed) => failed,
-     key.call(:unknown) => unknown}
-  end
-
   def self.from_statuses(statuses)
-    Stats.new(statuses.inject({passed: 0, passed_with_warnings: 0, failed: 0, unknown: 0}) do |accum, status|
+    Stats.new(statuses.inject({passed: 0, passed_with_warnings: 0, failed: 0, pending: 0}) do |accum, status|
       accum[status.group.to_sym] += 1
       accum
     end)
   end
-
-  private
-
-  def ratio(x)
-    (100 * x / total.to_f).round(2)
-  end
 end

data/app/models/user.rb

@@ -26,6 +26,8 @@ class User < ApplicationRecord
 
   has_many :exam_authorizations
 
+  has_many :exams, through: :exam_authorizations
+
   after_initialize :init
 
   before_validation :set_uid!
@@ -135,6 +137,10 @@ class User < ApplicationRecord
     assignments.each { |it| it.notify! rescue nil }
   end
 
+  def currently_in_exam?
+    exams.any? { |e| e.in_progress_for? self }
+  end
+
   private
 
   def set_uid!

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

@@ -11,6 +11,9 @@
         <% end %>
         <% if message.authorized? current_user %>
           <span class="actions">
+            <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-xs') %>
+            </a>
             <%= link_to fa_icon('trash-o'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
           </span>
         <% end %>

data/app/views/errors/forbidden.html.erb

@@ -7,7 +7,7 @@
         <%= t(:error_description, error: link_to_status_codes(403)).html_safe %>
       </p>
       <p>
-        <%= Organization.current.explain_error(403, :forbidden_explanation).html_safe %>
+        <%= Organization.current.explain_error(403, explanation).html_safe %>
       </p>
       <p>
         <%= t(:contact_administrator, link: mail_to_administrator).html_safe %>

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

@@ -1,6 +1,11 @@
 <% if guide.authors.present? %>
   <%= content_for :authoring do %>
     <p class="small">
+      <% if embedded_mode? %>
+        <span class="hidden-md hidden-lg hidden-xl">
+          <%= render partial: 'layouts/copyright' %> -
+        </span>
+      <% end %>
       <%= raw t :authoring_note, authors: guide.authors, collaborators: "https://raw.githubusercontent.com/#{guide.slug}/master/COLLABORATORS.txt" %>
     </p>
   <% end %>

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

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

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

@@ -0,0 +1,4 @@
+<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiProject" target="_blank"></a>
+<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiProject" target="_blank"></a>
+<a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
+<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumuki-project" target="_blank"></a>

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

@@ -37,6 +37,7 @@
               <li><%= link_to_classroom %></li>
               <li><%= link_to_bibliotheca %></li>
               <li><%= solve_discussions_link %></li>
+              <li><%= user_discussions_link %></li>
               <li class="divider"></li>
               <li><%= link_to(t(:sign_out), logout_path(origin: url_for), role: 'menuitem') %></li>
             </ul>
@@ -62,8 +63,8 @@
 
       <div id="footer-copyright" class="row">
         <div class="col-md-4 text-left">
-          <p>&copy; Copyright 2015-<%= DateTime.now.year %>
-            <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki Project</a>
+          <p>
+            <%= render partial: 'layouts/copyright' %>
           </p>
         </div>
 
@@ -72,10 +73,7 @@
         </div>
 
         <div id="footer-social" class="col-md-4 text-right" lang="en">
-          <a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiProject" target="_blank"></a>
-          <a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiProject" target="_blank"></a>
-          <a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-          <a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumuki-project" target="_blank"></a>
+          <%= render partial: 'layouts/social_media' %>
         </div>
       </div>
     </div>

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

@@ -1 +1,28 @@
+<% content_for :footer do %>
+  <footer class="footer">
+    <div class="<%= exercise_container_type %>">
+      <hr>
+
+      <div class="row">
+        <div class="col-md-12">
+          <%= yield :authoring %>
+        </div>
+      </div>
+
+      <div id="footer-copyright" class="row hidden-xs hidden-sm">
+        <div class="col-sm-8 text-left">
+          <p>
+            <%= render partial: 'layouts/copyright' %>
+          </p>
+        </div>
+
+        <div id="footer-social" class="col-sm-4 text-right" lang="en">
+          <%= render partial: 'layouts/social_media' %>
+        </div>
+      </div>
+    </div>
+  </footer>
+<% end %>
+
+
 <%= render partial: 'layouts/main' %>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb

@@ -4,15 +4,20 @@
     <span class="files-tabs">
       <ul class="nav nav-tabs">
         <% @files.each_with_index do |file, index| %>
-            <li role="presentation" class="<%= 'active' if index == 0 %>" data-target="#editor-file-<%= index %>" tabindex='0' data-toggle='tab'>
-              <a href="#"><%= file.name %></a>
+            <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-target="#editor-file-<%= index %>" tabindex='0' data-toggle='tab'>
+              <a class="file-name" href="#"><%= file.name %></a> <i class="delete-file-button fa fa-times"></i>
             </li>
         <% end %>
       </ul>
+      <i class="add-file-button fa fa-plus"></i>
     </span>
+
+    <input id="highlight-modes" type="hidden" value="<%=highlight_modes.to_json%>" />
+    <input id="multifile-locales" type="hidden" value="<%=multifile_locales.to_json%>" />
+
     <div class="tab-content">
       <% @files.each_with_index do |file, index| %>
-          <div role="tabpanel" class="tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
+          <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
             <%= form.editor "content[#{file.name}]", file.highlight_mode,
                             placeholder: t(:editor_placeholder),
                             class: 'form-control editor',