mumuki-laboratory 7.3.1 → 7.5.1

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

@@ -25,4 +25,7 @@
   .danger {
     background-color: $brand-danger;
   }
+  .info {
+    background-color: $brand-info;
+  }
 }

data/app/controllers/application_controller.rb

@@ -7,12 +7,14 @@ class ApplicationController < ActionController::Base
   include Mumukit::Login::AuthenticationHelpers
 
   include Mumuki::Laboratory::Controllers::Authorization
+  include Mumuki::Laboratory::Controllers::Disabling
   include Mumuki::Laboratory::Controllers::Notifications
   include Mumuki::Laboratory::Controllers::DynamicErrors
   include Mumuki::Laboratory::Controllers::EmbeddedMode
 
   before_action :set_current_organization!
   before_action :set_locale!
+  before_action :ensure_user_enabled!, if: :current_user?
   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?
@@ -62,6 +64,10 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def from_sessions?
+    params['controller'] == 'login'
+  end
+
   def login_settings
     Organization.current.login_settings
   end

data/app/controllers/concerns/users_controller_template.rb

@@ -6,16 +6,21 @@ module UsersControllerTemplate
     before_action :set_user!, only: [:show, :update]
     before_action :set_new_user!, only: :create
     before_action :protect_permissions_assignment!, only: [:create, :update]
+    after_action :verify_user_name!, only: :create
   end
 
   private
 
+  def verify_user_name!
+    @user.verify_name!
+  end
+
   def protect_permissions_assignment!
     current_user.protect_permissions_assignment! user_params[:permissions], @user.permissions_was
   end
 
   def permissible_params
-    super + [:email, :image_url, permissions: Mumukit::Auth::Roles::ROLES]
+    super + [:email, :image_url, :verified_first_name, :verified_last_name, permissions: Mumukit::Auth::Roles::ROLES]
   end
 
   def set_user!

data/app/helpers/application_helper.rb

@@ -7,7 +7,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.profile_picture, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
   end
 
   def paginate(object, options={})
@@ -39,7 +39,3 @@ module ApplicationHelper
     }.html_safe
   end
 end
-
-def sanitized(html)
-  Mumukit::ContentType::Sanitizer.sanitize html
-end

data/app/helpers/breadcrumbs_helper.rb

@@ -1,4 +1,6 @@
 module BreadcrumbsHelper
+  include DiscussionsHelper
+
   def breadcrumbs(e, extra=nil)
     breadcrumbs0(e.navigable_name, e, extra, 'last')
   end
@@ -28,6 +30,17 @@ module BreadcrumbsHelper
     breadcrumb_list_item link_to(e, link_path), clazz
   end
 
+  def breadcrumbs_for_discussion(discussion, e)
+    discussions_breadcrumb = breadcrumbs_for_linkable(e, link_to(t(:discussions), item_discussions_path(e)))
+    discussion_item = breadcrumb_list_item(breadcrumb_name_for(discussion), 'last')
+
+    discussions_breadcrumb + discussion_item
+  end
+
+  def breadcrumb_name_for(discussion)
+    discussion.friendly.truncate_words(4)
+  end
+
   private
 
   def breadcrumbs_for_linkable(e, extra=nil, last='')

data/app/helpers/contextualization_result_helper.rb

@@ -1,10 +1,6 @@
 module ContextualizationResultHelper
