mumuki-laboratory 8.2.0 → 8.6.0

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

@@ -15,3 +15,4 @@ $da-font-path: asset-path('assets');
 @import "application/modules";
 @import "application/errors";
 @import "application/alerts";
+@import "application/codemirror-themes";

data/app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss

@@ -0,0 +1 @@
+@import "codemirror-themes/mu-light";

data/app/assets/stylesheets/mumuki_laboratory/application/codemirror-themes/_mu-light.scss

@@ -0,0 +1,3 @@
+.cm-s-mu-light .CodeMirror-code {
+  padding-right: 25px;
+}

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

@@ -5,7 +5,7 @@ $discussion-toolbar-color: #f6f6fa;
 $message-divider-color: #ecf0f1;
 $discussion-button-color: #fafafa;
 $toolbar-filter-color: #808080;
-$moderator-star-color: #dd9900;
+$moderator-badge-color: #dd9900;
 
 .discussions-list {
   margin: 30px 0;
@@ -177,8 +177,17 @@ $moderator-star-color: #dd9900;
   width: 100%;
 }
 
-.moderator-star {
-  color: $moderator-star-color;
+.moderator-badge {
+  position: relative;
+  top: -2px;
+  margin: 2px;
+  font-size: 12px;
+  text-transform: uppercase;
+  color: white;
+  background-color: $moderator-badge-color;
+  border: solid $moderator-badge-color 1px;
+  border-radius: 5px;
+  padding-inline: 5px;
 }
 
 .discussion-user-menu {
@@ -326,12 +335,15 @@ summary.discussion-summary {
       .actions {
         float: right;
         a {
-          margin-left: 5px;
+          margin-left: 20px;
           cursor: pointer;
         }
         .discussion-message-approved {
           text-decoration: none;
-          &.selected {
+          i {
+            transition: color 0.3s;
+          }
+          &:hover, &.selected {
             i {
               color: $brand-success;
             }
@@ -341,17 +353,20 @@ summary.discussion-summary {
           text-decoration: none;
           i {
             position: relative;
+            transition: color 0.3s;
             &:after {
               position: absolute;
-              left: 6px;
+              left: 10px;
+              top: -6px;
               content: ' ';
-              height: 19px;
+              height: 30px;
               width: 2px;
               transform: rotate(-45deg);
               background-color: #aaaaaa;
+              transition: background-color 0.3s;
             }
           }
-          &.selected {
+          &:hover, &.selected {
             i {
               color: $brand-primary;
               &:after {
@@ -360,6 +375,14 @@ summary.discussion-summary {
             }
           }
         }
+        .discussion-delete-message {
+          i {
+            transition: color 0.3s;
+            &:hover {
+              color: black;
+            }
+          }
+        }
         i {
           color: #aaaaaa
         }

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

@@ -10,9 +10,8 @@ $kids-speech-border: 1px solid $kids-speech-border-color;
 
 $kids-speech-tabs-width: 40px;
 
-.mu-exercise-content {
-  border-radius: 10px;
-  border: 1px solid #dddddd;
+.mu-kids-exercise-workspace.mu-submitless-exercise .mu-kids-submit-button {
+  display: none;
 }
 
 .mu-kids-exercise {

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

@@ -131,6 +131,7 @@ $capital-animation-width: 135px;
         'success': $mu-color-success,
         'warning': $mu-color-warning,
         'passed': $mu-color-success,
+        'passed_with_warnings': $mu-color-warning,
         'passed-with-warnings': $mu-color-warning,
         'failed': $mu-color-danger,
         'errored': $mu-color-broken,

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

@@ -15,11 +15,15 @@
   }
   .terms-card-header {
     cursor: pointer;
+    outline: 0;
     font-weight: bold;
     padding: .75rem 1.25rem;
     margin-bottom: 0;
     background-color: rgba(0,0,0,.03);
     border-bottom: 1px solid rgba(0,0,0,.125);
+    &::-webkit-details-marker {
+      display:none;
+    }
   }
   &:first-child .terms-card-header{
     border-radius: calc(.25rem - 1px) calc(.25rem - 1px) 0 0;

data/app/controllers/application_controller.rb

@@ -34,8 +34,8 @@ class ApplicationController < ActionController::Base
   helper_method :current_workspace,
                 :login_button,
                 :notifications_count,
-                :user_notifications_path,
                 :has_notifications?,
+                :notifications,
                 :subject,
                 :should_choose_organization?,
                 :current_immersive_organizations,

data/app/controllers/chapters_controller.rb

@@ -1,13 +1,17 @@
 require 'addressable/uri'
 
-class ChaptersController < ApplicationController
-  include Mumuki::Laboratory::Controllers::Content
+# It acts as a guide container in monolesson contexts
+class ChaptersController < GuideContainerController
   include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
-  def show
-  end
-
   def subject
     @chapter ||= Chapter.find_by(id: params[:id])
   end
+
+  private
+
+  def set_guide
+    @monolesson = subject.monolesson
+    @guide = @monolesson&.guide
+  end
 end

data/app/controllers/exam_authorization_requests_controller.rb

@@ -0,0 +1,26 @@
+class ExamAuthorizationRequestsController < ApplicationController
+  def show
+    @authorization_request = ExamAuthorizationRequest.find(params[:id])
+    current_user.read_notification! @authorization_request
+  end
+
+  def create
+    authorization_request = ExamAuthorizationRequest.create! authorization_request_params
+    current_user.read_notification! authorization_request.exam_registration
+    flash.notice = I18n.t :exam_authorization_request_created
+  end
+
+  def update
+    ExamAuthorizationRequest.update params[:id], authorization_request_params
+    flash.notice = I18n.t :exam_authorization_request_saved
+    redirect_to root_path
+  end
+
+  private
+
+  def authorization_request_params
+    params
+        .require(:exam_authorization_request).permit(:exam_id, :exam_registration_id)
+        .merge(user: current_user, organization: Organization.current)
+  end
+end

data/app/controllers/exam_registrations_controller.rb

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

data/app/controllers/guide_container_controller.rb

@@ -4,18 +4,13 @@ class GuideContainerController < ApplicationController
   before_action :set_guide
 
   def show
-    if current_user?
-      @stats = subject.stats_for(current_user)
-      @next_exercise = subject.next_exercise(current_user)
-    else
-      @next_exercise = subject.first_exercise
-    end
+    @stats = subject.stats_for(current_user)
+    @next_exercise = subject.next_exercise(current_user)
   end
 
   private
 
   def set_guide
-    raise Mumuki::Domain::NotFoundError if subject.nil?
     @guide = subject.guide
   end
 end

data/app/helpers/application_helper.rb

@@ -44,4 +44,8 @@ module ApplicationHelper
       <span class="#{'hidden' unless active} #{options[:class]}">#{active_text}</span>
     }.html_safe
   end
+
+  def notification_preview_for(target)
+    render "notifications/#{target.class.name.underscore}", { target: target }
+  end
 end

data/app/helpers/contextualization_result_helper.rb

@@ -16,14 +16,6 @@ module ContextualizationResultHelper
       :hidden_done
     elsif contextualization.exercise.choice?
       contextualization.solved? ? :correct_answer : :wrong_answer
-    else
-      contextualization_status_translation_key contextualization
-    end
-  end
-
-  def contextualization_status_translation_key(contextualization)
-    if contextualization.exercise.input_kindergarten?
-      "kindergarten_#{contextualization.submission_status}"
     else
       contextualization.submission_status
     end

data/app/helpers/discussions_helper.rb

@@ -52,6 +52,14 @@ module DiscussionsHelper
     profile_picture_for(user, class: image_class)
   end
 
+  def forum_terms_link
+    %Q{
+      <span>
+        #{ t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe }
+      </span>
+    }.html_safe
+  end
+
   def discussions_link_with_teaser(item)
     %Q{
       <div>

data/app/helpers/icons_helper.rb

@@ -7,9 +7,9 @@ module IconsHelper
     fa_icon name, options.merge(class: 'fa-fw fixed-icon')
   end
 
-  def exercise_status_icon(exercise)
-    link_to exercise_status_fa_icon(exercise),
-            exercise_path(exercise) if current_user?
+  def assignment_status_icon(assignment)
+    link_to contextualization_fa_icon(assignment),
+            exercise_path(assignment.exercise) if current_user?
   end
 
   def language_icon(language)
@@ -22,10 +22,6 @@ module IconsHelper
     fa_icon(*icon_for(contextualization))
   end
 
-  def exercise_status_fa_icon(exercise)
-    contextualization_fa_icon(exercise.assignment_for(current_user))
-  end
-
   def discussion_status_fa_icon(discussion)
     contextualization_fa_icon(discussion)
   end
@@ -35,10 +31,6 @@ module IconsHelper
     [iconized[:type], class: "text-#{iconized[:class]} status-icon"]
   end
 
-  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

data/app/helpers/menu_bar_helper.rb

@@ -39,7 +39,11 @@ module MenuBarHelper
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   end
 
-  def menu_item(icon, name, url)
-    link_to fixed_fa_icon(icon, text: t(name)), url, role: 'menuitem', tabindex: '-1'
+  def menu_item(icon, name, url, translation_params = {})
+    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1'
+  end
+
+  def any_menu_bar_links?
+    menu_bar_links.any?
   end
 end

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,10 +1,10 @@
 module OverlappedButtonsHelper
   def expand_icon
-    overlapped_button_icon :fullscreen, :expand, " (F11)"
+    overlapped_button_icon :fullscreen, :expand
   end
 
-  def restart_icon
-    overlapped_button_icon :restart, :undo
+  def restart_icon(data_placement='left')
+    overlapped_button_icon :restart, :undo, data_placement
   end
 
   def format_icon
@@ -12,10 +12,14 @@ module OverlappedButtonsHelper
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item mu-restart-guide', data: {confirm: t(:confirm_restart)}, method: :delete
+    link_to restart_icon('top'),
+            guide_progress_path(guide),
+            class: 'mu-content-toolbar-item mu-restart-guide',
+            data: {confirm: t(:confirm_restart)},
+            method: :delete
   end
 
-  def overlapped_button_icon(key, icon, extra_title='')
-    fa_icon(icon, title: t(key) + extra_title, class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': 'left')
+  def overlapped_button_icon(key, icon, data_placement='left')
+    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': data_placement)
   end
 end

data/app/helpers/progress_bar_helper.rb

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

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

@@ -10,7 +10,7 @@
 
 <div class="row">
   <div class="mu-inline-block-left">
-    <h1><%= @debatable.name %></h1>
+    <h1><%= t :forum %></h1>
   </div>
 </div>
 
@@ -21,3 +21,5 @@
     <%= render partial: 'layouts/discussions' %>
   <% end %>
 </div>
+
+<%= forum_terms_link %>

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

@@ -3,9 +3,14 @@
 <% end %>
 
 <div class="chapter-description">
-  <h1>
-    <span class="hidden-xs"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
-    <span><%= @chapter.name %></span>
+  <h1 class="pull-left">
+    <span class="hidden-xs pull-left"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
+    <span class="pull-left"><%= @chapter.name %></span>
+    <% if @chapter.monolesson? %>
+      <div class="mu-monolesson pull-left">
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </div>
+    <% end %>
   </h1>
 
   <%= @chapter.description_html %>
@@ -13,14 +18,21 @@
 </div>
 
 <% if @chapter.lessons.present? %>
-<div>
-  <h3><%= t(:lessons) %></h3>
+  <% if @chapter.monolesson? %>
+    <div class="mu-monolesson">
+      <%= render partial: 'layouts/guide', locals: { subject: @monolesson } %>
+    </div>
+  <% else %>
+    <div>
+      <h3><%= t(:lessons) %></h3>
 
-  <% @chapter.lessons.each do |lesson| %>
-    <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
-    <%= render partial: 'layouts/progress_listing', locals: {exercises: lesson.exercises} %>
+      <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
+        <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
+        <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
+      <% end %>
+    </div>
   <% end %>
-</div>
+
 <% end %>
 
 <% if @chapter.appendix.present? %>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @complement }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @complement }%>

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

@@ -3,29 +3,29 @@
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
         <%= user.name %>
+        <% if user.moderator_here? %>
+          <span class="moderator-badge"><%= t(:moderation) %></span>
+        <% end %>
         <span class="message-date">
           <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
         </span>
-        <% if user.moderator_here? %>
-          <%= fa_icon(:star, 'data-toggle': 'tooltip', title: (t :moderator), class: 'moderator-star') %>
-        <% end %>
         <span class="actions">
           <% if message.authorized? current_user %>
             <% if current_user&.moderator_here? %>
               <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') %>
+                <%= fa_icon(:check, class: 'fa-lg') %>
               </a>
               <% if message.from_initiator? %>
                 <a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>" onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
-                  <%= fa_icon('question-circle', type: 'regular', class: 'fa-xs') %>
+                  <%= fa_icon('question-circle', type: 'regular', class: 'fa-lg') %>
                 </a>
               <% end %>
             <% end %>
-            <%= link_to fa_icon('trash-alt', type: :regular), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
+            <%= link_to fa_icon('trash-alt', type: :regular, class: 'fa-lg'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) }, class: 'discussion-delete-message' %>
           <% end %>
           <% if should_show_approved_for?(current_user, message) %>
             <span class="discussion-message-approved selected">
-              <%= fa_icon(:check, class: 'fa-xs', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
+              <%= fa_icon(:check, class: 'fa-lg', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
             </span>
           <% end %>
         </span>