mumuki-laboratory 5.5.0 → 5.6.0

data/app/models/subscription.rb

@@ -0,0 +1,12 @@
+class Subscription < ApplicationRecord
+  belongs_to :user
+  belongs_to :discussion
+
+  def unread!
+    update! read: false
+  end
+
+  def read!
+    update! read: true
+  end
+end

data/app/models/topic.rb

@@ -16,7 +16,7 @@ class Topic < Content
         joins("left join public.assignments assignments
                 on assignments.exercise_id = exercises.id
                 and assignments.submitter_id = #{user.id}
-                and assignments.status = #{Mumuki::Laboratory::Status::Passed.to_i}").
+                and assignments.submission_status = #{Mumuki::Laboratory::Status::Submission::Passed.to_i}").
         where('assignments.id is null').
         group('public.guides.id', 'lessons.number').map(&:lesson)
   end

data/app/models/upvote.rb

@@ -0,0 +1,4 @@
+class Upvote < ApplicationRecord
+  belongs_to :user
+  belongs_to :discussion, counter_cache: true
+end

data/app/models/user.rb

@@ -2,6 +2,7 @@ class User < ApplicationRecord
   include WithProfile,
           WithUserNavigation,
           WithReminders,
+          WithDiscussionCreation,
           Mumukit::Platform::User::Helpers
 
   serialize :permissions, Mumukit::Auth::Permissions
@@ -13,7 +14,7 @@ class User < ApplicationRecord
   has_many :submitted_exercises, through: :assignments, class_name: 'Exercise', source: :exercise
 
   has_many :solved_exercises,
-           -> { where('assignments.status' => Mumuki::Laboratory::Status::Passed.to_i) },
+           -> { where('assignments.submission_status' => Mumuki::Laboratory::Status::Submission::Passed.to_i) },
            through: :assignments,
            class_name: 'Exercise',
            source: :exercise
@@ -50,7 +51,7 @@ class User < ApplicationRecord
   end
 
   def passed_assignments
-    assignments.where(status: Mumuki::Laboratory::Status::Passed.to_i)
+    assignments.where(status: Mumuki::Laboratory::Status::Submission::Passed.to_i)
   end
 
   def unread_messages

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

@@ -0,0 +1,23 @@
+<%= content_for :breadcrumbs do %>
+  <%= home_breadcrumb %>
+<% end %>
+
+<%= content_for :extra_filters do %>
+  <%= discussion_dropdown_filter :language, discussions_languages(@discussions) do |language_filter| %>
+    <%= language_filter.capitalize %>
+  <% end %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1><%= @debatable.name %></h1>
+  </div>
+</div>
+
+<div>
+  <% if @discussions.empty? %>
+    <h4><%= t :no_questions %></h4>
+  <% else %>
+      <%= render partial: 'layouts/discussions' %>
+  <% end %>
+</div>

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

@@ -23,7 +23,6 @@
 </div>
 <% end %>
 
-
 <% if @chapter.appendix.present? %>
   <div>
     <h3><%= t(:appendix) %></h3>

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

@@ -0,0 +1,22 @@
+<%= render layout: 'discussions/message_container', locals: {user: user} do %>
+  <div class="discussion-message-bubble">
+    <div class="discussion-message-bubble-header">
+      <div class="discussion-message-bubble-title">
+        <%= user.name %>
+        <span class="message-date">
+          <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
+        </span>
+        <% if message.authorized? current_user %>
+          <span class="actions">
+            <%= 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 %>
+      </div>
+    </div>
+    <div class="discussion-message-bubble-content">
+      <div class="discussion-message-content">
+        <%= message.content %>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<div class="discussion-message">
+  <div class="discussion-message-user-avatar">
+    <%= user_avatar(user) %>
+  </div>
+  <div class="discussion-message-bubble-container">
+    <%= yield %>
+  </div>
+</div>

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

@@ -0,0 +1,19 @@
+<%= form_for [@discussion, Message.new] do |f| %>
+  <%= render layout: 'discussions/message_container', locals: {user: user} do %>
+    <div class="discussion-message-bubble">
+      <div class="discussion-message-bubble-header">
+        <div class="discussion-message-bubble-title">
+          <%= user.name %>
+        </div>
+      </div>
+      <div class="discussion-message-bubble-content">
+        <div class="container-fluid">
+          <div class="row">
+            <div><%= f.text_area :content, class: 'form-control discussion-new-message-content', placeholder: t(:message), required: true %></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <button class="btn btn-success btn-block discussion-new-message-button"> <%= t :comment %> </button>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,30 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs(@debatable, t(:discussions)) %>
+<% end %>
+
+<div class="row">
+  <% if @debatable.respond_to? :language %>
+    <div class="mu-inline-block-right hidden-xs">
+      <h1><%= language_icon @debatable.language %></h1>
+    </div>
+  <% end %>
+  <div class="mu-inline-block-left">
+    <h1>
+      <span class="hidden-xs"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
+      <span><%= @debatable.name %></span>
+    </h1>
+  </div>
+</div>
+
+<% if @discussions.empty? %>
+  <%= new_discussion_link(:no_questions, :ask_the_first_question) %>
+<% else %>
+  <%= render partial: 'layouts/discussions' %>
+  <%= new_discussion_link(:no_useful_result, :ask_a_question) %>
+<% end %>
+
+  <%= content_for :no_container do %>
+  <%= render partial: 'layouts/modals/new_discussion', locals: {debatable: @debatable} %>
+<% end if current_user? %>
+
+

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

@@ -0,0 +1,76 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs0 @debatable, link_to(t(:discussions), item_discussions_path(@debatable))%>
+  <%= breadcrumb_list_item('last', @discussion.friendly.truncate_words(4)) %>
+<% end %>
+
+<div>
+  <div class="row">
+    <% if current_user && !current_user.moderator? %>
+      <div class="mu-inline-block-right hidden-xs discussion-user-menu">
+        <h3>
+          <% if @discussion.subscribable? %>
+            <a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
+              <%= fa_icon(:eye, class: 'fa-xs') %>
+              <%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion) %>
+            </a>
+          <% end %>
+          <% if @discussion.solved? %>
+            <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
+              <%= fa_icon(:star, class: 'fa-xs') %>
+              <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion) %>
+            </a>
+          <% end %>
+        </h3>
+      </div>
+    <% end %>
+    <div class="mu-inline-block-left">
+      <div class="discussion-header">
+        <h3 class="discussion-title">
+          <%= @discussion.title %>
+        </h3>
+      </div>
+      <div class="discussion-description">
+        <%= label_for_status(@discussion.status) %> ·
+        <span class="discussion-info">
+          <span class="discussion-initiator-name">
+            <%= @discussion.initiator.name %>
+          </span>
+          <%= discussion_info(@discussion) %>
+        </span>
+      </div>
+    </div>
+  </div>
+
+  <div class="discussion-context">
+    <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
+  </div>
+
+</div>
+
+<% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
+  <hr class="message-divider">
+
+  <h3>
+    <%= t :messages %>
+  </h3>
+
+  <% if @discussion.has_messages? %>
+    <div class="discussion-messages">
+      <% @discussion.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">
+      <% end %>
+    </div>
+  <% end %>
+
+  <%= render partial: 'discussions/new_message', locals: {user: current_user} if @discussion.commentable_by?(current_user) %>
+
+<% end %>
+
+<div class="discussion-actions">
+  <% @discussion.reachable_statuses_for(current_user).each do |status| %>
+    <%= discussion_update_status_button(status) %>
+  <% end if current_user %>
+</div>

