mumuki-laboratory 8.2.0 → 8.6.0

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

@@ -2,17 +2,22 @@
   <%= breadcrumbs(@debatable, t(:discussions)) %>
 <% end %>
 
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1><%= t :forum %></h1>
+  </div>
+</div>
 <div class="row">
   <% if @debatable.respond_to? :language %>
     <div class="mu-inline-block-right hidden-xs">
-      <h1><%= language_icon @debatable.language %></h1>
+      <h3><%= language_icon @debatable.language %></h3>
     </div>
   <% end %>
   <div class="mu-inline-block-left">
-    <h1>
+    <h3>
       <span class="hidden-xs"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
       <span><%= @debatable.name %></span>
-    </h1>
+    </h3>
   </div>
 </div>
 
@@ -23,7 +28,9 @@
   <%= new_discussion_link(:no_useful_result, :ask_a_question) %>
 <% end %>
 
-  <%= content_for :no_container do %>
+<%= content_for :no_container do %>
 <% end if current_user? %>
 
+<%= forum_terms_link %>
+
 

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>

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

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

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

@@ -6,7 +6,7 @@
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
+<% @stats = @exercise.stats_for(current_user) %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
@@ -65,6 +65,6 @@
     <%= render partial: 'layouts/modals/level_up' %>
   <% end %>
 
-  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
+  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} if @stats.almost_done? %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

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

@@ -84,7 +84,3 @@
 
   <% end %>
 </div>
-
-<span>
-  <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
-</span>

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

@@ -1,48 +1,19 @@
 <%= render_runner_assets @guide.language, :layout %>
 
-<%= content_for :breadcrumbs do %>
-  <%= breadcrumbs subject %>
-<% end %>
-
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% if subject.timed? && subject.started?(current_user) && !current_user.teacher? %>
+<% if subject.timed? && @stats.started? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
 <% end %>
 
-<div class="row">
-  <div class="mu-inline-block-right">
-    <h1><%= language_icon @guide.language %></h1>
-  </div>
-  <div class="mu-inline-block-left guide-header">
-    <h1 class="pull-left">
-      <span class="pull-left">
-        <%= subject.name %>
-      </span>
-      <% if current_user? && should_display_medal?(@guide, Organization.current) %>
-        <div class="pull-left">
-          <%= content_medal_for(@guide, current_user) %>
-        </div>
-      <% end %>
-      <%= teacher_info_button @guide%>
-      <%= link_to_bibliotheca_guide @guide %>
-    </h1>
-  </div>
-</div>
-<div class="row">
-  <div class="col-md-12">
-    <div class="text-box">
-      <%= @guide.description_html %>
-    </div>
-  </div>
-</div>
+<%= yield if block_given? %>
 
 <h3>
   <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
+  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
 </h3>
 
-<%= render partial: 'layouts/progress_listing', locals: {exercises: @guide.exercises} %>
+<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
 
 <% if @stats&.done? %>
   <div class="text-box">

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

@@ -0,0 +1,28 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs subject %>
+<% end %>
+
+<%= render layout: 'layouts/guide', locals: { subject: subject } do %>
+
+  <div class="row">
+    <div class="mu-inline-block-right">
+      <h1><%= language_icon @guide.language %></h1>
+    </div>
+    <div class="mu-inline-block-left guide-header">
+      <h1 class="pull-left">
+        <span class="pull-left">
+          <%= subject.name %>
+        </span>
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="text-box">
+        <%= @guide.description_html %>
+      </div>
+    </div>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="guide-title-icons pull-left">
+  <% if current_user? && should_display_medal?(@guide, Organization.current) %>
+    <div class="pull-left">
+      <%= content_medal_for(@guide, current_user) %>
+    </div>
+  <% end %>
+<%= teacher_info_button @guide %>
+<%= link_to_bibliotheca_guide @guide %>
+</div>

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

@@ -1,12 +1,14 @@
 <div class="progress-list-flex">
