mumuki-laboratory 9.1.1 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e07e5d159d6e1e49fd972414dc27da7a622885670bd3d4a60695682bd9cdc4
-  data.tar.gz: de76a5fe5a591b7aa2783f83ae0a50e15796ae5ba7cf1852a7bd5896c2f7950f
+  metadata.gz: 72cf517c032d4c5173d14f33d52060ad7f2ee504beeed5425ebb91a4e3591359
+  data.tar.gz: b74980c8331ac7dd02f6e56ba249cb1e7c8a788eecb2e7a88c7b263451069d8c
 SHA512:
-  metadata.gz: 0e00878630e1bb812eafc6ca76e67b71e09a246d379de4c3f8ceca39b3d9cdaf216bc322859a0c90ae313a554dbe54c706742296e9d6a04421534485bced4604
-  data.tar.gz: e529d54a82cba3b40e6642a7f3d4fd4f4bbf211fcceab823b6b255a793df5258389901966319fda2506b28787507d61c4904f556f4ec0f8316bc77bade066eee
+  metadata.gz: a92eb701dfaf5fc7666c9e5193908c979018825e9d8a6926eb453ece500dc6431ad149eb43b1eae942e862e6eb8904e57052d3d235b5fb53d54ef0d3c0fe7c77
+  data.tar.gz: 023e52805e6213623bda1e6b9bc2e954b032880f7df6ece9c54e8a007c71740aeb5952b0e58365367405e0821d4739480518ac24267bd4839a32b9bb418d8af3

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

@@ -25,9 +25,9 @@ mumuki.faqs = class {
   _createNavbar() {
     const $faqsNavbar = $(".mu-faqs-navbar nav ul");
     $('.mu-faqs-group').each((_index, faqGroup) => {
-      const $navItem = this._createNavbarItem($faqsNavbar, faqGroup)
+      const $navItem = this._createNavbarItem($faqsNavbar, faqGroup);
       const $faqGroup = $(faqGroup);
-      this._configureClickFor($navItem, $faqGroup, $faqsNavbar)
+      this._configureClickFor($navItem, $faqGroup, $faqsNavbar);
     });
   }
 
@@ -56,12 +56,12 @@ mumuki.faqs = class {
   }
 
   _createFaqsIcons() {
-    const $faqIcon = $('<i class="mu-faqs-group-icon fa fa-plus">');
+    const $faqIcon = $('<i class="mu-faqs-group-icon fas fa-chevron-down">');
     $faqIcon.click(function(e){
       const $elem = $(this);
-      $elem.toggleClass('fa-plus fa-minus');
+      $elem.toggleClass('fa-chevron-down fa-chevron-up');
       $elem.closest('.mu-faqs-group').toggleClass('active');
-    })
+    });
     $('.mu-faqs-group').prepend($faqIcon);
   }
 
@@ -75,7 +75,7 @@ mumuki.faqs = class {
         newGroup = [];
       }
       newGroup.push(elem);
-      previousNodeName = elem.nodeName
+      previousNodeName = elem.nodeName;
     });
 
     elemsGroups.push(newGroup);

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