data/app/views/exercise_solutions/_contextualization_results.html.erb

@@ -0,0 +1,21 @@
+<% if contextualization.results_visible? %>
+  <div>
+    <%= render partial: 'exercise_solutions/expectations', locals: {assignment: contextualization} %>
+    <% if render_feedback?(contextualization) %>
+      <div class="results-item">
+        <strong><%= t :feedback %>:</strong>
+        <div>
+          <%= contextualization.feedback_html %>
+        </div>
+        <a data-toggle="collapse" href="#results-section" class="text-danger">
+          <%= fa_icon 'question-circle' %> <%= t :details %>
+        </a>
+      </div>
+    <% end %>
+    <div id="results-section" class="<%= 'collapse' if render_feedback?(contextualization) %> results-item">
+      <%= render_test_results contextualization %>
+    </div>
+  </div>
+<% else %>
+  <div></div>
+<% end %>

data/app/views/exercise_solutions/_contextualization_results_container.html.erb

@@ -0,0 +1,4 @@
+<div class="<%= "bs-callout bs-callout-#{class_for_status contextualization.submission_status}" %>">
+  <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
+  <%= yield %>
+</div>

data/app/views/exercise_solutions/_expectations.html.erb

@@ -1,7 +1,13 @@
-<% expectation = assignment.visible_expectation_results.find { |it| it[:result].failed? } %>
+<% if assignment.expectation_results_visible? %>
+  <div class="results-item">
+    <% unless assignment.exercise.input_kids?%>
+      <strong><%= t :unmeet_expectations %>:</strong>
+    <% end %>
 
