mumuki-laboratory 9.15.0 → 9.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67dd086ce64c96505cea38bf9fdf857f304acd8322d91e4c139e0a847e89ce46
-  data.tar.gz: 48b771a27f10a159b4b10e38e88cee08f4f032969fbe7a533d188dd4f50cc0b5
+  metadata.gz: 1ae29f9665d934e9d1a3ef71a67074980155c36eabd6dc0ee5d66ddcc7c6cea3
+  data.tar.gz: 5a9158cd4bec4155c1890241f2dab4d87889c87d0b9143d572bc63cc4e925f99
 SHA512:
-  metadata.gz: a28dd46787bfb3b9fb50ab7ae7b6d1421e8abb5ec9b0f4f9c20bc4af62da0a5343c6a0973ebad6073af95f66178c49d0f4cccac36f11e1ce6245a23e4527143c
-  data.tar.gz: 3ba41f5eee2cdd908ecedbe5694de3738715f99a2c3e6c6e17d0049d2224f74be08fbbcf72b4910a4e4a7c440e05e2b87130466055919ba1b0b704d15ed29688
+  metadata.gz: 9cafbd64b3e29e4005bb51c3da4a3e45a7532295a34e4e7727185af580544ca9ff614f0c7b15496f9a043e6dd9c8d3becc82282a9f4deb6cbfec6c3e09fa78ed
+  data.tar.gz: ecf6beb36af7772043cb3775523373b38db0cdbc58ebe316b9fd4239decf8610c9ea7200b1fc4954be83765a2f71a1d97e75621814c19dcccb5984a1ac4f17ec

data/app/assets/javascripts/mumuki_laboratory/application/csrf-token.js

