mumuki-laboratory 9.10.0 → 9.13.0

data/app/helpers/content_view_helper.rb

@@ -7,6 +7,14 @@ module ContentViewHelper
     content.name
   end
 
+  def show_content?(content)
+    current_access_mode.show_content?(content)
+  end
+
+  def show_content_element?
+    current_access_mode.show_content_element?
+  end
+
   private
 
   def content_type_number(content)

data/app/helpers/discussions_helper.rb

@@ -8,7 +8,7 @@ module DiscussionsHelper
   end
 
   def solve_discussions_link
-    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item'
+    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item' if current_access_mode.resolve_discussions_here?
   end
 
   def user_discussions_link

data/app/helpers/icons_helper.rb

@@ -50,6 +50,6 @@ module IconsHelper
   end
 
   def icon_for_read(read)
-    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope#{read ? '-open' : ''}")
+    tag.i(class: "fa#{read ? 'r' : 's'} fa-envelope#{read ? '-open' : ''}")
   end
 end

data/app/helpers/links_helper.rb

@@ -71,7 +71,11 @@ module LinksHelper
   end
 
   def faqs_enabled_here?
-    Organization.current.faqs.present?
+    current_access_mode.faqs_here?
+  end
+
+  def profile_enabled_here?
+    current_access_mode.profile_here?
   end
 
   private

data/app/helpers/menu_bar_helper.rb

@@ -1,7 +1,6 @@
 module MenuBarHelper
   def menu_bar_links
     [
-      menu_link_to_profile,
       menu_link_to_classroom,
       menu_link_to_bibliotheca,
       solve_discussions_link,
@@ -18,7 +17,7 @@ module MenuBarHelper
   end
 
   def menu_link_to_profile
-    menu_item('user', :my_account, user_path)
+    li_tag menu_item('user', :my_account, user_path)
   end
 
   def menu_link_to_classroom
@@ -36,11 +35,15 @@ module MenuBarHelper
   end
 
   def logout_menu_link
-    li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
+    li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for, organization: Organization.current))
   end
 
-  def menu_item(icon, name, url, translation_params = {})
-    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1', class: 'dropdown-item'
+  def menu_item(icon, name, url, css_class = nil, **translation_params)
+    menu_text_item(icon, t(name, translation_params), url, css_class)
+  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}"
   end
 
   def any_menu_bar_links?

data/app/helpers/notifications_helper.rb

@@ -0,0 +1,13 @@
+module NotificationsHelper
+  def background_for_notification(notification)
+    notification.read? ? '' : 'bg-light'
+  end
+
+  def notification_preview_item(icon, name, url, **translation_params)
+    menu_item icon, name, url, 'mu-notification-preview', **translation_params
+  end
+
+  def notification_text_preview_item(icon, text, url)
+    menu_text_item(icon, text, url, 'mu-notification-preview')
+  end
+end

data/app/helpers/overlapped_buttons_helper.rb

@@ -16,7 +16,8 @@ module OverlappedButtonsHelper
       {class: 'mu-content-toolbar-item mu-restart-guide',
        data: {confirm: t(:confirm_restart)}, method: :delete, 'data-bs-placement': 'top'})
 
-    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options
+    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options if show_content_element?
+
   end
 
   private

data/app/helpers/time_zone_helper.rb

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

data/app/helpers/user_menu_helper.rb

@@ -31,6 +31,10 @@ module UserMenuHelper
     user_menu_item t(:exams), exam_authorizations_user_path, 'exam_authorizations'
   end
 
+  def notifications_user_menu_link
+    user_menu_item t(:notifications), notifications_user_path, 'notifications'
+  end
+
   private
 
   def user_menu_item(label, path, active_on)

data/app/mailers/user_mailer.rb

@@ -1,6 +1,8 @@
 class UserMailer < ApplicationMailer
   include WithCertificateRender
 
+  helper :time_zone
+
   def welcome_email(user, organization)
     with_locale(user, organization) do
       organization_name = organization.display_name || t(:your_new_organization)
@@ -23,7 +25,15 @@ class UserMailer < ApplicationMailer
   def certificate(certificate)
     with_locale certificate.user, certificate.organization do
       attachments[certificate.filename] = pdf_for(certificate)
-      mail to: certificate.user.email, subject: certificate.description
+      mail to: certificate.user.email, subject: t(:certificate_available)
+    end
+  end
+
+  def notification(notification)
+    @notification = notification
+
+    with_locale(notification.user, notification.organization) do
+      build_email notification.custom_title || t("mailer.title.#{notification.subject}"), 'notification'
     end
   end
 

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

@@ -6,16 +6,25 @@
   <%= render partial: 'book/header' %>
 
   <% @book.next_lesson_for(current_user).try do |lesson| %>
-    <div class="actions">
-      <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
-        <%= t book_practice_key_for(current_user) %>
-      </a>
-    </div>
+    <% if show_content_element? %>
+      <div class="actions">
+        <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
+          <%= t book_practice_key_for(current_user) %>
+        </a>
+      </div>
+    <% else %>
+      <br>
+    <% end %>
   <% end %>
 