-  def humanized_expectation_result_item(expectation_result)
-    %Q{<li>#{status_icon(expectation_result[:result])} #{humanized_expectation_explanation expectation_result}</li>}.html_safe
-  end
-
-  def humanized_expectation_explanation(expectation_result)
-    sanitized Mumukit::ContentType::Markdown.to_html(expectation_result[:explanation], one_liner: true)
+  def render_affable_expectation_result(affable_expectation_result)
+    %Q{#{status_icon(affable_expectation_result[:result])} #{affable_expectation_result[:explanation]}}.html_safe
   end
 
   def render_feedback?(contextualization)
@@ -18,13 +14,17 @@ module ContextualizationResultHelper
   def contextualization_status(contextualization)
     if contextualization.exercise.hidden?
       :hidden_done
-    elsif contextualization.exercise.choices?
-      contextualization.passed? ? :correct_answer : :wrong_answer
+    elsif contextualization.exercise.choice?
+      contextualization.solved? ? :correct_answer : :wrong_answer
     else
       contextualization.submission_status
     end
   end
 
+  def render_test_result_header(test_result)
+    [test_result[:title].presence, test_result[:summary]].compact.join(': ').html_safe
+  end
+
   def render_test_results(contextualization)
     if contextualization.test_results.present?
       template = contextualization.result.present? ? 'layouts/mixed_results' : 'layouts/test_results'

data/app/helpers/discussions_helper.rb

@@ -48,7 +48,7 @@ module DiscussionsHelper
   end
 
   def user_avatar(user, image_class='')
-    image_tag user.image_url, height: 40, class: "img-circle #{image_class}"
+    image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
   end
 
   def discussions_link_with_teaser(item)
@@ -132,7 +132,7 @@ module DiscussionsHelper
 
   def discussion_status_filter(status, discussions_count)
     %Q{
-      #{status_fa_icon(status)}
+      #{discussion_status_fa_icon(status)}
       <span>
         #{t("#{status}_count", count: discussions_count)}
       </span>

data/app/helpers/exercise_input_helper.rb

@@ -44,7 +44,7 @@ module ExerciseInputHelper
   end
 
   def should_render_need_help_dropdown?(assignment, organization = Organization.current)
-    !assignment.passed? && organization.ask_for_help_enabled?(assignment.submitter)
+    !assignment.solved? && organization.ask_for_help_enabled?(assignment.submitter)
   end
 
   def render_submit_button(assignment)

data/app/helpers/icons_helper.rb

@@ -1,7 +1,6 @@
 module IconsHelper
-  #FIXME refactor names
   def status_icon(status_like)
-    fa_icon *icon_for_status(status_like.to_submission_status)
+    fa_icon *icon_for(status_like.to_submission_status)
   end
 
   def fixed_fa_icon(name, options={})
@@ -19,29 +18,41 @@ module IconsHelper
 
   private
 
-  def status_fa_icon(status)
-    fa_icon(*icon_for_status(status))
+  def contextualization_fa_icon(contextualization)
+    fa_icon(*icon_for(contextualization))
   end
 
   def exercise_status_fa_icon(exercise)
-    status_fa_icon(exercise.status_for(current_user))
+    contextualization_fa_icon(exercise.assignment_for(current_user))
   end
 
   def discussion_status_fa_icon(discussion)
-    status_fa_icon(discussion.status)
+    contextualization_fa_icon(discussion)
   end
 
-  def icon_for_status(s)
-    iconized = s.iconize
+  def icon_for(iconizable)
+    iconized = iconizable.iconize
     [iconized[:type], class: "text-#{iconized[:class]} status-icon"]
   end
 
-  def label_for_status(s)
-    iconized = s.iconize
+  def class_for_exercise(exercise)
+    icon_class_for(exercise.assignment_for(current_user))
+  end
+
+  def icon_class_for(iconizable)
+    iconizable.iconize[:class].to_s
+  end
+
+  def icon_type_for(iconizable)
+    iconizable.iconize[:type].to_s
+  end
+
+  def label_for_contextualization(contextualization)
+    iconized = contextualization.iconize
     %Q{
       <span class="text-#{iconized[:class]} status-label">
         #{fa_icon "#{iconized[:type]}"}
-        <span>#{t s}</span>
+        <span>#{t contextualization.visible_status}</span>
       </span>
     }.html_safe
   end

data/app/helpers/overlapped_buttons_helper.rb

@@ -0,0 +1,17 @@
+module OverlappedButtonsHelper
+  def restart_icon
+    overlapped_button_icon :restart, :undo
+  end
+
+  def format_icon
+    overlapped_button_icon :format, :indent
+  end
+
+  def restart_guide_link(guide)
+    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item', data: {confirm: t(:confirm_restart)}, method: :delete
+  end
+
+  def overlapped_button_icon(key, icon)
+    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key))
+  end
+end

data/app/helpers/progress_bar_helper.rb

@@ -1,5 +1,5 @@
 module ProgressBarHelper
-  include StatusHelper
+  include IconsHelper
 
   def class_for_progress_list_item(exercise, active)
     "progress-list-item text-center #{class_for_exercise(exercise)} #{active ? 'active' : ''}"

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

@@ -1,6 +1,5 @@
 <%= content_for :breadcrumbs do %>
-  <%= breadcrumbs_for_linkable @debatable, link_to(t(:discussions), item_discussions_path(@debatable))%>
-  <%= breadcrumb_list_item('last', @discussion.friendly.truncate_words(4)) %>
+  <%= breadcrumbs_for_discussion @discussion, @debatable %>
 <% end %>
 
 <div>
@@ -30,7 +29,7 @@
         </h3>
       </div>
       <div class="discussion-description">
-        <%= label_for_status(@discussion.status) %> ·
+        <%= label_for_contextualization(@discussion) %> ·
         <span class="discussion-info">
           <span class="discussion-initiator-name">
             <%= @discussion.initiator.name %>

data/app/views/exercise_solutions/{_contextualization_results.html.erb → _contextualization_results_body.html.erb}

@@ -1,5 +1,5 @@
-<% if contextualization.results_visible? %>
-  <div>
+<div>
+  <% unless contextualization.results_body_hidden? %>
     <%= render partial: 'exercise_solutions/expectations', locals: {assignment: contextualization} %>
     <% if render_feedback?(contextualization) %>
       <div class="results-item">
@@ -15,7 +15,5 @@
     <div id="results-section" class="<%= 'collapse' if render_feedback?(contextualization) %> results-item">
       <%= render_test_results contextualization %>
     </div>
-  </div>
-<% else %>
-  <div></div>
-<% end %>
+  <% end %>
+</div>

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

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

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

@@ -5,8 +5,8 @@
     <% end %>
 
     <ul class="results-list">
-      <% assignment.humanized_expectation_results.each do |it| %>
-        <%= humanized_expectation_result_item it %>
+      <% assignment.affable_expectation_results.each do |it| %>
+        <li><%= render_affable_expectation_result it %></li>
       <% end %>
     </ul>
   </div>

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.submission_status}" %>">
+<div class="<%= "mu-kids-callout-#{icon_class_for assignment}" %>">
   <%= manual_evaluation_comment assignment %>
 </div>
 

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-md-12">
     <div class="actions">