@@ -1,12 +1,12 @@
 mumuki.CsrfToken =  (() => {
   class CsrfToken {
-    constructor() {
-      this.value = $('meta[name="csrf-token"]').attr('content');
+    get token() {
+      return $('meta[name="csrf-token"]').attr('content');
     }
+
     newRequest(data) {
-      var self = this;
-      data.beforeSend = function (xhr) {
-        xhr.setRequestHeader('X-CSRF-Token', self.value);
+      data.beforeSend = (xhr) => {
+        xhr.setRequestHeader('X-CSRF-Token', this.token);
       };
       return data;
     }

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

@@ -70,6 +70,7 @@ mumuki.load(() => {
     discussionMessageToggleApprove: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
+        elem.attr('data-bs-original-title', '');
       });
     },
     discussionMessageToggleNotActuallyAQuestion: function (url, elem) {

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

@@ -1,12 +1,20 @@
 (() => {
+  function shouldSkipChangesCheck() {
+    return mumuki.isKidsExercise() || mumuki.exercise.isReadOnly;
+  }
+
   function solutionChangedSinceLastSubmission() {
     return  mumuki.exercise.id &&
             mumuki.SubmissionsStore.getLastSubmissionAndResult(mumuki.exercise.id) &&
             !mumuki.SubmissionsStore.getSubmissionResultFor(mumuki.exercise.id, mumuki.editors.getSubmission());
   }
 
+  function shouldWarnOfChanges() {
+    return !shouldSkipChangesCheck() && solutionChangedSinceLastSubmission();
+  }
+
   window.addEventListener("beforeunload", (event) => {
-    if (solutionChangedSinceLastSubmission()) {
+    if (shouldWarnOfChanges()) {
       event.returnValue = 'unsaved_progress';
     } else {
       delete event['returnValue'];
@@ -14,7 +22,7 @@
   });
 
   window.addEventListener("turbolinks:before-visit", (event) => {
-    if (solutionChangedSinceLastSubmission() && !confirm(mumuki.I18n.t('unsaved_progress'))) event.preventDefault();
+    if (shouldWarnOfChanges() && !confirm(mumuki.I18n.t('unsaved_progress'))) event.preventDefault();
   });
 })();
 
@@ -66,6 +74,13 @@ mumuki.exercise = {
     return this._current;
   },
 
+  /**
+   * @type {Boolean?}
+   */
+  get isReadOnly() {
+    return $('#mu-exercise-read-only').val() === 'true';
+  },
+
   /**
    * Set global current exercise information
    */

data/app/controllers/ajax_controller.rb

@@ -9,6 +9,6 @@ class AjaxController < ApplicationController
   end
 
   def validate_organization_enabled!
-    Organization.current.validate_enabled!
+    Organization.current.validate_enabled! unless current_user&.teacher_here?
   end
 end

data/app/controllers/application_controller.rb

@@ -19,11 +19,11 @@ class ApplicationController < ActionController::Base
   before_action :set_time_zone!
 
   before_action :ensure_user_enabled!, if: :current_user?
-
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
-  before_action :validate_active_organization!
 
   before_action :authorize_if_private!
+  before_action :validate_active_organization!
+
   before_action :validate_user_profile!, if: :current_user?
   before_action :validate_accepted_role_terms!, if: :current_user?
   before_action :ensure_restore_progress!, if: :current_user?
@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base
   # ensures contents are accessible to current user
   def validate_accessible!
     return if current_user&.teacher_here?
-    accessible_subject.validate_accessible_for! current_user
+    accessible_subject&.validate_accessible_for! current_user
   end
 
   def validate_active_organization!

data/app/controllers/exam_authorization_requests_controller.rb

@@ -1,36 +1,41 @@
 class ExamAuthorizationRequestsController < ApplicationController
 
-  before_action :verify_registration_opened!, on: [:create, :update]
+  before_action :set_registration!
+  before_action :set_exam!
+  before_action :verify_registration_opened!
 
   def create
-    authorization_request = ExamAuthorizationRequest.find_or_create_by! create_authorization_request_params do |it|
-      it.assign_attributes authorization_request_params
-    end
-    current_user.read_notification! authorization_request.exam_registration
-    flash.notice = I18n.t :exam_authorization_request_created
-    redirect_to root_path
+    authorization_request = @registration.request_authorization! current_user, @exam
+    current_user.read_notification! @registration
+    flash.notice = friendly_flash_notice(:exam_authorization_request_created)
+    redirect_to exam_authorizations_user_path
   end
 
   def update
-    ExamAuthorizationRequest.update params[:id], authorization_request_params
-    flash.notice = I18n.t :exam_authorization_request_saved
-    redirect_to root_path
+    @registration.update_authorization_request_by_id! params[:id], @exam
+    flash.notice = friendly_flash_notice(:exam_authorization_request_saved)
+    redirect_to exam_authorizations_user_path
   end
 
   private
 
-  def create_authorization_request_params
-    authorization_request_params.slice :exam_registration_id, :user, :organization
+  def friendly_flash_notice(key)
+    I18n.t key, friendly_date: helpers.local_time(@exam.start_time)
   end
 
   def authorization_request_params
-    params
-        .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
-        .merge(user: current_user, organization: Organization.current)
+    params.require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
+  end
+
+  def set_registration!
+    @registration = Organization.current.exam_registrations.find(authorization_request_params[:exam_registration_id])
+  end
+
+  def set_exam!
+    @exam = @registration.exams.find(authorization_request_params[:exam_id])
   end
 
   def verify_registration_opened!
-    exam_registration = ExamRegistration.find(authorization_request_params[:exam_registration_id])
-    raise Mumuki::Domain::GoneError if exam_registration.ended?
+    raise Mumuki::Domain::GoneError if @registration.ended?
   end
 end

data/app/controllers/exam_registrations_controller.rb

@@ -1,6 +1,6 @@
 class ExamRegistrationsController < ApplicationController
   def show
-    @registration = ExamRegistration.find(params[:id])
+    @registration = Organization.current.exam_registrations.find(params[:id])
     @authorization_request = @registration.authorization_request_for(current_user)
   end
 end

data/app/controllers/exercises_controller.rb

@@ -6,7 +6,6 @@ class ExercisesController < ApplicationController
 
   before_action :set_guide!, only: :show
   before_action :set_assignment!, only: :show, if: :current_user?
-  before_action :validate_accessible!, only: :show
   before_action :start!, only: :show
 
   def show

data/app/helpers/discussions_helper.rb

@@ -184,7 +184,10 @@ module DiscussionsHelper
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:reply_count, count: discussion.visible_messages.size)}"
+    <<~HTML.html_safe
+      <span>#{friendly_time(discussion.created_at, :time_since)}</span>
+      <span> · #{t(:reply_count, count: discussion.visible_messages.size)}</span>
+    HTML
   end
 
   def discussion_filter_params_without_page

data/app/helpers/editor_helper.rb

@@ -8,7 +8,7 @@ module EditorHelper
 
   def read_only_editor(content, language, options = {})
     editor_options = editor_defaults(language, options.deep_merge(data: { readonly: true }), 'editor')
-    text_area_tag :solution_content, content, editor_options
+    text_area_tag 'solution[content]', content, editor_options
   end
 
   def spell_checked_editor(name, options = {})

data/app/helpers/exams_helper.rb

@@ -0,0 +1,33 @@
+module ExamsHelper
+  def exam_information_for(user, exam)
+    %Q{
+      #{course_information_for(user, exam)}
+      #{date_information_for(exam)}
+      #{duration_information_for(exam)}
+    }.html_safe
+  end
+
+  private
+
+  def course_information_for(user, exam)
+    if user.teacher_here?
+      "#{fa_icon('graduation-cap', class: 'fa-fw',
+                 text: "<strong>#{t :course}:</strong> #{exam.course.canonical_code}".html_safe)}
+      <br>"
+    end
+  end
+
+  def date_information_for(exam)
+    "#{fa_icon('calendar-alt', class: 'fa-fw',
+               text: "<strong>#{t :date_and_time}:</strong> #{local_time_without_time_zone(exam.start_time)} - #{local_time(exam.end_time)}".html_safe)}
+    <br>"
+  end
+
+  def duration_information_for(exam)
+    if exam.duration?
+      "#{fa_icon(:stopwatch, class: 'fa-fw',
+                 text: "<strong>#{t :available_time}:</strong> #{t :time_in_minutes, time: exam.duration}".html_safe)}
+      <br>"
+    end
+  end
+end