-  <h2><%= t(:chapters) %></h2>
+  <% if show_content?(@book) %>
+    <h2><%= t(:chapters) %></h2>
+  <% end %>
 
   <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+
+    <% next unless show_content?(it.topic) %>
+
     <div class="chapter-container">
       <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
         <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
@@ -24,7 +33,7 @@
         </div>
       </div>
 
-      <% unless enabled  %>
+      <% unless enabled %>
         <div class="text-center mu-lock">
           <i class="fas fa-lock fa-5x"></i>
           <p><%= t :locked_content %></p>

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

@@ -28,6 +28,7 @@
       <h3><%= t(:lessons) %></h3>
 
       <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
+        <% next unless show_content?(lesson.guide) %>
         <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
         <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
       <% end %>

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

@@ -1,5 +1,5 @@
 <%= form_for [@discussion, Message.new] do |f| %>
-  <%= render layout: 'discussions/message_container', locals: {user: user} do %>
+  <%= render layout: 'discussions/message_container', locals: { user: user } do %>
     <div class="discussion-message-bubble">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">

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

@@ -4,7 +4,7 @@
 
 <div>
   <div class="discussion-context">
-    <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
+    <%= render partial: 'exercises/read_only', locals: { exercise: @debatable } %>
   </div>
 </div>
 
@@ -13,7 +13,7 @@
 
   <div class="d-flex flex-wrap">
     <h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
-    <% if current_user && @discussion.persisted? %>
+    <% 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">
@@ -40,10 +40,10 @@
   <% if @discussion.has_messages? %>
     <div class="discussion-messages">
       <% if @discussion.description.present? %>
-        <%= render partial: 'discussions/description_message', locals: {discussion: @discussion} %>
+        <%= render partial: 'discussions/description_message', locals: { discussion: @discussion } %>
       <% end %>
       <% @discussion.visible_messages.each do |message| %>
-          <%= render partial: 'discussions/message', locals: {user: message.sender_user, message: message} %>
+        <%= render partial: 'discussions/message', locals: { user: message.sender_user, message: message } %>
       <% end %>
       <% if @discussion.commentable_by?(current_user) %>
         <hr class="message-divider">
@@ -51,7 +51,7 @@
     </div>
   <% end %>
 
-  <%= render partial: 'discussions/new_message', locals: {user: current_user} if @discussion.commentable_by?(current_user) %>
+  <%= render partial: 'discussions/new_message', locals: { user: current_user } if @discussion.commentable_by?(current_user) && current_access_mode.show_discussion_element? %>
 
 <% end %>
 

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

@@ -13,7 +13,7 @@
     <% unless assignment.manual_evaluation_comment? %>
       <%= render layout: 'exercise_solutions/assistant_rules_box', locals: {assignment: assignment } do %>
         <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
-        <% if should_render_need_help_dropdown?(assignment) %>
+        <% if should_render_need_help_dropdown?(assignment) && current_access_mode.show_discussion_element? %>
           <div class="notify-problem-box">
             <div class="dropdown">
               <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-bs-toggle': 'dropdown'} %>

data/app/views/guides/_guide.html.erb

@@ -28,7 +28,7 @@
   </div>
 <% end %>
 
-<% if !@stats.try(:done?) && @next_exercise %>
+<% if !@stats.try(:done?) && @next_exercise && show_content_element? %>
   <div class="text-box">
     <div class="actions">
       <%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-complementary' %>
@@ -36,7 +36,7 @@
   </div>
 <% end %>
 
-<% if @stats&.done? %>
+<% if @stats&.done? && show_content_element? %>
   <div class="text-box">
     <div class="actions">
       <%= next_lesson_button @guide %>

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

@@ -1,6 +1,7 @@
 <div class="progress-list-flex">
   <% assignments = guide.assignments_for(current_user) %>
   <% assignments.each do |assignment| %>
+    <% next unless show_content?(assignment.exercise) %>
     <% exercise = assignment.exercise %>
     <a
       <%= turbolinks_enable_for exercise %>

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

@@ -1,5 +1,6 @@
 <ul class="progress-listing">
   <% guide.assignments_for(current_user).each do |assignment| %>
+      <% next unless show_content?(assignment.exercise) %>
       <% cache [assignment.exercise, assignment.status, Organization.current.name, current_user?] do %>
           <li <%= turbolinks_enable_for(assignment.exercise) %>>
             <%= assignment_status_icon assignment %>

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

@@ -4,6 +4,7 @@
       <%= user_menu_header %>
       <div class="mu-user-menu-items mu-hidden-sm-screen">
         <%= profile_user_menu_link %>
+        <%= notifications_user_menu_link %>
         <%= user_menu_divider %>
         <%= messages_user_menu_link %>
         <%= discussions_user_menu_link %>

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

@@ -20,6 +20,10 @@
                 <%= profile_picture_for current_user %>
               </div>
               <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
+                <% if profile_enabled_here? %>
+                  <%= menu_link_to_profile %>
+                  <li class="dropdown-divider"></li>
+                <% end %>
                 <%= menu_bar_list_items %>
                 <% if any_menu_bar_links? %>
                   <li class="dropdown-divider"></li>