-  <% guide.exercises.each do |e| %>
+  <% assignments = guide.assignments_for(current_user) %>
+  <% assignments.each do |assignment| %>
+    <% exercise = assignment.exercise %>
     <a
-      <%= turbolinks_enable_for e %>
-      href="<%= exercise_path(e)%>"
-      aria-label="<%= e.navigable_name %>"
-      title="<%= e.navigable_name %>"
-      data-mu-exercise-id="<%= e.id %>"
-      class="<%= class_for_progress_list_item(e, e == actual)%>">
+      <%= turbolinks_enable_for exercise %>
+      href="<%= exercise_path(exercise)%>"
+      aria-label="<%= exercise.navigable_name %>"
+      title="<%= exercise.navigable_name %>"
+      data-mu-exercise-id="<%= exercise.id %>"
+      class="<%= class_for_progress_list_item(assignment, exercise == actual)%>">
     </a>
   <% end %>
 </div>

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

@@ -1,9 +1,9 @@
 <ul class="progress-listing">
-  <% exercises.each do |exercise| %>
-      <% cache [exercise, exercise.status_for(current_user), Organization.current] do %>
-          <li <%= turbolinks_enable_for(exercise) %>>
-            <%= exercise_status_icon exercise %>
-            <%= link_to_path_element(exercise) %>
+  <% guide.assignments_for(current_user).each do |assignment| %>
+      <% cache [assignment.exercise, assignment.status, Organization.current] do %>
+          <li <%= turbolinks_enable_for(assignment.exercise) %>>
+            <%= assignment_status_icon assignment %>
+            <%= link_to_path_element(assignment.exercise) %>
           </li>
       <% end %>
   <% end %>

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

@@ -1,4 +1,4 @@
-<a class="fab fa-facebook-f social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-instagram social-icon" aria-label="Instagram" href="https://www.instagram.com/mumukiorg" target="_blank"></a>
 <a class="fab fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-youtube social-icon" aria-label="Youtube" href="https://www.youtube.com/c/MumukiOrg" target="_blank"></a>
 <a class="fab fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-<a class="fab fa-linkedin-in social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>

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

@@ -25,12 +25,7 @@
               <span class="mu-level-number"></span>
             </div>
           <% end %>
-          <div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
-            <a href=<%= "#{user_notifications_path}" %>>
-              <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
-                <span class="badge badge-notifications"><%= notifications_count %></span>
-            </a>
-          </div>
+          <%= render partial: 'notifications/dropdown' %>
           <div class="dropdown mu-navbar-element">
             <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
@@ -38,7 +33,9 @@
             </div>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>
-              <li class="divider"></li>
+              <% if any_menu_bar_links? %>
+                <li class="divider"></li>
+              <% end %>
               <%= logout_link %>
             </ul>
           </div>

data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb

@@ -1,6 +1,6 @@
 <% content_for :no_container do %>
 
-  <div <%= turbolinks_enable_for exercise %>>
+  <div <%= turbolinks_enable_for exercise %> data-i18n-prefix="kindergarten">
 
     <div class="mu-kids-landscape-support container-fluid">
       <img class="mu-kids-character-animation"/>

data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb

@@ -8,7 +8,7 @@
       </button>
       <div class="modal-header">
         <h4 class="modal-title text-broken">
-          <strong><%= t :kindergarten_aborted %></strong>
+          <strong><%= t :aborted %></strong>
         </h4>
       </div>
       <div class="modal-body">

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

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

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

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

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

@@ -0,0 +1,13 @@
+<div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
+  <div id="notificationsDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
+    <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
+    <span class="badge badge-notifications"><%= notifications_count %></span>
+  </div>
+  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationsDropdown">
+    <% notifications.each do |it| %>
+      <li>
+        <%= notification_preview_for it.target %>
+      </li>
+    <% end %>
+  </ul>
+</div>

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

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

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

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

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

@@ -0,0 +1 @@
+<%= menu_item :envelope, :new_message_received, url_for(target.exercise), { sender: target.sender } %>