data/app/helpers/exercise_input_helper.rb

@@ -35,10 +35,6 @@ module ExerciseInputHelper
     should_render_exercise_tabs?(exercise) { exercise.has_messages_for? user }
   end
 
-  def should_render_read_only_exercise_tabs?(discussion)
-    should_render_exercise_tabs?(discussion.exercise) { discussion.has_submission? }
-  end
-
   def should_render_message_input?(exercise, organization = Organization.current)
     exercise.is_a?(Problem) && !exercise.hidden? && organization.raise_hand_enabled?
   end

data/app/helpers/menu_bar_helper.rb

@@ -38,12 +38,13 @@ module MenuBarHelper
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for, organization: Organization.current))
   end
 
-  def menu_item(icon, name, url, css_class = nil, **translation_params)
-    menu_text_item(icon, t(name, translation_params), url, css_class)
+  def menu_item(icon, name, url, css_class = nil, translation_params = {}, options = {})
+    menu_text_item(icon, t(name, translation_params), url, css_class, **options)
   end
 
-  def menu_text_item(icon, text, url, css_class = nil)
-    link_to fixed_fa_icon(icon, text: text), url, role: 'menuitem', tabindex: '-1', class: "dropdown-item #{css_class}"
+  def menu_text_item(icon, text, url, css_class = nil, **options)
+    link_options = { role: 'menuitem', tabindex: '-1', class: "dropdown-item #{css_class}" }.merge(options)
+    link_to fixed_fa_icon(icon, text: text), url, link_options
   end
 
   def any_menu_bar_links?