-<% if expectation %>
     <ul class="results-list">
-      <li><%= status_icon(expectation[:result]) %> <%= t_expectation expectation %></li>
+      <% assignment.humanized_expectation_results.each do |it| %>
+        <%= humanized_expectation_result_item it %>
+      <% end %>
     </ul>
+  </div>
 <% end %>

data/app/views/exercise_solutions/_kids_results.html.erb

@@ -3,7 +3,7 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<div class="<%= "mu-kids-callout-#{class_for_status assignment.status}" %>">
+<div class="<%= "mu-kids-callout-#{class_for_status assignment.submission_status}" %>">
   <%= manual_evaluation_comment assignment %>
 </div>
 

data/app/views/exercise_solutions/_results.html.erb

@@ -3,65 +3,31 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<div class="<%= "bs-callout bs-callout-#{class_for_status assignment.status}" %>">
-
-  <%= render partial: 'exercise_solutions/results_title', locals: {assignment: assignment} %>
-
-
+<%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
   <%= manual_evaluation_comment assignment %>
   <% unless assignment.manual_evaluation_comment? %>
-      <% if assignment.results_visible? %>
-          <div>
-            <% if assignment.expectation_results_visible? %>
-                <div class="results-item">
-                  <strong><%= t :unmeet_expectations %>:</strong>
-                  <ul class="results-list">
-                    <% assignment.visible_expectation_results.each do |it| %>
-                        <li><%= status_icon(it[:result]) %> <%= t_expectation it %></li>
-                    <% end %>
-                  </ul>
-                </div>
-            <% end %>
-            <% if render_feedback?(assignment) %>
-                <div class="results-item">
-                  <strong><%= t :feedback %>:</strong>
-                  <div>
-                    <%= assignment.feedback_html %>
-                  </div>
-                  <a data-toggle="collapse" href="#results-section" class="text-danger">
-                    <%= fa_icon 'question-circle' %> <%= t :details %>
-                  </a>
-                </div>
-            <% end %>
-            <div id="results-section" class="<%= 'collapse' if render_feedback?(assignment) %> results-item">
-              <%= render_test_results assignment %>
-            </div>
-          </div>
-      <% else %>
-          <div></div>
-      <% end %>
-      <% unless assignment.passed? %>
-          <div class="notify-problem-box">
-            <div class="dropdown">
-              <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
-              <ul class="dropdown-menu" aria-labelledby="helpDropdown">
-                <li>
-                  <%= 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' %>
-                </li>
-                <li>
-                  <%= render_community_link %>
-                </li>
-              </ul>
-            </div>
-          </div>
-      <% end %>
+    <%= render partial: 'exercise_solutions/contextualization_results', locals: {contextualization: assignment} %>
+    <% if should_render_need_help_dropdown?(assignment) %>
+      <div class="notify-problem-box">
+        <div class="dropdown">
+          <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
+          <ul class="dropdown-menu" aria-labelledby="helpDropdown">
+            <li>
+              <%= read_discussions_link(@exercise) %>
+            </li>
+            <li>
+              <%= render_community_link %>
+            </li>
+            <li>
+              <%= report_bug_link(assignment) %>
+            </li>
+          </ul>
+        </div>
+      </div>
+    <% end %>
   <% end %>
   <%= solution_download_link assignment %>
-</div>
+<% end %>
 
 <% if assignment.should_retry? %>
   <%= assistance_box assignment %>

data/app/views/exercise_solutions/_results_title.html.erb