data/app/views/users/_term.html.erb

@@ -1,7 +1,7 @@
 <div class="terms-card">
   <details <%= 'open' unless collapsed %>>
     <summary class="terms-card-header">
-      <h4><%= term.header %></h4>
+      <h4 class="terms-card-title"><%= term.header %></h4>
     </summary>
     <div class="terms-card-body">
       <%= term.content_html %>

data/config/routes.rb

@@ -22,6 +22,9 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :exam_registrations, only: [:show]
+    resources :exam_authorization_requests, only: [:show, :create, :update]
+
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
       concerns :debatable, debatable_class: 'Chapter'

data/lib/mumuki/laboratory/controllers/notifications.rb

@@ -1,32 +1,13 @@
 module Mumuki::Laboratory::Controllers::Notifications
-
-  def user_notifications_path
-    user_path(anchor: current_notifications_tab)
-  end
-
   def has_notifications?
     notifications_count > 0
   end
 
   def notifications_count
-    messages_count + discussions_count
-  end
-
-  private
-
-  def current_notifications_tab
-    has_messages? ? 'messages' : 'discussions'
-  end
-
-  def has_messages?
-    messages_count > 0
-  end
-
-  def messages_count
-    current_user.try(:unread_messages).try(:count) || 0
+    notifications.size
   end
 
-  def discussions_count
-    current_user.try(:unread_discussions).try(:count) || 0
+  def notifications
+    current_user.try(:unread_notifications) || []
   end
 end

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -20,7 +20,8 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
                   .merge(
                     html: render_results(layout, assignment),
                     remaining_attempts_html: remaining_attempts_text(assignment),
-                    current_exp: UserStats.exp_for(assignment.submitter))
+                    current_exp: UserStats.exp_for(assignment.submitter),
+                    in_gamified_context: Organization.current.gamification_enabled?)
   end
 
   def merge_kids_specific_renders(assignment, results)

data/lib/mumuki/laboratory/locales/en.yml

@@ -11,20 +11,20 @@ en:
   actual_state: Obtained board
   age: Age
   all: All
-  appendix: "Appendix"
+  appendix: Appendix
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
   approved_message: Validated by mentor
-  are_you_sure: 'Are you sure you want to %{action}?'
+  are_you_sure: Are you sure you want to %{action}?
   ask_a_question: Ask a question!
   ask_community: Ask community for help
   ask_redirect: Do you want to go there?
   ask_the_first_question: Be the first one to ask!
   attempts_left:
-    zero: "You've run out of attempts "
+    zero: "You've run out of attempts"
     one: "1 attempt remaining"
     other: '%{count} attempts remaining'
   author: Author
-  authoring: "Authoring"
+  authoring: Authoring
   authoring_note_html: This guide's content was developed by %{authors} under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   authoring_note_with_collaborators_html: This guide's content was developed by %{authors} and <a href="%{collaborators}" target="_blank">many others</a>, under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   back_to_mumuki: Back to Mumuki!
@@ -51,7 +51,7 @@ en:
   console: Console
   contact_administrator: 'If you think this is not supposed to happen, please contact %{link}'
   content: Content
-  continue_exercise: "Continue"
+  continue_exercise: Continue
   continue_lesson: Continue this lesson!
   continue_practicing: Continue practicing!
   corollary: To think about
@@ -60,11 +60,12 @@ en:
   created_at: Created at
   date: Date
   description: Description
-  destroy_message: delete the message
   destroy: Destroy
+  destroy_message: delete the message
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
   disabled_organization_explanation: This path has already finished.
   discussion_description_placeholder: You can add more information regarding your doubt.
+  new_discussion_message: New message on %{title}
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -73,19 +74,28 @@ en:
   edit_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