data/app/helpers/notifications_helper.rb

@@ -4,7 +4,7 @@ module NotificationsHelper
   end
 
   def notification_preview_item(icon, name, url, **translation_params)
-    menu_item icon, name, url, 'mu-notification-preview', **translation_params
+    menu_item icon, name, url, 'mu-notification-preview', translation_params
   end
 
   def notification_text_preview_item(icon, text, url)

data/app/helpers/time_helper.rb

@@ -0,0 +1,12 @@
+module TimeHelper
+  def friendly_time(time, t_key = nil)
+    friendly_time = time_ago_in_words time
+    friendly_time_t = t_key ? t(t_key, time: friendly_time) : friendly_time
+
+    <<~HTML.html_safe
+      <time title="#{time}">
+        #{friendly_time_t}
+      </time>
+    HTML
+  end
+end

data/app/helpers/time_zone_helper.rb

@@ -1,5 +1,9 @@
 module TimeZoneHelper
   def local_time(time, time_zone = Time.zone.name)
-    "#{l(time.in_time_zone(time_zone), format: :long)} (#{time_zone})"
+    "#{local_time_without_time_zone(time, time_zone)} (#{time_zone})"
+  end
+
+  def local_time_without_time_zone(time, time_zone = Time.zone.name)
+    l(time.in_time_zone(time_zone), format: :long)
   end
 end

data/app/helpers/user_discussions_helper.rb

@@ -1,6 +1,6 @@
 module UserDiscussionsHelper
   def user_discussions_table_title(discussion, user, last_read)
