mumuki-laboratory 8.3.0 → 9.0.0

data/app/controllers/discussions_messages_controller.rb

@@ -1,5 +1,4 @@
 class DiscussionsMessagesController < AjaxController
-  include WithAuthorization
   include WithUserDiscussionValidation
 
   before_action :set_discussion!, only: [:create, :destroy]

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

@@ -5,11 +5,6 @@ class UsersController < ApplicationController
   before_action :set_user!
   skip_before_action :validate_accepted_role_terms!
 
-  def show
-    @messages = current_user.messages.to_a
-    @watched_discussions = current_user.watched_discussions_in_organization
-  end
-
   def update
     current_user.update_and_notify! user_params
     current_user.accept_profile_terms!
@@ -27,6 +22,14 @@ class UsersController < ApplicationController
     @profile_terms ||= Term.profile_terms_for(current_user)
   end
 
+  def messages
+    @messages ||= current_user.messages_in_organization
+  end
+
+  def discussions
+    @watched_discussions = current_user.watched_discussions_in_organization
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!

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

@@ -41,6 +41,10 @@ module BreadcrumbsHelper
     discussion.friendly.truncate_words(4)
   end
 
+  def breadcrumbs_for_my_account
+    header_breadcrumbs + breadcrumb_list_item(t(:my_account), 'last')
+  end
+
   private
 
   def breadcrumbs_for_linkable(e, extra=nil, last='')

data/app/helpers/content_view_helper.rb

@@ -0,0 +1,19 @@
+module ContentViewHelper
+  def full_title_for(content)
+    "#{t(content_type_number(content), number: content.number)}: #{content.name}"
+  end
+
+  def short_title_for(content)
+    content.name
+  end
+
+  private
+
+  def content_type_number(content)
+    "#{content_type(content)}_number"
+  end
+
+  def content_type(content)
+    content.model_name.element
+  end
+end

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

data/app/helpers/links_helper.rb

@@ -26,7 +26,7 @@ module LinksHelper
     if current_user&.teacher_here? && item.teacher_info.present?
       %Q{
         <a
-          class="mu-content-toolbar-item mu-popover"
+          class="mu-popover"
           data-toggle="popover"
           data-html="true"
           title="#{t :teacher_info}"
@@ -80,7 +80,7 @@ module LinksHelper
     return unless current_user&.writer?
 
     url = yield
-    link_to fixed_fa_icon('pencil-alt'), url, class: "mu-content-toolbar-item", target: "_blank", title: t(:edit)
+    link_to fixed_fa_icon('pencil-alt'), url, target: "_blank", title: t(:edit)
   end
 
   def url_for_bibliotheca_guide(guide)

data/app/helpers/menu_bar_helper.rb

@@ -18,7 +18,7 @@ module MenuBarHelper
   end
 
   def link_to_profile
-    menu_item('user', :profile, user_path)
+    menu_item('user', :my_account, user_path)
   end
 
   def link_to_classroom
@@ -39,8 +39,8 @@ 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?

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/helpers/user_menu_helper.rb

@@ -0,0 +1,18 @@
+module UserMenuHelper
+  def profile_user_menu_link
+    user_menu_link t(:my_profile), user_path, 'show'
+  end
+
+  def messages_user_menu_link
+    user_menu_link t(:messages), messages_user_path, 'messages'
+  end
+
+  def discussions_user_menu_link
+    user_menu_link t(:discussions), discussions_user_path, 'discussions'
+  end
+
+  def user_menu_link(label, path, active_on)
+    link_klass = 'active' if action_name == active_on
+    link_to label, path, { class: link_klass }.compact
+  end
+end

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

@@ -2,33 +2,34 @@
   <%= breadcrumbs @chapter %>
 <% end %>
 
-<div class="chapter-description">
-  <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>
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1 class="hidden-xs"><%= full_title_for @chapter %></h1>
+    <h1 class="visible-xs"><%= short_title_for @chapter %></h1>
+
     <% if @chapter.monolesson? %>
-      <div class="mu-monolesson pull-left">
-        <%= render partial: 'layouts/guide_title_icons' %>
-      </div>
+      <%= render partial: 'guides/guide_title_icons' %>
     <% end %>
-  </h1>
-
-  <%= @chapter.description_html %>
-
+  </div>
+</div>
+<div class="row">
+  <div class="col-md-12">
+    <div class="text-box mu-chapter-description">
+      <%= @chapter.description_html %>
+    </div>
+  </div>
 </div>
 
 <% if @chapter.lessons.present? %>
   <% if @chapter.monolesson? %>
-    <div class="mu-monolesson">
-      <%= render partial: 'layouts/guide', locals: { subject: @monolesson } %>
-    </div>
+    <div> <%= render partial: 'guides/guide', locals: { subject: @monolesson } %> </div>
   <% else %>
     <div>
       <h3><%= t(:lessons) %></h3>
 
-      <% @chapter.lessons.each do |lesson| %>
+      <% @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: { exercises: lesson.exercises } %>
+        <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
       <% end %>
     </div>
   <% end %>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide_container", locals: { subject: @complement }%>
+<%= render partial: "guides/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>

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

@@ -0,0 +1,17 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @authorization_request %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :exam_registration_to, description: @authorization_request.exam_registration.description %>
+    </h1>
+  </div>
+</div>
+
+<% if @authorization_request.approved? %>
+  <%= t :exam_authorization_request_approved_html, date: l(@authorization_request.exam.start_time, format: :long) %>
+<% else %>
+  <%= t :exam_authorization_request_rejected %>
+<% end %>

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

@@ -0,0 +1,37 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @registration %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :exam_registration_to, description: @registration.description %>
+    </h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <div class="bs-callout bs-callout-info">
+      <h4 class="text-info">
+        <strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>
+      </h4>
+      <p>
+        <%= t :exam_registration_explanation_html, date: l(@registration.end_time, format: :long) %>
+      </p>
+    </div>
+    <%= form_for @authorization_request do |f| %>
+      <%= f.hidden_field :exam_registration_id, value: @registration.id %>
+      <div class="form-group">
+        <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
+        <% @registration.exams.each do |exam| %>
+          <div class="field radio complementary complementary-radio">
+            <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, checked: @authorization_request.exam_id == exam.id) %>
+            <%= label_tag exam.id, l(exam.start_time, format: :long) %>
+          </div>
+        <% end %>
+      </div>
+      <button class="btn btn-success"> <%= t :save %> </button>
+    <% end %>
+  </div>
+</div>