@@ -1,3 +1,3 @@
-<h4 class="text-<%= class_for_status(assignment.status) %>">
-  <strong><%= fa_icon icon_type_for_status(assignment.status) %> <%= t_assignment_status assignment %></strong>
+<h4 class="text-<%= class_for_status(contextualization.submission_status) %>">
+  <strong><%= fa_icon icon_type_for_status(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
 </h4>

data/app/views/exercises/_exercise_assignment.html.erb

@@ -0,0 +1,20 @@
+<div class="text-box">
+  <%= exercise.description_html %>
+</div>
+<div class="row">
+  <div class="col-md-12">
+    <div class="hint-box <%= 'hidden' if exercise.hint.blank? %>">
+      <% if exercise.hint.present? %>
+        <a data-toggle="collapse" href="#hint-section" class="text-info">
+          <%= fa_icon 'lightbulb-o' %> <%= t :need_a_hint %>
+        </a>
+
+        <div id="hint-section" class="collapse">
+          <p>
+            <%= exercise.hint_html %>
+          </p>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/exercises/_read_only.html.erb

@@ -0,0 +1,104 @@
+<%= render_runner_assets exercise.language, :layout %>
+
+<% if exercise.console? %>
+  <%= hidden_field_tag(:stateful_console, exercise.stateful_console?) %>
+  <%= hidden_field_tag(:prompt, exercise.prompt) %>
+<% end %>
+<%= hidden_field_tag(:exercise_language, exercise.highlight_mode) %>
+<%= hidden_field_tag :console_endpoint, exercise_queries_path(exercise) %>
+
+<details open>
+  <summary class="discussion-summary">
+    <div class="mu-inline-block-right hidden-xs">
+      <h1><%= language_icon @debatable.language %></h1>
+    </div>
+    <h3 class="discussion-exercise-title">
+      <span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>:&nbsp;</span>
+      <span><%= @debatable.name %></span>
+    </h3>
+  </summary>
+
+  <% if should_render_read_only_exercise_tabs?(@discussion) %>
+
+    <ul class="nav nav-tabs discussion-tabs" role="tablist">
+      <% if @discussion.has_submission? %>
+        <li role="presentation" class="active">
+          <a data-target="#solution" aria-controls="solution" role="tab" data-toggle="tab" class="editor-tab">
+            <%= t :solution %>
+          </a>
+        </li>
+        <li role="presentation">
+          <a data-target="#results" aria-controls="results" role="tab" data-toggle="tab" class="editor-tab">
+            <%= t :results %>
+          </a>
+        </li>
+      <% end %>
+
+      <li role="presentation" <%= "class=active" unless @discussion.has_submission? %>>
+        <a data-target="#content" aria-controls="content" role="tab" data-toggle="tab" class="editor-tab">
+          <%= t :description %>
+        </a>
+      </li>
+
+      <% if exercise.extra_visible? %>
+        <%= extra_code_tab %>
+      <% end %>
+
+      <% if exercise.queriable? %>
+        <%= console_tab %>
+      <% end %>
+    </ul>
+
+    <div class="tab-content">
+
+      <% if @discussion.has_submission? %>
+        <div role="tabpanel" class="tab-pane active" id="solution">
+          <div class="mu-tab-body">
+            <div role="tabpanel" class="tab-pane mu-input-panel fade in active" id="editor">
+              <%= render_exercise_read_only_editor exercise, @discussion.solution %>
+            </div>
+          </div>
+        </div>
+
+        <div role="tabpanel" class="tab-pane" id="results">
+          <div class="mu-tab-body">
+            <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion } do %>
+              <div class="row">
+                <div class="col-md-12 submission-results">
+                  <%= render partial: 'exercise_solutions/contextualization_results',
+                             locals: {contextualization: @discussion, guide_finished_by_solution: false} %>
+                </div>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
+      <div role="tabpanel" class="tab-pane <%= 'active' unless @discussion.has_submission? %>" id="content">
+        <div class="mu-tab-body">
+          <div class="exercise-assignment">
+            <%= render partial: 'exercises/exercise_assignment', locals: {exercise: exercise} %>
+          </div>
+        </div>
+      </div>
+
+      <div role="tabpanel" class="tab-pane mu-input-panel fade" id="console">
+        <div class="mu-overlapped-container">
+          <div class="console">
+          </div>
+          <div class="mu-overlapped">
+            <a class="console-reset submission-reset"><%= restart_icon %></a>
+          </div>
+        </div>
+      </div>
+
+      <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+        <%= exercise.extra_preview_html(@discussion.initiator) %>
+      </div>
+    </div>
+  <% else %>
+    <div class="exercise-assignment">
+      <%= render partial: 'exercises/exercise_assignment', locals: {exercise: exercise} %>
+    </div>
+  <% end %>
+</details>