mumuki-laboratory 7.11.1 → 8.1.0

data/app/controllers/api/courses_controller.rb

@@ -5,7 +5,6 @@ module Api
 
     def create
       @course.save!
-      @course.notify!
       render json: @course
     end
 
@@ -23,4 +22,4 @@ module Api
       @course.slug
     end
   end
-end
+end

data/app/controllers/api/organizations_controller.rb

@@ -14,13 +14,12 @@ module Api
     end
 
     def create
-      @organization.save_and_notify!
+      @organization.save!
       render json: @organization.to_resource_h
     end
 
     def update
-      @organization.update_and_notify! organization_params
-
+      @organization.update! organization_params
       render json: @organization.to_resource_h
     end
   end

data/app/controllers/api/users_controller.rb

@@ -4,14 +4,12 @@ module Api
     before_action :authorize_janitor!
 
     def create
-      @user.save!
-      @user.notify!
+      @user.save_and_notify!
       render json: @user.to_resource_h
     end
 
     def update
-      @user.update! user_params.except([:email, :permissions, :uid])
-      @user.notify!
+      @user.update_and_notify! user_params.except([:email, :permissions, :uid])
       render json: @user.to_resource_h
     end
   end

data/app/controllers/application_controller.rb

@@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base
   include Mumuki::Laboratory::Controllers::DynamicErrors
   include Mumuki::Laboratory::Controllers::EmbeddedMode
   include Mumuki::Laboratory::Controllers::IncognitoMode
+  include Mumuki::Laboratory::Controllers::ActionRedirector
 
   before_action :set_current_organization!
   before_action :set_locale!
@@ -24,6 +25,7 @@ class ApplicationController < ActionController::Base
   before_action :authorize_if_private!
   before_action :validate_active_organization!
   before_action :validate_user_profile!, if: :current_user?
+  before_action :validate_accepted_role_terms!, if: :current_user?
 
   before_action :visit_organization!, if: :current_user?
 
@@ -36,23 +38,26 @@ class ApplicationController < ActionController::Base
                 :has_notifications?,
                 :subject,
                 :should_choose_organization?,
+                :current_immersive_organizations,
                 :theme_stylesheet_url,
-                :extension_javascript_url
+                :extension_javascript_url,
+                :current_immersive_path
 
   def immersive_context_wrong?
     current_immersive_context != Organization.current
   end
 
   def redirect_to_proper_context!
-    # TODO: redirect to subject (if it exists on the immersive context)
-    redirect_to current_immersive_context.url_for('/')
+    redirect_to current_immersive_path_for(*current_immersive_context_and_content)
   end
 
   def should_choose_organization?
     return false unless current_user?
+    current_immersive_organizations.multiple?
+  end
 
-    # TODO: replace `nil` with `subject` to consider exercise, guide, etc
-    current_user.immersive_organizations_at(nil).size > 1
+  def current_immersive_organizations
+    current_user.immersive_organizations_with_content_at(subject)
   end
 
   # ensures contents are accessible to current user
@@ -66,7 +71,6 @@ class ApplicationController < ActionController::Base
     Organization.current.validate_active!
   end
 
-
   # required by Mumukit::Login
   def login_button(options = {})
     login_form.button_html I18n.t(:sign_in), options[:class]
@@ -82,11 +86,31 @@ class ApplicationController < ActionController::Base
     Mumuki::Domain::Workspace.new(current_user, Organization.current)
   end
 
+  def current_immersive_path(context)
+    current_immersive_path_for context, subject&.navigable_content_in(context)
+  end
+
+  def current_immersive_path_for(context, content)
+    resource = content ? polymorphic_path(content) : default_immersive_path_for(context)
+    context.url_for resource
+  end
+
   private
 
+  def default_immersive_path_for(context)
+    subject.present? ? root_path : inorganic_path_for(request)
+  end
+
+  def inorganic_path_for(request)
+    Mumukit::Platform.organization_mapping.inorganic_path_for(request)
+  end
+
   def current_immersive_context
-    # TODO: replace `nil` with `subject` to consider exercise, guide, etc
-    current_user&.current_immersive_context_at(nil) || Organization.current
+    current_immersive_context_and_content&.first || Organization.current
+  end
+
+  def current_immersive_context_and_content
+    current_user&.current_immersive_context_and_content_at(subject) || [Organization.current, nil]
   end
 
   def from_sessions?
@@ -99,11 +123,19 @@ class ApplicationController < ActionController::Base
 
   def validate_user_profile!
     unless current_user.profile_completed?
+      save_location_before! :profile_completion
       flash.notice = I18n.t :please_fill_profile_data
       redirect_to edit_user_path
     end
   end
 