data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb

@@ -4,7 +4,7 @@
   <%= render_exercise_input_editor f, exercise %>
 
   <div class="actions mu-submit-button mu-kids-submit-button">
-    <%= render_submit_button(@assignment) %>
+    <%= render_submit_button(@assignment) if current_access_mode.submit_solutions_here? %>
   </div>
   <div class="actions mu-kids-reset-button"></div>
   <img class="mu-kids-compass-rose" src="/compass_rose.svg">

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -34,11 +34,15 @@
                  remote: true,
                  html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap mu-form #{pending_messages_filter(@assignment)}"}) do |f| %>
       <div class="mb-3">
-        <%= render_exercise_input_editor f, exercise %>
+        <% if current_access_mode.submit_solutions_here? %>
+          <%= render_exercise_input_editor f, exercise %>
+        <% else %>
+          <%= render_exercise_read_only_editor exercise, @assignment.solution %>
+        <% end %>
       </div>
 
       <div class="actions mu-submit-button">
-        <%= render_submit_button(@assignment) %>
+        <%= render_submit_button(@assignment) if current_access_mode.submit_solutions_here? %>
       </div>
     <% end %>
   </div>

data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb

@@ -1,3 +1,3 @@
 <div>
-  <%= read_only_editor content, exercise.language.name %>
+  <%= read_only_editor content, exercise.language.highlight_mode %>
 </div>

data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb

@@ -4,10 +4,10 @@
 
   <div class="editor-files">
     <span class="files-tabs">
-      <ul class="nav nav-tabs">
+      <ul class="nav nav-tabs" role="tablist">
         <% files.each_with_index do |file, index| %>
-          <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-bs-target="#editor-file-<%= index %>" tabindex='0' data-bs-toggle='tab'>
-            <a class="file-name" href="#"><%= file.name %></a>
+          <li role="presentation" class="nav-item file-tab">
+            <a class="file-name nav-link <%= 'active' if index == 0 %>" href="#" data-bs-target="#editor-file-<%= index %>" tabindex="0" data-bs-toggle="tab"><%= file.name %></a>
           </li>
         <% end %>
       </ul>
@@ -17,7 +17,7 @@
 
     <div class="tab-content">
       <% files.each_with_index do |file, index| %>
-        <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
+        <div role="tabpanel" class="file-editor tab-pane mu-input-panel fade <%= 'show active' if index == 0 %>" id="editor-file-<%= index %>">
           <div class=<%="content[#{file.name}]"%>>
             <%= read_only_editor file.content, file.highlight_mode %>
           </div>

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

@@ -244,7 +244,7 @@
     @section Body Text
     */
     .bodyContainer .muMailTextContent,.bodyContainer .muMailTextContent p{
-      /*@editable*/color:#808080;
+      /*@editable*/color:#616060;
       /*@editable*/font-family:Helvetica;
       /*@editable*/font-size:16px;
       /*@editable*/line-height:150%;
@@ -309,6 +309,12 @@
       /*@editable*/font-weight:normal;
       /*@editable*/text-decoration:underline;
     }
+
+    .mu-stealth-link {
+      text-decoration: none !important;
+      color: unset !important;
+    }
+
     @media only screen and (min-width:768px){
       .templateContainer{
         width:600px !important;

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

@@ -0,0 +1 @@
+<%= notification.custom_content_plain_text %>

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

@@ -4,9 +4,9 @@
     <span class="badge badge-notifications"><%= notifications_count %></span>
   </div>
   <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-end" aria-labelledby="notificationsDropdown">
-    <% notifications.each do |it| %>
+    <% user_notifications.each do |it| %>
       <li>
-        <%= notification_preview_for it.target %>
+        <%= notification_preview_for it %>
       </li>
     <% end %>
   </ul>

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

@@ -0,0 +1,2 @@
+<% target = notification.target %>
+<%= link_to t(:exam_authorization_request_updated, description: target.exam_registration.description), notification.organization.url_for('/user/exam_authorizations'), class: 'mu-stealth-link' %>

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

@@ -1 +1,2 @@
-<%= menu_item :book_open, :exam_registration_open, url_for(target), { description: target.description } %>
+<% target = notification.target %>
+<%= link_to t(:exam_registration_open, description: target.description), exam_registration_url(notification.organization, target), class: 'mu-stealth-link' %>

data/app/views/notifications/previews/_custom.html.erb

@@ -0,0 +1 @@
+<%= notification_text_preview_item :envelope, notification.custom_title, notification.organization.url_for('/user/notifications') %>

data/app/views/notifications/previews/_discussion.html.erb

@@ -0,0 +1,2 @@
+<% target = notification.target %>
+<%= notification_preview_item :comments, :new_discussion_message, url_for([target.item, target]), { title: target.item.name.truncate_words(3) } %>

data/app/views/notifications/previews/_exam_authorization_request_updated.html.erb

@@ -0,0 +1,2 @@
+<% target = notification.target %>
+<%= notification_preview_item :book_open, :exam_authorization_request_updated, exam_authorizations_user_path(notification.organization), { description: target.exam_registration.description } %>