-  error_description: This is known as a <span class="error-link">%{error}</span>.
-  error_401: 401 error
-  error_403: 403 error
-  error_404: 404 error
-  error_410: 410 error
-  error_500: 500 error
-  errored: Oops, your solution didn't work
   error:
     title:
       forbidden: You are not allowed to see this content
       gone: Oops! Content has expired
       internal_server_error: Oops! Something went wrong
       not_found: Oops! Page was not found
+  error_401: 401 error
+  error_403: 403 error
+  error_404: 404 error
+  error_410: 410 error
+  error_500: 500 error
+  error_description: This is known as a <span class="error-link">%{error}</span>.
+  errored: Oops, your solution didn't work
+  exam_authorization_request_approved_html: Your request was approved, don't forget to log in at <strong>%{date}</strong>. Good luck!
+  exam_authorization_request_created: Your registration to the exam has been saved!
+  exam_authorization_request_rejected: Your request was rejected.
+  exam_authorization_request_saved: Your registration to the exam has been updated!
+  exam_authorization_request_updated: Your registration to %{description} has been updated
+  exam_registration_choose_exam: Choose date and time to attend to the exam
+  exam_registration_explanation_html: You have until <strong>%{date}</strong> to register. After that date, your request will be processed and you will receive a confirmation. <br> Don't forget to check the notifications!
+  exam_registration_open: Registrations open for %{description}!
+  exam_registration_to: Registration to %{description}
   exams: Exams
   exercise: Exercise
   exercises: Exercises
@@ -105,9 +115,10 @@ en:
   first_name: First Name
   forbidden_explanation: Please verify you have logged in with the right account
   format: Format
+  forum: Forum
   forum_terms: Forum rules
   forum_terms_link: If you have any questions, please check %{terms_link}
-  fullscreen: "Fullscreen"
+  fullscreen: "Fullscreen (F11)"
   gender: Gender
   get_messages: "View messages"
   go_to: 'Go to %{organization}'
@@ -120,6 +131,7 @@ en:
   hidden_done: 'Good!'
   history: History
   home: Home
+  important_info: Important information
   initial_state: Initial board
   insert_file_name: Insert a file name
   invitation: Invitation to course
@@ -129,12 +141,6 @@ en:
   joining_html: '¡Welcome to course <strong>%{course}</strong>!'
   keep_learning: Keep learning!
   kids_default_success: You did it great!
-  kindergarten_passed: "Your program worked great!"
-  kindergarten_passed_with_warnings: "Your program worked great!"
-  kindergarten_pending: "There's an error in your program. Try again!"
-  kindergarten_failed: "There's an error in your program. Try again!"
-  kindergarten_errored: "There's an error in your program. Try again!"
-  kindergarten_aborted: "Ups! Something went wrong"
   language: Language
   last_name: Last Name
   last_seen: "Seen by %{name}"
@@ -160,8 +166,9 @@ en:
   message: Message
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
-  more_messages: More
+  moderation: Mentoring
   moderator: Mentor
+  more_messages: More
   my_doubts: My doubts
   my_submissions: My Submissions
   name: Name
@@ -173,6 +180,7 @@ en:
   never: never
   new: New
   new_message_placeholder: Write a message for your teacher...
+  new_message_received: You have a new message from %{sender}
   next_exercise: Next
   next_lesson: 'Next Guide: %{name}'
   no_discussions: No discussions matched your search.
@@ -185,6 +193,7 @@ en:
   no_useful_result: Didn't find what you were looking for?
   not_found_explanation: 'You may have mistyped the address or the page may have moved.'
   not_in_any_organizations: It seems you aren't in any organizations yet!
+  notifications: Notifications
   notify_problem_with_exercise: Report a bug
   office: Office
   only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
@@ -261,7 +270,7 @@ en:
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_accepted: The terms and conditions were accepted
-  terms_and_conditions: Terms and conditions
+  terms_and_conditions: Terms and Conditions
   terms_and_conditions_continue_disclaimer: By continuing you agree to %{terms_link}
   terms_and_conditions_must_be_accepted: You must accept the terms and conditions
   test_results: Test results