mumuki-laboratory 8.2.1 → 8.6.1

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

@@ -1,17 +1,72 @@
+mumuki.upload = (() => {
+  class FileUploader {
+    constructor(file) {
+      this.file = file;
+    }
+
+    uploadFileIfValid() {
+      if (!this.file) return;
+
+      let maxFileSize = $('#mu-upload-input').attr("mu-upload-file-limit");
+      if (this.file.size > maxFileSize) {
+        return mumuki.upload.ui.showFileExceedsMaxSize();
+      }
+
+      mumuki.upload.ui.allowSubmissionFor(this.file.name);
+
+      const reader = new FileReader();
+      reader.onload = function (e) {
+        const contents = e.target.result;
+        $('#solution_content').html(contents);
+      };
+      reader.readAsText(this.file);
+
+      return reader;
+    }
+  }
+
+  class UI {
+    constructor() {
+      this.$uploadFileLimitExceeded = $('#mu-upload-file-limit-exceeded');
+      this.$uploadLabel = $('#mu-upload-label span');
+      this.$uploadLabelText = this.$uploadLabel.text();
+      this.$uploadIcon = $('#mu-upload-icon');
+      this.$btnSubmit = $('.btn-submit');
+    }
+
+    showFileExceedsMaxSize() {
+      this.$uploadFileLimitExceeded.removeClass('hidden');
+      this.$uploadLabel.text(this.$uploadLabelText);
+      this.$uploadIcon.addClass('fa-upload').removeClass('fa-file-alt');
+      this.$btnSubmit.addClass('disabled');
+    }
+
+    allowSubmissionFor(filename) {
+      this.$uploadFileLimitExceeded.addClass('hidden');
+      this.$uploadLabel.text(filename);
+      this.$uploadIcon.removeClass('fa-upload').addClass('fa-file-alt');
+      this.$btnSubmit.removeClass('disabled');
+    }
+  }
+
+  function _setUI() {
+    mumuki.upload.ui = new UI();
+  }
+
+  return {
+    FileUploader,
+    UI,
+
+    _setUI,
+
+    /** @type {UI} */
+    ui: null
+  };
+})();
+
 mumuki.load(() => {
-  $('#upload-input').change(function (evt) {
-    var file = evt.target.files[0];
-    if (!file) return;
-
-    var reader = new FileReader();
-    reader.onload = function (e) {
-      var contents = e.target.result;
-      $('#solution_content').html(contents);
-      $(evt.target).val("");
-      $('form.new_solution').submit();
-    };
-    reader.readAsText(file);
-    return false;
+  $('#mu-upload-input').change(function (evt) {
+    if (!mumuki.upload.ui) mumuki.upload._setUI();
+    return new mumuki.upload.FileUploader(evt.target.files[0]).uploadFileIfValid();
   });
 });
-

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/_content_show.scss

@@ -1,3 +1,3 @@
-.chapter-description p {
+.chapter-description {
   display: inline-block;
 }

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,6 +10,10 @@ $kids-speech-border: 1px solid $kids-speech-border-color;
 
 $kids-speech-tabs-width: 40px;
 
+.mu-kids-exercise-workspace.mu-submitless-exercise .mu-kids-submit-button {
+  display: none;
+}
+
 .mu-kids-exercise {
   height: $kids-height;
   min-height: $kids-height;

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/exercise_input_helper.rb

@@ -53,12 +53,11 @@ module ExerciseInputHelper
     waiting_text = t(options.waiting_t) if options.waiting_t.present?
     %Q{
       <div class="btn-submit-container">
-        <#{options.tag} for="#{options.for}"
-                       class="btn btn-success btn-block btn-submit #{options.classes}"
+        <button class="btn btn-success btn-block btn-submit #{options.classes}"
                        data-waiting="#{waiting_text}">
-          #{fa_icon options.fa_icon}
+          #{fa_icon 'play'}
           #{text} #{remaining_attempts_text(assignment)}
-       </#{options.tag}>
+       </button>
       </div>
     }.html_safe
   end
@@ -92,26 +91,18 @@ module ExerciseInputHelper
 
   def submit_button_options(exercise)
     if exercise.upload?
-      struct for: 'upload-input',
-             tag: :label,
+      struct classes: 'disabled',
              waiting_t: :uploading_solution,
-             fa_icon: :upload,
-             t: :upload_solution
+             t: :create_submission
     elsif exercise.hidden?
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :working,
-             fa_icon: :play,
              t: :continue_exercise
     elsif exercise.input_kids?
-      struct tag: :button,
-             classes: 'submission_control',
-             fa_icon: :play
+      struct classes: 'submission_control'
     else
-      struct tag: :button,
-             classes: 'submission_control',
+      struct classes: 'submission_control',
              waiting_t: :sending_solution,
-             fa_icon: :play,
              t: :create_submission
     end
   end

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