@@ -9,11 +9,10 @@ mumuki.load(function() {
   let avatarId = "";
   let avatarType = "";
 
-  let originalData = $userForm.serialize();
-  let originalProfilePicture = $userAvatar.attr('src');
+  toggleEditButtonIfRequiredFieldsNotCompleted();
 
   $userForm.on('change keyup', function() {
-    toggleEditButtonIfThereAreChanges();
+    toggleEditButtonIfRequiredFieldsNotCompleted();
   });
 
   $avatarItem.on('keypress click', function(e) {
@@ -25,26 +24,19 @@ mumuki.load(function() {
       const clickedAvatarType = $(this).attr('type');
       avatarId = clickedAvatarId || "";
       avatarType = clickedAvatarType || "";
-
-      toggleEditButtonIfThereAreChanges();
     });
   });
 
-  function toggleEditButtonIfThereAreChanges() {
-    let shouldEnable = requiredFieldsAreFilled() && (dataChanged() || avatarChanged());
-
-    $editButton.prop('disabled', !shouldEnable);
+  function toggleEditButtonIfRequiredFieldsNotCompleted() {
+    $editButton.prop('disabled', !requiredFieldsAreCompleted());
   }
 
-  const requiredFieldsAreFilled = () =>
-    $userForm.find('select, textarea, input').toArray().every(elem => {
+  function requiredFieldsAreCompleted() {
+    return $userForm.find('select, textarea, input').toArray().every(elem => {
       const $elem = $(elem);
       return !($elem.prop('required')) || !!$elem.val();
     });
-
-  const dataChanged = () => $userForm.serialize() !== originalData;
-
-  const avatarChanged = () => $userAvatar.attr('src') !== originalProfilePicture;
+  }
 
   $('#mu-user-image').on('keypress click', function(e){
     onClickOrSpacebarOrEnter($(this), e, function() {

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

@@ -22,34 +22,6 @@
 
 }
 
-.hamburguer-breadcrumb {
-  .hamburguer {
-    font-size: 2.5rem;
-    cursor: pointer;
-  }
-  li {
-    a {
-      padding: 15px;
-    }
-    &:first-child {
-      i {
-        &:before {
-          font-family: 'dev-awesome', serif;
-          content: "\f10b";
-        }
-        &:after {
-          font-family: 'Lato', serif;
-          content: "mumuki";
-          padding: 5px;
-        }
-      }
-    }
-    &:last-child {
-      display: none;
-    }
-  }
-}
-
 .mu-navbar-avatar {
   justify-self: flex-end;
   .rounded-circle {
@@ -61,4 +33,8 @@
   object-fit: contain;
   height: 38px;
   position: relative;
+
+  @include media-breakpoint-down(lg) {
+    max-width: 70vw;
+  }
 }

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

@@ -394,31 +394,6 @@ $moderator-badge-color: #dd9900;
   }
 }
 
-$statuses: (
-  closed: ($danger white $danger),
-  opened: (white #333333 #eaeaea),
-  solved: ($success white $success),
-  pending_review: ($success white $success)
-);
-
-@each $status, $style in $statuses {
-  $background-color: nth($style, 1);
-  $font-color: nth($style, 2);
-  $border-color: nth($style, 3);
-
-  .btn-discussion-#{$status} {
-    background-color: $background-color;
-    color: $font-color;
-    border-color: $border-color;
-    margin-left: 5px;
-    &:hover {
-      color: $font-color;
-      border-color: darken($border-color, 3%);
-      background-color: darken($background-color, 3%);
-    }
-  }
-}
-
 .discussion-requires-attention {
   margin-right: 20px;
   label {

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

@@ -8,7 +8,7 @@
 
     width: 100%;
 
-    @media (min-width: 768px) {
+    @include media-breakpoint-up(md) {
       width: 75%;
       float: right;
     }
@@ -17,8 +17,9 @@
       padding: 32px;
       box-shadow: 0 0.375em 2.8125em 0 #d2d5d9;
       margin-bottom: 32px;
+      word-wrap: anywhere;
 
-      @media (max-width: 767px) {
+      @include media-breakpoint-down(md) {
         &:not(.active) {
           h3, p {
             display: none
@@ -44,7 +45,7 @@
         margin-top: 10px;
         cursor: pointer;
         display: none;
-        @media (max-width: 767px) {
+        @include media-breakpoint-down(md) {
           display: unset;
         }
       }

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

@@ -195,7 +195,6 @@ $kids-speech-tabs-width: 40px;
       .mu-kids-next-speech {
         position: absolute;
         right: $kids-speech-tabs-width;
-        font-size: 90%;
         color: darken($mu-color-disabled, 25%);
         &:hover {
           cursor: pointer;

data/app/controllers/concerns/organizations_controller_template.rb

@@ -26,6 +26,7 @@ module OrganizationsControllerTemplate
       .require(:organization)
       .permit(:book,
               :name,
+              :faqs,
               *Mumuki::Domain::Organization::Profile.attributes,
               *Mumuki::Domain::Organization::Theme.attributes,
               *(Mumuki::Domain::Organization::Settings.attributes - [:login_methods]),

data/app/controllers/exam_authorization_requests_controller.rb

@@ -1,13 +1,9 @@
 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
+    redirect_to root_path
   end
 
   def update

data/app/controllers/users_controller.rb

@@ -38,6 +38,10 @@ class UsersController < ApplicationController
     @certificates ||= current_user.certificates_in_organization
   end
 
+  def exam_authorizations
+    @exam_authorization_requests ||= ExamAuthorizationRequest.where(user: current_user, organization: Organization.current)
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!

data/app/helpers/discussions_helper.rb

@@ -83,10 +83,14 @@ module DiscussionsHelper
   def discussion_update_status_button(status)
     button_to t("to_#{status}"),
               item_discussion_path(@discussion, {status: status}),
-              class: "btn btn-discussion-#{status}",
+              class: "btn btn-#{btn_type_for_discussion_statuses[status.to_sym]}",
               method: :put
   end
 
+  def btn_type_for_discussion_statuses
+    { closed: 'danger', solved: 'success', opened: 'light' }
+  end
+
   def new_discussion_link(teaser_text, link_text)
     %Q{
       <h4>
@@ -173,7 +177,7 @@ module DiscussionsHelper
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.visible_messages.size)}"
+    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:reply_count, count: discussion.visible_messages.size)}"
   end
 
   def discussion_filter_params_without_page
@@ -188,6 +192,10 @@ module DiscussionsHelper
     user.abbreviated_name
   end
 
+  def linked_discussion_user_name(user)
+    content_tag :a, discussion_user_name(user)
+  end
+
   def subscription_icon
     fa_icon :bell, text: t(:subscribe)
   end

data/app/helpers/profile_helper.rb

@@ -8,6 +8,6 @@ module ProfileHelper
   end
 
   def save_edit_profile_button(form)
-    form.submit t(:save), disabled: true, class: 'btn btn-complementary mu-edit-profile-btn'
+    form.submit t(:save), class: 'btn btn-complementary mu-edit-profile-btn'
   end
 end

data/app/helpers/user_menu_helper.rb

@@ -27,6 +27,10 @@ module UserMenuHelper
     user_menu_item t(:certificates), certificates_user_path, 'certificates'
   end
 
+  def exam_authorizations_user_menu_link
+    user_menu_item t(:exams), exam_authorizations_user_path, 'exam_authorizations'
+  end
+
   private
 
   def user_menu_item(label, path, active_on)

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

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

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

@@ -2,7 +2,7 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= discussion_user_name user %>
+        <%= linked_discussion_user_name user %>
         <% if user.moderator_here? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>

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

@@ -3,7 +3,7 @@
     <div class="discussion-message-bubble">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">
-          <%= user.name %>
+          <%= discussion_user_name user %>
         </div>
       </div>
       <div class="discussion-message-bubble-content">

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

@@ -15,7 +15,7 @@
     <div class="discussion-message-bubble" id="new-discussion-description-container">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">
-          <%= @discussion.initiator.name %>
+          <%= discussion_user_name @discussion.initiator %>
         </div>
       </div>
       <div class="discussion-message-bubble-content">

data/app/views/exam_authorization_requests/_approved.html.erb

@@ -0,0 +1 @@
+<%= t :exam_authorization_request_approved_html, date: l(authorization_request.exam.start_time, format: :long) %>

data/app/views/exam_authorization_requests/_pending.html.erb

@@ -0,0 +1,4 @@
+<%= t :exam_authorization_pending_explanation_html,
+      date: l(authorization_request.exam.start_time, format: :long),
+      end_time: l(authorization_request.exam_registration.end_time, format: :long),
+      edit_path: url_for(authorization_request.exam_registration) %>

data/app/views/exam_authorization_requests/_rejected.html.erb

@@ -0,0 +1 @@
+<%= t :exam_authorization_request_rejected %>

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

@@ -11,7 +11,7 @@
 </div>
 
 <div class="row">
-  <div class="mu-inline-block-left">
+  <div class="col-lg-12">
     <div class="bs-callout bs-callout-info">
       <h4 class="text-info">
         <strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>

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

@@ -26,15 +26,15 @@
             <%= label_for_contextualization(@discussion, class: 'd-none d-sm-inline') %> ·
             <span class="discussion-info">
               <span class="discussion-initiator-name">
-                <%= @discussion.initiator.name %>
+                <%= discussion_user_name @discussion.initiator %>
               </span>
-              <span class="d-none d-sm-inline"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
+              <span><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
             </span>
           </div>
           <% if @discussion.last_moderator_access_visible_for?(current_user) %>
             <h5 class="my-2 me-3">
               <span class="badge bg-primary text-wrap">
-                <%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %>
+                <%= t :last_seen, name: discussion_user_name(@discussion.last_moderator_access_by) %>
                 <%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %>
               </span>
             </h5>

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

@@ -9,7 +9,7 @@
     <div class="mu-faqs-content">
       <%= @faqs %>
     </div>
-    <div class="mu-faqs-navbar hidden-xs">
+    <div class="mu-faqs-navbar d-none d-md-block">
       <nav>
         <ul>
         </ul>

data/app/views/layouts/_kids.html.erb

@@ -12,8 +12,8 @@
       </ul>
   <% end %>
   <div class="mu-kids-character-speech-bubble-normal">
-    <i class="mu-kids-prev-speech fas fa-fw fa-caret-up"></i>
-    <i class="mu-kids-next-speech fas fa-fw fa-caret-down"></i>
+    <i class="mu-kids-prev-speech fas fa-fw fa-lg fa-caret-up"></i>
+    <i class="mu-kids-next-speech fas fa-fw fa-lg fa-caret-down"></i>
     <div class="description"><%= exercise.description_task %></div>
     <div class="hint"><%= exercise.hint_html %></div>
   </div>

data/app/views/layouts/_test_results.html.erb

@@ -23,7 +23,7 @@
           </span>
         <% end %>
 
-        <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
+        <div class="example-result collapse <%= 'show' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
           <%= contextualization.test_result_html test_result %>
         </div>
       </li>

data/app/views/layouts/_user_menu.html.erb

@@ -10,6 +10,7 @@
         <%= user_menu_divider %>
         <%= activity_user_menu_link %>
         <%= certificates_user_menu_link %>
+        <%= exam_authorizations_user_menu_link %>
       </div>
     </div>
     <div class="mu-user-menu-divider vertical d-none d-md-block"></div>

data/app/views/layouts/application.html.erb

@@ -3,7 +3,7 @@
   <div class="<%= exercise_container_type %> px-0">
     <nav class="navbar navbar-light navbar-expand-lg mu-navbar">
       <div class="container-fluid">
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#muNavbar" aria-controls="muNavbar" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#muNavbar" aria-controls="muNavbar" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
         <div class="mu-navbar-avatar order-lg-2">

data/app/views/notifications/_exam_authorization_request.html.erb

@@ -1 +1 @@
-<%= menu_item :book_open, :exam_authorization_request_updated, url_for(target), { description: target.exam_registration.description } %>
+<%= menu_item :book_open, :exam_authorization_request_updated, exam_authorizations_user_path, { description: target.exam_registration.description } %>