-      <% if assignment.passed? %>
+      <% if assignment.solved? %>
         <%= next_exercise_button(@exercise) || close_modal_button %>
       <% else %>
         <button class="btn btn-success btn-block submission-control" id="kids-btn-retry" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>

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

@@ -3,4 +3,3 @@
     <strong><%= t :out_of_attempts %></strong>
   </h4>
 </div>
-<%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

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

@@ -3,35 +3,42 @@
   @stats = @guide.stats_for(current_user)
 %>
 
-<%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
-  <%= manual_evaluation_comment assignment %>
-  <% unless assignment.manual_evaluation_comment? %>
-    <%= 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>
+<% if assignment.results_hidden? %>
+  <%= render partial: 'exercise_solutions/results_hidden', locals: {assignment: assignment} %>
+<% elsif !assignment.attempts_left? %>
+  <%= render partial: 'exercise_solutions/out_of_attempts', locals: {assignment: assignment} %>
+<% else %>
+  <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
+    <%= manual_evaluation_comment assignment %>
+    <% unless assignment.manual_evaluation_comment? %>
+      <%= render partial: 'exercise_solutions/contextualization_results_body', 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>
-      </div>
+      <% end %>
     <% end %>
+    <%= solution_download_link assignment %>
   <% end %>
-  <%= solution_download_link assignment %>
-<% end %>
 
-<% if assignment.passed? %>
-  <%= corollary_box @exercise %>
-<% else %>
-  <%= assistance_box assignment %>
+  <% if assignment.passed? %>
+    <%= corollary_box @exercise %>
+  <% else %>
+    <%= assistance_box assignment %>
+  <% end %>
 <% end %>
+
 <%= render partial: 'exercise_solutions/results_button', locals: {assignment: assignment} %>

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

@@ -0,0 +1,5 @@
+<div class="bs-callout bs-callout-info submission-result-pending">
+  <h4>
+    <strong><%= t :results_hidden %></strong>
+  </h4>
+</div>

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

@@ -1,3 +1,3 @@
-<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 class="text-<%= icon_class_for(contextualization) %>">
+  <strong><%= fa_icon icon_type_for(contextualization) %> <%= t_contextualization_status contextualization %></strong>
 </h4>

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

@@ -67,7 +67,7 @@
             <%= 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',
+                  <%= render partial: 'exercise_solutions/contextualization_results_body',
                              locals: {contextualization: @discussion, guide_finished_by_solution: false} %>
                 </div>
               </div>
@@ -94,7 +94,7 @@
         </div>
       </div>
 
-      <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+      <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
         <%= @discussion.extra_preview_html %>
       </div>
     </div>

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

@@ -9,23 +9,23 @@
 <% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
-    <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
 <% end %>
 
 <% unless @exercise.input_kids? %>
-    <div class="row">
-      <div class="mu-inline-block-right hidden-xs">
-        <h1><%= language_icon @exercise.language %></h1>
-      </div>
-      <div class="mu-inline-block-left">
-        <h1>
-          <span class="hidden-xs"><%= t(:exercise_number, number: @exercise.number) %>:&nbsp;</span>
-          <span><%= @exercise.name %></span>
-          <%= teacher_info_button @exercise %>
-          <%= link_to_bibliotheca_exercise @exercise %>
-        </h1>
-      </div>
+  <div class="row">
+    <div class="mu-inline-block-right hidden-xs">
+      <h1><%= language_icon @exercise.language %></h1>
     </div>
+    <div class="mu-inline-block-left">
+      <h1>
+        <span class="hidden-xs"><%= t(:exercise_number, number: @exercise.number) %>:&nbsp;</span>
+        <span><%= @exercise.name %></span>
+        <%= teacher_info_button @exercise %>
+        <%= link_to_bibliotheca_exercise @exercise %>
+      </h1>
+    </div>
+  </div>
 <% end %>
 
 <div>
@@ -54,6 +54,10 @@
 </div>
 
 <%= content_for :no_container do %>
-    <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
-    <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
+  <% if @assignment.skipped? %>
+    <%= render partial: 'layouts/exercise_skipped' %>
+  <% end %>
+
+  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
+  <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>