+  def validate_accepted_role_terms!
+    if current_user&.has_role_terms_to_accept?
+      flash.notice = I18n.t :accept_terms_to_continue
+      redirect_to terms_user_path
+    end
+  end
+
   def set_locale!
     I18n.locale = Organization.current.locale
   end

data/app/controllers/assets_controller.rb

@@ -3,6 +3,7 @@ class AssetsController < ApplicationController
   protect_from_forgery except: [:theme_stylesheet, :extension_javascript]
   skip_before_action :authorize_if_private!
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_accepted_role_terms!
   skip_before_action :validate_active_organization!
 
   def theme_stylesheet

data/app/controllers/book_discussions_controller.rb

@@ -1,4 +1,8 @@
 class BookDiscussionsController < DiscussionsController
+  def terms
+    @forum_terms ||= Term.forum_related_terms
+  end
+
   private
 
   def set_debatable

data/app/controllers/chapters_controller.rb

@@ -2,6 +2,7 @@ require 'addressable/uri'
 
 class ChaptersController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   def show
   end

data/app/controllers/discussions_controller.rb

@@ -46,6 +46,10 @@ class DiscussionsController < ApplicationController
 
   private
 
+  def default_immersive_path_for(context)
+    context.forum_enabled? ? discussions_path : root_path
+  end
+
   def current_content_discussions
     @debatable.discussions_in_organization
   end

data/app/controllers/exercises_controller.rb

@@ -1,6 +1,7 @@
 class ExercisesController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include Mumuki::Laboratory::Controllers::ExerciseSeed
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   before_action :set_guide!, only: :show
   before_action :set_assignment!, only: :show, if: :current_user?

data/app/controllers/guides_controller.rb

@@ -1,4 +1,6 @@
 class GuidesController < ApplicationController
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
+
   def show
     redirect_to_usage Guide.find_by!(id: params[:id])
   end

data/app/controllers/invitations_controller.rb

@@ -6,6 +6,7 @@ class InvitationsController < ApplicationController
   before_action :set_user!
 
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_accepted_role_terms!
   skip_before_action :authorize_if_private!
   skip_before_action :validate_active_organization!
 
@@ -15,8 +16,7 @@ class InvitationsController < ApplicationController
 
   def join
     current_user.accept_invitation! @invitation
-    current_user.update! user_params
-    current_user.notify!
+    current_user.update_and_notify! user_params
     redirect_to_organization!
   end
 

data/app/controllers/lessons_controller.rb

@@ -1,4 +1,5 @@
 class LessonsController < GuideContainerController
+  include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
   private
 

data/app/controllers/login_controller.rb

@@ -3,6 +3,7 @@ class LoginController < ApplicationController
 
   skip_before_action :verify_authenticity_token, if: lambda { Rails.env.development? }
   skip_before_action :validate_user_profile!
+  skip_before_action :validate_accepted_role_terms!
   skip_before_action :validate_active_organization!
 
   private

data/app/controllers/users_controller.rb

@@ -1,8 +1,9 @@
 class UsersController < ApplicationController
   include WithUserParams
 
-  before_action :authenticate!
+  before_action :authenticate!, except: :terms
   before_action :set_user!
+  skip_before_action :validate_accepted_role_terms!
 
   def show
     @messages = current_user.messages.to_a
@@ -11,7 +12,18 @@ class UsersController < ApplicationController
 
   def update
     current_user.update_and_notify! user_params
-    redirect_to user_path, notice: I18n.t(:user_data_updated)
+    current_user.accept_profile_terms!
+    flash.notice = I18n.t(:user_data_updated)
+    redirect_after! :profile_completion, fallback_location: user_path
+  end
+
+  def accept_profile_terms
+    current_user.accept_profile_terms!
+    redirect_to root_path, notice: I18n.t(:terms_accepted)
+  end
+
+  def terms
+    @profile_terms ||= Term.profile_terms_for(current_user)
   end
 
   def unsubscribe
@@ -33,4 +45,5 @@ class UsersController < ApplicationController
   def set_user!
     @user = current_user
   end
+
 end

data/app/helpers/assistance_box_helper.rb

@@ -1,9 +1,11 @@
 module AssistanceBoxHelper
   def assistance_box(assignment)
-    if assignment.tips.present?
-      %Q{<div class="mu-tips-box">
-        #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
-      </div>}.html_safe
-    end
+    %Q{<div class="mu-tips-box">
+      #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
+    </div>}.html_safe
+  end
+
+  def should_display_assistance_box?(assignment)
+    assignment.tips.present? && !assignment.solved?
   end
 end

data/app/helpers/contextualization_result_helper.rb

@@ -8,7 +8,7 @@ module ContextualizationResultHelper
   end
 
   def t_contextualization_status(contextualization)