-    %Q{
+    <<~HTML.html_safe
       <tr></tr>
       <thead>
         <tr>
@@ -9,30 +9,30 @@ module UserDiscussionsHelper
           </td>
         </tr>
       </thead>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_header
-    %Q{
+    <<~HTML.html_safe
       <tr class="fw-bold">
         <td></td>
         <td>#{t(:exercise)}</td>
         <td>#{t(:discussion_created_by)}</td>
         <td>#{t(:last_message)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 
   def user_discussions_table_item(discussion, user)
-    %Q{
+    <<~HTML.html_safe
       <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>
+        <td>#{friendly_time(discussion.last_message_date, :time_since)}</td>
       </tr>
-    }.html_safe
+    HTML
   end
 end

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

@@ -45,8 +45,10 @@
     <h2><%= t(:exams) %></h2>
     <% @exams.each_with_index do |it, index| %>
       <div class="chapter">
-        <h3> <%= index + 1 %>. <%= link_to_path_element it, mode: :plain %></h3>
-
+        <h3><%= link_to_path_element it, mode: :plain %></h3>
+        <div class="fs-7">
+          <%= exam_information_for(current_user, it) %>
+        </div>
         <div class="text-box">
           <%= it.guide.description_teaser_html %>
         </div>

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

@@ -0,0 +1 @@
+<%= render partial: 'discussions/basic_actions' %>

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

@@ -0,0 +1,20 @@
+<% if @discussion.can_toggle_responsible?(current_user) %>
+  <div class="discussion-responsible me-1">
+    <%= btn_toggle responsible_icon, not_responsible_icon, @discussion.any_responsible?, class: 'btn-sm',
+                   onclick: "mumuki.Forum.discussionResponsible('#{responsible_discussion_url(@discussion)}')" %>
+  </div>
+<% end %>
+
+<% if @discussion.subscribable? %>
+  <div class="discussion-subscription me-1">
+    <%= btn_toggle subscription_icon, unsubscription_icon, current_user.subscribed_to?(@discussion), class: 'btn-sm',
+                   onclick: "mumuki.Forum.discussionSubscription('#{subscription_discussion_url(@discussion)}')" %>
+  </div>
+<% end %>
+
+<% if @discussion.solved? %>
+  <div class="discussion-upvote">
+    <%= btn_toggle upvote_icon, undo_upvote_icon, current_user.upvoted?(@discussion), class: 'btn-sm',
+                   onclick: "mumuki.Forum.discussionUpvote('#{upvote_discussion_url(@discussion)}')" %>
+  </div>
+<% end %>

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

@@ -4,7 +4,7 @@
       <div class="discussion-message-bubble-title">
         <%= linked_discussion_user_name(discussion.initiator) %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
+          <%= friendly_time(discussion.created_at, :time_since) %>
         </span>
       </div>
     </div>

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

@@ -7,12 +7,16 @@
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
         <span class="message-date">
-          <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
+          <%= friendly_time(message.created_at, :time_since) %>
         </span>
         <span class="actions">
           <% if message.authorized?(current_user) && !message.deleted? %>
             <% if current_user&.moderator_here? %>
               <a class="discussion-message-approved <%= 'selected' if message.approved? %>"
+                 <% if message.approved? && current_user&.forum_supervisor_here? %>
+                   data-bs-toggle="tooltip" data-bs-placement="left"
+                   title="<%= t :approved_by, validator: message.approved_by.name, date: local_time(message.approved_at) %>"
+                 <% end %>
                  onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
                 <%= fa_icon(:check, class: 'fa-lg') %>
               </a>
@@ -47,7 +51,7 @@
           <% if current_user&.moderator_here? %>
             <hr>
             <%= t :deleted_by, deleter: message.deleted_by.name %>
-            <%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
+            <%= friendly_time(message.deleted_at, :time_since) %>
             <a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
               <%= t :show_message %>
             </a>

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

@@ -22,12 +22,18 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :description, '', {id: 'discussion-new-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
+              <%= spell_checked_editor 'discussion[description]',
+                                       { id: 'discussion-new-message', placeholder: t(:discussion_description_placeholder) } %>
             </div>
           </div>
         </div>
       </div>
     </div>
+    <% if faqs_enabled_here? %>
+      <div class="fs-7">
+        <%= fa_icon('exclamation-triangle', text: t(:only_forum_questions_on_forum, link: link_to_faqs).html_safe) %>
+      </div>
+    <% end %>
     <%= f.submit t(:publish_discussion), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
   <% end %>
 <% end %>

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

@@ -15,24 +15,7 @@
     <h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
     <% if current_user && @discussion.persisted? && current_access_mode.show_discussion_element? %>
       <span class="d-flex">
-        <% if @discussion.can_toggle_responsible?(current_user) %>
-          <div class="discussion-responsible me-1">
-            <%= btn_toggle responsible_icon, not_responsible_icon, @discussion.any_responsible?, class: 'btn-sm',
-                           onclick: "mumuki.Forum.discussionResponsible('#{responsible_discussion_url(@discussion)}')" %>
-          </div>
-        <% end %>
-        <% if @discussion.subscribable? %>
-          <div class="discussion-subscription me-1">
-            <%= btn_toggle subscription_icon, unsubscription_icon, current_user.subscribed_to?(@discussion), class: 'btn-sm',
-                           onclick: "mumuki.Forum.discussionSubscription('#{subscription_discussion_url(@discussion)}')" %>
-          </div>
-        <% end %>
-        <% if @discussion.solved? %>
-          <div class="discussion-upvote">
-            <%= btn_toggle upvote_icon, undo_upvote_icon, current_user.upvoted?(@discussion), class: 'btn-sm',
-                           onclick: "mumuki.Forum.discussionUpvote('#{upvote_discussion_url(@discussion)}')" %>
-          </div>
-        <% end %>
+        <%= render partial: 'discussions/actions' %>
       </span>
     <% end %>
   </div>

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

@@ -25,7 +25,7 @@
         <%= f.hidden_field :exam_registration_id, value: @registration.id %>
         <div class="mb-4">
           <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
-          <% @registration.exams.each do |exam| %>
+          <% @registration.available_exams.each do |exam| %>
             <div class="form-check">
               <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, class: 'form-check-input mu-read-only-input',
                                  checked: @authorization_request.exam_id == exam.id) %>

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

@@ -45,82 +45,76 @@
     <div class="accordion-body accordion-collapse collapse show" id="mu-discussion-accordion-body"
          aria-labelledby="#mu-discussion-accordion-header" data-bs-parent="#mu-discussion-accordion">
 
-      <% if should_render_read_only_exercise_tabs?(@discussion) %>
-        <ul class="nav nav-tabs discussion-tabs" role="tablist">
-          <li role="presentation">
-            <a class="editor-tab nav-link active" data-bs-target="#solution" aria-controls="solution" role="tab" data-bs-toggle="tab">
-              <%= t :solution %>
-            </a>
-          </li>
-          <li role="presentation">
-            <a class="editor-tab nav-link" data-bs-target="#results" aria-controls="results" role="tab" data-bs-toggle="tab">
-              <%= t :results %>
-            </a>
-          </li>
-          <li role="presentation">
-            <a class="editor-tab nav-link" data-bs-target="#content" aria-controls="content" role="tab" data-bs-toggle="tab">
-              <%= t :description %>
-            </a>
-          </li>
+      <ul class="nav nav-tabs discussion-tabs" role="tablist">
+        <li role="presentation">
+          <a class="editor-tab nav-link active" data-bs-target="#solution" aria-controls="solution" role="tab" data-bs-toggle="tab">
+            <%= t :solution %>
+          </a>
+        </li>
+        <li role="presentation">
+          <a class="editor-tab nav-link" data-bs-target="#results" aria-controls="results" role="tab" data-bs-toggle="tab">
+            <%= t :results %>
+          </a>
+        </li>
+        <li role="presentation">
+          <a class="editor-tab nav-link" data-bs-target="#content" aria-controls="content" role="tab" data-bs-toggle="tab">
+            <%= t :description %>
+          </a>
+        </li>
 
-          <% if exercise.extra_visible? %>
-            <%= extra_code_tab %>
-          <% end %>
+        <% if exercise.extra_visible? %>
+          <%= extra_code_tab %>
+        <% end %>
 
-          <% if exercise.queriable? %>
-            <%= console_tab %>
-          <% end %>
-        </ul>
+        <% if exercise.queriable? %>
+          <%= console_tab %>
+        <% end %>
+      </ul>
 
-        <div class="tab-content">
-          <div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="solution">
-            <div class="mu-tab-body">
-              <div class="mu-read-only-editor">
-                <%= render_exercise_read_only_editor exercise, @discussion.solution %>
-              </div>
+      <div class="tab-content">
+        <div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="solution">
+          <div class="mu-tab-body">
+            <div class="mu-read-only-editor">
+              <%= render_exercise_read_only_editor exercise, @discussion.solution %>
             </div>
           </div>
+        </div>
 
-          <div role="tabpanel" class="tab-pane fade" 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_body',
-                               locals: { contextualization: @discussion, guide_finished_by_solution: false } %>
-                  </div>
+        <div role="tabpanel" class="tab-pane fade" 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_body',
+                             locals: { contextualization: @discussion, guide_finished_by_solution: false } %>
                 </div>
-              <% end %>
-            </div>
-          </div>
-
-          <div role="tabpanel" class="tab-pane fade" id="content">
-            <div class="mu-tab-body">
-              <div class="exercise-assignment">
-                <%= render partial: 'exercises/exercise_assignment', locals: { exercise: exercise } %>
               </div>
-            </div>
+            <% end %>
           </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">
-                <%= restart_icon %>
-              </div>
+        <div role="tabpanel" class="tab-pane fade" 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 mu-elipsis" id="visible-extra">
-            <%= @discussion.extra_preview_html %>
+        <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">
+              <%= restart_icon %>
+            </div>
           </div>
         </div>
-      <% else %>
-        <div class="exercise-assignment">
-          <%= render partial: 'exercises/exercise_assignment', locals: { exercise: exercise } %>
+
+        <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
+          <%= @discussion.extra_preview_html %>
         </div>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>