-    t contextualization_status contextualization
+    t contextualization_status(contextualization)
   end
 
   def contextualization_status(contextualization)
@@ -16,6 +16,14 @@ 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/gamification_helper.rb

@@ -0,0 +1,5 @@
+module GamificationHelper
+  def in_gamified_context?
+    Organization.current.gamification_enabled?
+  end
+end

data/app/helpers/links_helper.rb

@@ -51,6 +51,14 @@ module LinksHelper
             body: permissions_help_email_body(current_user)
   end
 
+  def link_to_profile_terms
+    link_to t(:terms_and_conditions).downcase, terms_user_path, target: '_blank'
+  end
+
+  def link_to_forum_terms
+    link_to t(:forum_terms).downcase, discussions_terms_path, target: '_blank'
+  end
+
   def turbolinks_enable_for(exercise)
     %Q{data-turbolinks="#{!exercise.input_kids?}"}.html_safe
   end

data/app/helpers/overlapped_buttons_helper.rb

@@ -8,7 +8,7 @@ module OverlappedButtonsHelper
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item', data: {confirm: t(:confirm_restart)}, method: :delete
+    link_to restart_icon, 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)

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

@@ -0,0 +1,10 @@
+<div class="mu-user-header">
+  <h1><%= t :forum_terms %></h1>
+</div>
+
+<div>
+  <% @forum_terms.each do |term| %>
+    <%= term.content_html %>
+  <% end %>
+</div>
+

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

@@ -0,0 +1,13 @@
+<% if should_display_assistance_box? assignment %>
+  <hr>
+  <%= assistance_box assignment %>
+  <a data-toggle="collapse" href="#assistance-details-section" class="example-see-more">
+    <%= t :view_details %>
+  </a>
+  <div id="assistance-details-section" class="<%= 'collapse' if should_display_assistance_box?(assignment) %> in results-item">
+    <hr>
+    <%= yield %>
+  </div>
+<% else %>
+  <%= yield %>
+<% end %>

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

@@ -1,4 +1,13 @@
 <div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
+
+  <% if in_gamified_context? %>
+    <div id="mu-exp-earned-message" class="hidden">
+      <span><%= t(:you_earned) %></span>
+      <strong><span id="mu-exp-points"></span></strong>
+      <span><%= t(:exp_points) %></span>
+    </div>
+  <% end %>
+
   <%= yield %>
 </div>

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

@@ -0,0 +1,11 @@
+<div>
+  <h3 class="text-center">
+    <%= t :level_up %>
+  </h3>
+  <div class="text-center mu-level">
+    <i class="fa fa-star fa-fw fa-4x"></i>
+    <span class="mu-level-number"></span>
+    <p></p>
+    <p id="mu-solve-more-exercises"> <%= (t :solve_more_exercises_to_level_up).html_safe %></p>
+  </div>
+</div>

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

@@ -12,7 +12,7 @@
   <%= corollary_box @exercise %>
 <% else %>
   <div class="mu-kids-default-success">
-    <img class="capital-animation mu-kids-character-success"/>
+    <img class="capital-animation mu-kids-character-result"/>
     <p><%= t :kids_default_success %></p>
   </div>
 <% end %>

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

@@ -11,24 +11,26 @@
   <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: assignment} do %>
     <%= manual_evaluation_comment assignment %>
     <% unless assignment.manual_evaluation_comment? %>
-      <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
-      <% if should_render_need_help_dropdown?(assignment) %>
-        <div class="notify-problem-box">
-          <div class="dropdown">
-            <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
-            <ul class="dropdown-menu" aria-labelledby="helpDropdown">
-              <li>
-                <%= read_discussions_link(@exercise) %>
-              </li>
-              <li>
-                <%= render_community_link %>
-              </li>
-              <li>
-                <%= report_bug_link(assignment) %>
-              </li>
-            </ul>
+      <%= 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) %>
+          <div class="notify-problem-box">
+            <div class="dropdown">
+              <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
+              <ul class="dropdown-menu" aria-labelledby="helpDropdown">
+                <li>
+                  <%= read_discussions_link(@exercise) %>
+                </li>
+                <li>
+                  <%= render_community_link %>
+                </li>
+                <li>
+                  <%= report_bug_link(assignment) %>
+                </li>
+              </ul>
+            </div>
           </div>
-        </div>
+        <% end %>
       <% end %>
     <% end %>
     <%= solution_download_link assignment %>
@@ -36,8 +38,6 @@
 
   <% if assignment.passed? %>
     <%= corollary_box @exercise %>
-  <% else %>
-    <%= assistance_box assignment %>
   <% end %>
 <% end %>