mumuki-laboratory 9.0.4 → 9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79de66ab1c8248e5715cd1e54ac8e4b1e426fb26bc0a69b35539ba19eb954da
-  data.tar.gz: 39cbfb28e86a6ae64f5a1164731d472ca65be3bec82d9f1ed6f159273512b078
+  metadata.gz: d72de447465b6716ee6b249aae76c6158aaa6ca02c87d58ea4e19fcf783ad85e
+  data.tar.gz: 387fef678b907e118266847df85eada3fb2aaea616162bb00e136776f2010629
 SHA512:
-  metadata.gz: ed9430f79c8f92f7b02264aa84f7dc757a7ff05915fcdd17e93a5fe4b7aaac5cfd0d87fadec66ce0d4ac204cd270f08fafc1550a986bd367314f5e7130c360d4
-  data.tar.gz: 8669d687ca7f70178cab77c25f698eef49a58eb74957ed274c73fe6fdf0c6f9139c5963f5c57b08a92ed874a97c6b648030c1be87cd34b107cb831db156e0113
+  metadata.gz: ae0f9022a999d502065a58c4fca2224c4ea3f21562c56d55489889793d70c7d561554bbd2eeb0f940295a7fc071adac35cf439219b228aa150799c62ed9f6a25
+  data.tar.gz: 5e40cd1dc2accffef46a0a6981d0ad588f031070c611d67d8c0811cdd6919a6d4733b8363b1bf6d02018c41f9d72945c4b6b497bc465ebe6621c00e17087d6c5

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

@@ -1,9 +1,13 @@
 mumuki.load(() => {
   var $subscriptionSpans = $('.discussion-subscription > span');
   var $upvoteSpans = $('.discussion-upvote > span');
+  let $messagePreviewButton = $('.discussion-new-message-preview-button.preview');
+  let $messageEditButton = $('.discussion-new-message-preview-button.edit');
+  let $newMessageContent = $('.discussion-new-message-content');
+  let $newMessagePreview = $('#discussion-new-message-preview');
 
   function createNewMessageEditor() {
-    var $textarea = $("#new-discussion-message");
+    var $textarea = $("#discussion-new-message");
     var textarea = $textarea[0];
     if (!textarea) return;
 
@@ -26,7 +30,7 @@ mumuki.load(() => {
   }
 
   createReadOnlyEditors();
-  createNewMessageEditor();
+  let editor = createNewMessageEditor();
 
   var Forum = {
     toggleButton: function (spans) {
@@ -67,9 +71,46 @@ mumuki.load(() => {
       const params = new URLSearchParams(location.search);
       elem.is(':checked') ? params.set(key, elem.val()) : params.delete(key);
       location.search = params.toString();
+    },
+    discussionMessagePreview: function (url) {
+      return Forum.tokenRequest({
+        url: url,
+        method: 'GET',
+        processData: false,
+        dataType: 'json',
+        data: new URLSearchParams({ content: editor.getValue() } ),
+        success: function (response) {
+          showPreview(response.preview);
+        },
+        error: function (e) {
+          error = $messagePreviewButton.attr('error-text');
+          showPreview(error);
+        },
+        xhrFields: {withCredentials: true}
+      });
+    },
+    hidePreviewAndShowEditor: function(elem) {
+      togglePreviewAndEditButtons();
+      togglePreviewAndContentMessage();
     }
   };
 
+  function showPreview(preview) {
+    $newMessagePreview.html($.parseHTML(preview));
+    togglePreviewAndEditButtons();
+    togglePreviewAndContentMessage();
+  }
+
+  function togglePreviewAndEditButtons() {
+    $messagePreviewButton.toggleClass('hidden');
+    $messageEditButton.toggleClass('hidden');
+  }
+
+  function togglePreviewAndContentMessage() {
+    $newMessagePreview.toggleClass('hidden');
+    $newMessageContent.toggleClass('hidden');
+  }
+
   mumuki.Forum = Forum;
 
 });

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

@@ -34,7 +34,7 @@ mumuki.load(() => {
   let onUserProfile = document.querySelector('.mu-profile-info') !== null;
 
   $userMenuHeader.click(() => {
-    $('.mu-user-menu-items').toggleClass('hidden-sm-screen');
+    $('.mu-user-menu-items').toggleClass('mu-hidden-sm-screen');
     $('#mu-user-menu-header-icon').toggleClass('fa-chevron-up fa-chevron-down');
   });
 

data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss

@@ -1,3 +1,4 @@
+@import "modules/activity";
 @import "modules/avatar";
 @import "modules/book_header";
 @import "modules/breadcrumb";

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

@@ -0,0 +1,12 @@
+.mu-user-activity-indicator {
+  text-align: center;
+  border-radius: 10px;
+
+  &.jumbotron {
+    padding: 0.5em 0;
+  }
+}
+
+.mu-user-activity-selector {
+  padding-top: 15px;
+}

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

@@ -287,9 +287,21 @@ summary.discussion-summary {
   }
 }
 
+.discussion-new-message-buttons {
+  display: flex;
+  margin: 0 -10px;
+
+  .btn {
+    margin: 15px 10px;
+  }
+}
+
+.discussion-new-message-preview-button {
+  flex-grow: 0.2;
+}
+
 .discussion-new-message-button {
-  border-radius: 0;
-  margin-top: 15px;
+  flex-grow: 1;
 }
 
 .discussion-message {

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

@@ -31,7 +31,7 @@
 .mu-user-menu-items {
   margin-top: 30px;
 
-  &.hidden-sm-screen {
+  &.mu-hidden-sm-screen {
     @media only screen and (max-width: $screen-sm-max) {
       display: none;
     }

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

@@ -82,3 +82,4 @@
     }
   }
 }
+

data/app/controllers/discussions_messages_controller.rb

@@ -3,7 +3,7 @@ class DiscussionsMessagesController < AjaxController
 
   before_action :set_discussion!, only: [:create, :destroy]
   before_action :authorize_user!, only: [:destroy]
-  before_action :authorize_moderator!, only: [:question, :approve]
+  before_action :authorize_moderator!, only: [:question, :approve, :preview]
 
   def create
     @discussion.submit_message! message_params, current_user
@@ -15,8 +15,12 @@ class DiscussionsMessagesController < AjaxController
     redirect_back(fallback_location: root_path)
   end
 
+  def preview
+    render json: { preview: Message.new(content: params[:content]).content_html }
+  end
+
   def approve
-    current_message.toggle_approved!
+    current_message.toggle_approved! current_user
     head :ok
   end
 

data/app/controllers/users_controller.rb

@@ -30,6 +30,10 @@ class UsersController < ApplicationController
     @watched_discussions = current_user.watched_discussions_in_organization
   end
 
+  def activity
+    @activity = UserStats.stats_for(current_user).activity date_range_params
+  end
+
   def certificates
     @certificates ||= current_user.certificates_in_organization
   end
@@ -54,4 +58,13 @@ class UsersController < ApplicationController
     @user = current_user
   end
 
+  def date_range_params
+    @date_from = params[:date_from].try { |it| Date.parse it }
+    to = params[:date_to].try { |it| Date.parse it }
+    if @date_from && to
+      @date_from.beginning_of_day..(to - 1.day).end_of_day
+    else
+      nil
+    end
+  end
 end

data/app/helpers/discussions_helper.rb

@@ -12,7 +12,7 @@ module DiscussionsHelper
   end
 
   def user_discussions_link
-    discussions_link user_discussions_icon(t(:my_doubts)), user_path(anchor: 'discussions') if current_user.watched_discussions.present?
+    discussions_link(user_discussions_icon(t(:my_doubts)), discussions_user_path) if current_user.watched_discussions.present?
   end
 
   def others_discussions_icon(text)
@@ -195,4 +195,8 @@ module DiscussionsHelper
   def should_show_approved_for?(user, message)
     !user&.moderator_here? && message.approved? && !message.from_moderator?
   end
+
+  def discussion_user_name(user)
+    user.name
+  end
 end

data/app/helpers/user_activity_helper.rb

@@ -0,0 +1,48 @@
+module UserActivityHelper
+  def activity_selector_week_range_for(organization = Organization.current)
+    start = organization.activity_start_date min_week
+    (start.prev_occurring(:monday) + 1..Date.today)
+        .step(7)
+        .to_a
+        .reverse
+        .map { |it| [it, it + 7.days] }
+  end
+
+  def mark_period_if_active(period_start)
+    active_period?(period_start) && 'class=active'
+  end
+
+  def solved_exercises_percentage
+    percentage = @activity[:exercises][:solved_count].to_f / @activity[:exercises][:count] * 100
+    "#{percentage.ceil}%"
+  end
+
+  def exercises_activity_stats
+    solved_count = {
+        name: t(:solved_exercises_count, count: @activity[:exercises][:solved_count]),
+        value: @activity[:exercises][:solved_count] }
+    solved_percentage = {
+        name: t(:solved_exercises_percentage),
+        value: solved_exercises_percentage }
+
+    @date_from ? [solved_count] : [solved_count, solved_percentage]
+  end
+
+  def messages_activity_stats
+    count = @activity[:messages][:count]
+    approved = @activity[:messages][:approved]
+
+    [{name: t(:messages_pluralized, count: count), value: count},
+     {name: t(:approved_messages, count: approved), value: approved}]
+  end
+
+  private
+
+  def active_period?(period_start)
+    period_start ? @date_from == period_start : !@date_from
+  end
+
+  def min_week
+    8.week.ago.to_date
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -19,6 +19,10 @@ module UserMenuHelper
     user_menu_item t(:discussions), discussions_user_path, 'discussions' if current_user&.can_discuss_here?
   end
 
+  def activity_user_menu_link
+    user_menu_item t(:activity), activity_user_path, 'activity'
+  end
+
   def certificates_user_menu_link
     user_menu_item t(:certificates), certificates_user_path, 'certificates'
   end

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.initiator.name %>
+        <%= 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">
-        <%= user.name %>
+        <%= discussion_user_name user %>
         <% if user.moderator_here? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>

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

@@ -10,12 +10,23 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :content, '', { id: 'new-discussion-message', class: 'form-control', placeholder: t(:message) } %>
+              <%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
             </div>
+            <div class="discussion-message-content hidden" id="discussion-new-message-preview"></div>
           </div>
         </div>
       </div>
     </div>
-    <button class="btn btn-success btn-block discussion-new-message-button"> <%= t :comment %> </button>
+    <div class="discussion-new-message-buttons">
+      <% if user.moderator_here? %>
+        <button class="btn btn-default discussion-new-message-preview-button preview" type="button" error-text="<%= t :preview_error %>"
+                onclick="mumuki.Forum.discussionMessagePreview('<%= preview_discussion_message_url %>')"> <%= fa_icon('eye', text: t(:preview)) %> </button>
+        <button class="btn btn-default discussion-new-message-preview-button edit hidden" type="button"
+                onclick="mumuki.Forum.hidePreviewAndShowEditor()"> <%= fa_icon('pencil-alt', text: t(:edit_message)) %> </button>
+      <% end %>
+      <%= button_tag type: 'submit', class: 'btn btn-success discussion-new-message-button', data: { disable: true } do %>
+        <%= fa_icon('comment', text: t(:comment)) %>
+      <% end %>
+    </div>
   <% end %>
 <% end %>

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

@@ -22,7 +22,7 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :description, '', {id: 'new-discussion-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
+              <%= f.editor :description, '', {id: 'discussion-new-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
             </div>
           </div>
         </div>

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

@@ -2,13 +2,13 @@
   <div class="mu-user-menu">
     <div class="mu-user-menu-content">
       <%= user_menu_header %>
-      <div class="col-xs-12 mu-user-menu-items hidden-sm-screen">
+      <div class="col-xs-12 mu-user-menu-items mu-hidden-sm-screen">
         <%= profile_user_menu_link %>
         <%= user_menu_divider %>
         <%= messages_user_menu_link %>
         <%= discussions_user_menu_link %>
         <%= user_menu_divider %>
-        <%= certificates_user_menu_link %>
+        <%= activity_user_menu_link %>
       </div>
     </div>
     <div class="mu-user-menu-divider vertical hidden-sm hidden-xs"></div>

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

@@ -0,0 +1,17 @@
+<div class="row">
+  <div class="col-md-12">
+    <h3><%= title %></h3>
+  </div>
+</div>
+<div class="row">
+  <% stats.each do |s| %>
+    <div class="col-md-6">
+      <div class="jumbotron mu-user-activity-indicator">
+        <h1>
+          <%= s[:value] %>
+          <p><%= s[:name].downcase %></p>
+        </h1>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,37 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_my_account %>
+<% end %>
+
+<%= render partial: 'layouts/user_menu' %>
+
+<div class="col-md-9 mu-tab-body">
+  <div class="mu-user-header">
+    <h1><%= t(:activity) %></h1>
+  </div>
+  <div class="col-md-8">
+    <%= render partial: 'activity_indicator',
+               locals: {
+                 title: t(:exercises),
+                 stats: exercises_activity_stats
+               } %>
+
+    <%= render partial: 'activity_indicator',
+               locals: {
+                 title: t(:forum),
+                 stats: messages_activity_stats
+               } %>
+  </div>
+
+  <div class="col-md-4">
+    <ul class="nav nav-pills nav-stacked mu-user-activity-selector">
+      <li <%= mark_period_if_active nil %>>
+        <%= link_to t(:total), activity_user_path %>
+      </li>
+      <% activity_selector_week_range_for.each do |(week_start, week_end)| %>
+        <li <%= mark_period_if_active week_start %>>
+          <%= link_to t(:week_of, date: l(week_start)), activity_user_path(date_from: week_start, date_to: week_end) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/config/routes.rb

@@ -21,6 +21,7 @@ Rails.application.routes.draw do
         post :question, on: :member
       end
     end
+    get '/discussions/messages/preview', to: 'discussions_messages#preview', as: :preview_discussion_message
 
     resources :exam_registrations, only: [:show]
     resources :exam_authorization_requests, only: [:show, :create, :update]
@@ -65,7 +66,9 @@ Rails.application.routes.draw do
 
       get :messages
       get :discussions
+      get :activity
       get :certificates
+
     end
 
     resources :faqs, only: [:index]

data/lib/mumuki/laboratory/extensions.rb

@@ -1 +1,2 @@
+require_relative './extensions/date_and_time'
 require_relative './extensions/request'

data/lib/mumuki/laboratory/extensions/date_and_time.rb

@@ -0,0 +1,11 @@
+module DateAndTime
+  module Calculations
+    # Polyfill, already implemented on Rails 5.2
+    # https://api.rubyonrails.org/classes/DateAndTime/Calculations.html#method-i-prev_occurring
+    def prev_occurring(day_of_week)
+      ago = wday - DAYS_INTO_WEEK.fetch(day_of_week)
+      ago += 7 unless ago > 0
+      advance(days: -ago)
+    end
+  end
+end

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

@@ -14,6 +14,8 @@ en:
   appendix: Appendix
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
   approved_message: Validated by mentor
+  approved_messages:
+    other: validated
   are_you_sure: Are you sure you want to %{action}?
   ask_a_question: Ask a question!
   ask_community: Ask community for help
@@ -77,6 +79,7 @@ en:
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
   download: Download your solution
   edit: Edit
+  edit_message: Edit message
   edit_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
@@ -176,6 +179,9 @@ en:
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
   moderation: Mentoring
+  messages_pluralized:
+    one: Message
+    other: Messages
   moderator: Mentor
   more_messages: More
   my_account: My account
@@ -224,6 +230,8 @@ en:
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
+  preview: Preview
+  preview_error: The preview cannot be shown. Check your internet connection or try with a shorter message.
   previous_exercise: Previous
   problem_with_exercise: '[Mumuki] Problem with exercise: %{title}'
   processing_your_solution: We are processing you solution
@@ -256,11 +264,13 @@ en:
   skipped_solve_anyway: Solve anyway
   solution: Solution
   solved: Solved
-  solved_count: '%{count} solved'
   solve_doubts: Solve other's doubts
   solve_more_exercises_to_level_up: Solve <span>number</span> more exercises to advance to the next level.
   solve_your_doubts: Solve your doubts
   solve_your_doubts_teaser: Do you have any doubts?
+  solved_count: '%{count} solved'
+  solved_exercises_count: solved
+  solved_exercises_percentage: done
   something_went_wrong: Something went wrong!
   sort: Sort
   sources: Sources
@@ -293,6 +303,7 @@ en:
   to_pending_review: Mark as solved
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
+  total: Total
   undo_upvote: Undo upvote
   unlocked_medal_as_avatar: You earned this medal! You can now choose it as an avatar.
   unspecified: I'd rather not say
@@ -310,6 +321,7 @@ en:
   view_details: View details
   want_permissions: The next user requires permissions
   we_miss_you: We miss you!
+  week_of: Week of %{date}
   welcome: Welcome to %{name}!
   working: "Working"
   wrong_answer: The answer is wrong

data/lib/mumuki/laboratory/locales/es-CL.yml

@@ -13,6 +13,9 @@ es-CL:
   appendix_teaser: ¿Quieres saber más? <a href="%{link}">Consulta el apéndice de este capítulo</a>
   are_you_sure: '¿Estás seguro que quieres %{action}?'
   ask_a_question: ¡Haz una pregunta!
+  approved_messages:
+    one: validado
+    other: validados
   ask_community: Pregunta a la comunidad
   ask_redirect: ¿Quieres que te llevemos ahí?
   ask_the_first_question: ¡Haz la primera pregunta!
@@ -77,6 +80,7 @@ es-CL:
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tienes que seguir practicando.
   download: "Descarga lo que hiciste"
   edit: Editar
+  edit_message: Editar mensaje
   editor_placeholder: "...escribe tu solución acá..."
   email: Email
   error_description: Esto es lo que se conoce como <span class="error-link">%{error}</span>.
@@ -174,6 +178,9 @@ es-CL:
   message: Mensaje
   messages: Mensajes
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Vuelve a intentar más tarde!
+  messages_pluralized:
+    one: Mensaje
+    other: Mensajes
   minute: minuto
   minutes: minutos
   moderation: Mentoría
@@ -230,6 +237,8 @@ es-CL:
   permissions: Permisos
   please_fill_profile_data: ¡Completa tus datos personales para continuar!
   please_validate: 'Estás a punto de ingresar al curso. Para poder ofrecerte una mejor experiencia, por favor valida que tus datos a continuación sean reales y correctos.'
+  preview: Vista previa
+  preview_error: No se puede mostrar la vista previa. Revisa tu conexión a internet o prueba con un mensaje más corto.
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Error con el ejercicio: %{title}'
   processing_your_solution: Estamos procesando tu solución
@@ -260,15 +269,19 @@ es-CL:
   skipped_solve_anyway: Resolver de todos modos
   solution: Solución
   solved: Resuelta
-  solved_count:
-    one: 1 resuelta
-    other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resuelve consultas
   solve_more_exercises_to_level_up: Resuelve <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consulta tus dudas
   solve_your_doubts_teaser: ¿Tienes alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
+  solved_count:
+    one: 1 resuelta
+    other: '%{count} resueltas'
+  solved_exercises_count:
+    one: resuelto
+    other: resueltos
+  solved_exercises_percentage: realizado
   sort: Ordenar
   sources: Bibliografía
   start_lesson: ¡Comienza esta lección!
@@ -300,6 +313,7 @@ es-CL:
   to_pending_review: Resolver
   to_solved: Resolver
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
+  total: Total
   uncategorized: No categorizado
   undo_upvote: No es útil
   unlocked_medal_as_avatar: ¡Obtuviste esta medalla! Ya puedes elegirla como avatar.
@@ -318,6 +332,7 @@ es-CL:
   view_details: Ver detalles
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
+  week_of: Semana del %{date}
   will_paginate:
     previous_label: "&#8592; Anterior"
     next_label: "Siguiente &#8594;"

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

@@ -17,6 +17,9 @@ es:
   approved_message: Validado por mentor
   are_you_sure: '¿Estás seguro que querés %{action}?'
   ask_a_question: ¡Hacé una pregunta!
+  approved_messages:
+    one: validado
+    other: validados
   ask_community: Preguntá a la comunidad
   ask_redirect: ¿Querés que te llevemos ahí?
   ask_the_first_question: ¡Hacé la primera pregunta!
@@ -84,6 +87,7 @@ es:
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
   download: "Descargá lo que hiciste"
   edit: Editar
+  edit_message: Editar mensaje
   edit_profile: Editar perfil
   editor_placeholder: "...escribí tu solución acá..."
   email: Email
@@ -185,6 +189,9 @@ es:
   message: Mensaje
   messages: Mensajes
   messages_error: Los mensajes anteriores no están disponibles en este momento. ¡Volvé a intentar mas tarde!
+  messages_pluralized:
+    one: Mensaje
+    other: Mensajes
   minute: minuto
   minutes: minutos
   moderation: Mentoría
@@ -241,6 +248,8 @@ es:
   permissions: Permisos
   please_fill_profile_data: ¡Completá tus datos personales para continuar!
   please_validate: 'Estás a punto de ingresar al curso. Para poder ofrecerte una mejor experiencia, por favor validá que tus datos a continuación sean reales y correctos.'
+  preview: Vista previa
+  preview_error: No se puede mostrar la vista previa. Revisá tu conexión a internet o probá con un mensaje más corto.
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Error con el ejercicio: %{title}'
   processing_your_solution: Estamos procesando tu solución
@@ -275,15 +284,19 @@ es:
   skipped_solve_anyway: Resolver de todos modos
   solution: Solución
   solved: Resuelta
-  solved_count:
-    one: 1 resuelta
-    other: '%{count} resueltas'
   solved_exercises: Ejercicios Resueltos
   solve_doubts: Resolvé consultas
   solve_more_exercises_to_level_up: Resolvé <span>number</span> ejercicios más para pasar al siguiente nivel.
   solve_your_doubts: Consultá tus dudas
   solve_your_doubts_teaser: ¿Tenés alguna consulta?
   something_went_wrong: ¡Ups!, algo no anduvo bien...
+  solved_count:
+    one: 1 resuelta
+    other: '%{count} resueltas'
+  solved_exercises_count:
+    one: resuelto
+    other: resueltos
+  solved_exercises_percentage: realizado
   sort: Ordenar
   sources: Bibliografía
   start_lesson: ¡Comenzá esta lección!
@@ -316,6 +329,7 @@ es:
   to_pending_review: Resolver
   to_solved: Resolver
   unauthorized_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que no iniciaste sesión.
+  total: Total
   uncategorized: No categorizado
   undo_upvote: No es útil
   unlocked_medal_as_avatar: ¡Obtuviste esta medalla! Ya podés elegirla como avatar.
@@ -335,6 +349,7 @@ es:
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
   welcome: ¡Te damos la bienvenida a %{name}!
+  week_of: Semana del %{date}
   will_paginate:
     previous_label: "&#8592; Anterior"
     next_label: "Siguiente &#8594;"

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

@@ -16,6 +16,9 @@ pt:
   appendix_teaser: Você quer saber mais? <a href="%{link}"> Consulte o apêndice deste capítulo </a>
   approved_message: Validado pelo mentor
   are_you_sure: 'Tem certeza de que deseja %{action}?'
+  approved_messages:
+    one: validado
+    other: validados
   ask_a_question: Faça uma pergunta!
   ask_community: Pergunte à comunidade
   ask_redirect: Você quer que nós o levemos para lá?
@@ -80,6 +83,7 @@ pt:
   discussions_will_be_here: As perguntas que você fizer no espaço de consulta aparecerão aqui.
   download: Faça o download do que você fez
   edit: Editar
+  edit_message: Editar mensagem
   edit_profile: Editar perfil
   editor_placeholder: ... Escreva sua solução aqui ...
   email: E-mail
@@ -179,6 +183,10 @@ pt:
   message: Mensagem
   messages: Mensagens
   messages_error: As mensagens acima não estão disponíveis no momento. Eu tentei novamente mais tarde!
+    mais tarde!
+  messages_pluralized:
+    one: Mensagem
+    other: Mensagens
   minute: minuto
   minutes: minutos
   moderation: Mentoria
@@ -232,6 +240,8 @@ pt:
   permissions: Permissões
   please_fill_profile_data: Preencha suas informações pessoais para continuar!
   please_validate: Você está prestes a entrar no curso. Para oferecer uma experiência melhor, valide que seus dados abaixo sejam reais e corretos.
+  preview: Vista prévia
+  preview_error: A visualizaçao não pode ser mostrada. Verifique sua conexão com a internet ou tente com uma mensagem mais curta.
   previous_exercise: Anterior
   problem_with_exercise: '[Mumuki] Erro com exercício %{title}'
   processing_your_solution: Estamos processando sua solução
@@ -264,12 +274,18 @@ pt:
   skipped_solve_anyway: Resolver mesmo assim
   solution: Solução
   solved: Resolvido
-  solved_count: '%{count} resolvido'
   solved_exercises: Exercícios resolvidos
+  solved_count:
+    one: 1 resolvido
+    other: '%{count} resolvidos'
   solve_doubts: Resolvi dúvidas
   solve_more_exercises_to_level_up: Resolva mais <span>number</span> exercícios para avançar para o próximo nível.
   solve_your_doubts: Consulte suas dúvidas
   solve_your_doubts_teaser: Você tem alguma dúvida?
+  solved_exercises_count:
+    one: resolvido
+    other: resolvidos
+  solved_exercises_percentage: realizado
   something_went_wrong: Oops!, Algo não estava certo ...
   sort: Ordenar
   sources: Bibliografia
@@ -301,6 +317,7 @@ pt:
   to_pending_review: Marcar como resolvida
   to_solved: Marcar como resolvida
   unauthorized_explanation: Opa! Isso é o que é conhecido como %{error}, ou seja, você não fez logon.
+  total: Total
   uncategorized: Não classificado
   unlocked_medal_as_avatar: Você ganhou essa medalha! Agora você pode escolhê-la como avatar.
   unspecified: Eu preferiria não dizer
@@ -313,6 +330,7 @@ pt:
   username: Nome de usuário
   view_details: Ver detalhes
   want_permissions: O próximo usuário requer permissões
+  week_of: Semana de %{date}
   welcome: Convidamos você a {name}!
   working: Processamento
   wrong_answer: A resposta não é correta

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.0.4'
+    VERSION = '9.0.5'
   end
 end

data/spec/controllers/discussions_messages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DiscussionsMessagesController, organization_workspace: :test do
+describe DiscussionsMessagesController, type: :controller, organization_workspace: :test do
   let(:student) { create(:user, permissions: {student: 'test/*'}) }
   let(:moderator) { create(:user, permissions: {moderator: 'test/*', student: 'test/*'}) }
 
@@ -69,5 +69,24 @@ describe DiscussionsMessagesController, organization_workspace: :test do
       it { expect(response.status).to eq 200 }
       it { expect(message.reload.not_actually_a_question).to be true }
     end
+
+    describe 'preview' do
+      let(:message) { create(:message, content: 'Message in **bold** and _italics_', discussion: discussion, sender: student.uid) }
+
+      describe 'for student' do
+        before { set_current_user! student }
+        before { get :preview, params: {content: message.content} }
+
+        it { expect(response.status).to eq 403 }
+      end
+
+      describe 'for moderator' do
+        before { set_current_user! moderator }
+        before { get :preview, params: {content: message.content} }
+
+        it { expect(response.status).to eq 200 }
+        it { expect(JSON.parse(response.body)['preview']).to eq "<p>Message in <strong>bold</strong> and <em>italics</em></p>\n" }
+      end
+    end
   end
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20210302181654) do
+ActiveRecord::Schema.define(version: 20210308145910) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -368,6 +368,9 @@ ActiveRecord::Schema.define(version: 20210302181654) do
     t.integer "discussion_id"
     t.boolean "approved", default: false
     t.boolean "not_actually_a_question", default: false
+    t.datetime "approved_at"
+    t.bigint "approved_by_id"
+    t.index ["approved_by_id"], name: "index_messages_on_approved_by_id"
   end
 
   create_table "notifications", force: :cascade do |t|

data/spec/features/discussion_flow_spec.rb

@@ -169,6 +169,7 @@ feature 'Discussion Flow', organization_workspace: :test do
           expect(page).to have_text(problem_2.name)
           expect(page).to have_text('Open')
           expect(page).to have_text('Messages')
+          expect(page).not_to have_text('Preview')
           expect(page).not_to have_xpath("//div[@class='discussion-actions']")
         end
 
@@ -180,6 +181,7 @@ feature 'Discussion Flow', organization_workspace: :test do
             expect(page).to have_text(problem_2.name)
             expect(page).to have_text('Open')
             expect(page).to have_text('Messages')
+            expect(page).to have_text('Preview')
             expect(page).to have_xpath("//div[@class='discussion-actions']")
           end
         end

data/spec/features/user_activity_flow_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+feature 'User Activity Flow', organization_workspace: :test do
+  let(:user) { create(:user) }
+  before { set_current_user!(user) }
+
+  let(:fake_stats) { double('stats') }
+  before do
+    allow(UserStats).to receive(:stats_for).and_return(fake_stats)
+    allow(fake_stats).to receive(:activity).and_return(
+        { exercises: { solved_count: 8, count: 10 },
+          messages: { count: 12, approved: 6 } })
+  end
+
+  let(:week_start) { Time.new(2020, 10, 12) }
+  before do
+    allow(Time).to receive(:now).and_return(week_start)
+  end
+
+  context 'total' do
+    before { visit activity_user_path }
+
+    scenario 'displays exercises done percentage' do
+      expect(page).to have_text('80%')
+      expect(page).to have_text('done')
+    end
+
+    scenario 'displays exercises solved count' do
+      expect(page).to have_text('8')
+      expect(page).to have_text('solved')
+    end
+
+    scenario 'displays messages count' do
+      expect(page).to have_text('12')
+      expect(page).to have_text('messages')
+    end
+
+    scenario 'displays validated messages count' do
+      expect(page).to have_text('6')
+      expect(page).to have_text('validated')
+    end
+
+    scenario 'displays recent weeks' do
+      expect(page).to have_text 'Week of 2020-10-12'
+      expect(page).to have_text 'Week of 2020-10-05'
+      expect(page).to have_text 'Week of 2020-09-28'
+    end
+  end
+
+  context 'selecting a specific week' do
+    before do
+      visit activity_user_path
+      click_on 'Week of 2020-10-12'
+    end
+
+    scenario "redirects to week activity" do
+      expect(page).to have_current_path('/user/activity?date_from=2020-10-12&date_to=2020-10-19')
+    end
+
+    scenario "doesn't display exercises done percentage" do
+      expect(page).not_to have_text('80%')
+      expect(page).not_to have_text('done')
+    end
+  end
+end

data/spec/helpers/user_activity_helper_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe UserActivityHelper, organization_workspace: :test do
+  helper UserActivityHelper
+
+  let(:organization) { Organization.current }
+
+  before do
+    # Set today date to Wednesday to test week always starts on Monday
+    allow(Date).to receive(:today).and_return(Date.new(2021, 2, 10))
+    allow_any_instance_of(UserActivityHelper).to receive(:min_week).and_return(8.weeks.ago(Date.today))
+  end
+
+  describe 'activity_selector_week_range_for' do
+    let(:range) { activity_selector_week_range_for organization }
+    let(:closest_monday) { Date.new(2021, 2, 8) }
+
+    context 'organization without in preparation until' do
+      it { expect(range.length).to eq 9 }
+      it { expect(range.first).to eq [closest_monday, 1.week.since(closest_monday).to_date] }
+      it { expect(range.last).to eq [8.week.ago(closest_monday).to_date, 7.week.ago(closest_monday).to_date] }
+    end
+
+    context 'organization with in preparation until' do
+      before { organization.update! in_preparation_until: 3.week.ago(Date.today) }
+
+      it { expect(range.length).to eq 4 }
+      it { expect(range.first).to eq [closest_monday, 1.week.since(closest_monday).to_date] }
+      it { expect(range.last).to eq [3.week.ago(closest_monday).to_date, 2.week.ago(closest_monday).to_date] }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.0.5
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.2
+        version: 9.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.2
+        version: 9.0.5
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +456,7 @@ files:
 - app/assets/stylesheets/mumuki_laboratory/application/_vendor.scss
 - app/assets/stylesheets/mumuki_laboratory/application/codemirror-themes/_mu-light.scss
 - app/assets/stylesheets/mumuki_laboratory/application/hovers.scss
+- app/assets/stylesheets/mumuki_laboratory/application/modules/_activity.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_avatar.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_book_header.scss
 - app/assets/stylesheets/mumuki_laboratory/application/modules/_breadcrumb.scss
@@ -571,6 +572,7 @@ files:
 - app/helpers/progress_bar_helper.rb
 - app/helpers/progress_helper.rb
 - app/helpers/runner_assets_helper.rb
+- app/helpers/user_activity_helper.rb
 - app/helpers/user_menu_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
@@ -702,11 +704,13 @@ files:
 - app/views/user_mailer/certificate.text.erb
 - app/views/user_mailer/no_submissions_reminder.html.erb
 - app/views/user_mailer/no_submissions_reminder.text.erb
+- app/views/users/_activity_indicator.html.erb
 - app/views/users/_avatar_list.html.erb
 - app/views/users/_edit_user_form.html.erb
 - app/views/users/_profile_fields.html.erb
 - app/views/users/_term.html.erb
 - app/views/users/_user_form.html.erb
+- app/views/users/activity.html.erb
 - app/views/users/certificates.html.erb
 - app/views/users/discussions.html.erb
 - app/views/users/edit.html.erb
@@ -736,6 +740,7 @@ files:
 - lib/mumuki/laboratory/engine.rb
 - lib/mumuki/laboratory/events/events.rb
 - lib/mumuki/laboratory/extensions.rb
+- lib/mumuki/laboratory/extensions/date_and_time.rb
 - lib/mumuki/laboratory/extensions/request.rb
 - lib/mumuki/laboratory/locales/datetime.es.yml
 - lib/mumuki/laboratory/locales/en.yml
@@ -849,6 +854,7 @@ files:
 - spec/features/standard_flow_spec.rb
 - spec/features/terms_flow_spec.rb
 - spec/features/topic_flow_spec.rb
+- spec/features/user_activity_flow_spec.rb
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/authors_helper_spec.rb
 - spec/helpers/avatar_helper_spec.rb
@@ -859,6 +865,7 @@ files:
 - spec/helpers/icons_helper_spec.rb
 - spec/helpers/page_title_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/user_activity_helper_spec.rb
 - spec/helpers/with_choices_spec.rb
 - spec/helpers/with_navigation_spec.rb
 - spec/javascripts/bridge-spec.js
@@ -943,138 +950,139 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/controllers/invitations_controller_spec.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/exam_registrations_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/exam_authorization_requests_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/discussions_messages_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/certificates_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/evaluation_helper.rb
-- spec/capybara_helper.rb
-- spec/login_helper.rb
-- spec/mailers/previews/user_mailer_preview.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/spec_helper.rb
+- spec/dummy/config/cable.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/spring.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/rabbit.yml
+- spec/dummy/config/puma.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/routes.rb
 - spec/dummy/package.json
+- spec/dummy/Rakefile
+- spec/dummy/config.ru
+- spec/dummy/bin/rails
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/update
 - spec/dummy/bin/setup
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
-- spec/dummy/bin/yarn
-- spec/dummy/public/character/kibi/jump.svg
-- spec/dummy/public/character/kibi/context.svg
-- spec/dummy/public/character/kibi/success_l.svg
+- spec/dummy/public/character/animations.json
 - spec/dummy/public/character/kibi/failure.svg
-- spec/dummy/public/character/kibi/success2_l.svg
+- spec/dummy/public/character/kibi/success_l.svg
 - spec/dummy/public/character/kibi/passed_with_warnings.svg
+- spec/dummy/public/character/kibi/success2_l.svg
+- spec/dummy/public/character/kibi/jump.svg
+- spec/dummy/public/character/kibi/context.svg
 - spec/dummy/public/character/magnifying_glass/apparition.svg
 - spec/dummy/public/character/magnifying_glass/loop.svg
-- spec/dummy/public/character/animations.json
-- spec/dummy/public/medal/outline.svg
-- spec/dummy/public/error/403.svg
-- spec/dummy/public/error/410.svg
+- spec/dummy/public/error/timeout_2.svg
 - spec/dummy/public/error/401.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/error/500.svg
+- spec/dummy/public/error/403.svg
 - spec/dummy/public/error/timeout_1.svg
 - spec/dummy/public/error/timeout_3.svg
-- spec/dummy/public/error/timeout_2.svg
-- spec/dummy/config.ru
-- spec/dummy/db/schema.rb
+- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/410.svg
+- spec/dummy/public/error/500.svg
+- spec/dummy/public/medal/outline.svg
 - spec/dummy/db/seeds.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/puma.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/spring.rb
-- spec/dummy/config/cable.yml
-- spec/dummy/config/rabbit.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/Rakefile
-- spec/api_helper.rb
-- spec/features/profile_flow_spec.rb
-- spec/features/not_found_public_flow_spec.rb
-- spec/features/home_private_flow_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/certificate_programs_flow_spec.rb
-- spec/features/links_flow_spec.rb
-- spec/features/complements_flow_spec.rb
+- spec/dummy/db/schema.rb
 - spec/features/notifications_flow_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/guide_reset_spec.rb
 - spec/features/menu_bar_spec.rb
-- spec/features/disabled_organization_flow_spec.rb
-- spec/features/dynamic_exam_spec.rb
+- spec/features/user_activity_flow_spec.rb
 - spec/features/standard_flow_spec.rb
-- spec/features/home_public_flow_spec.rb
-- spec/features/chapters_flow_spec.rb
-- spec/features/not_found_private_flow_spec.rb
-- spec/features/immersive_redirection_spec.rb
+- spec/features/exams_flow_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/links_flow_spec.rb
 - spec/features/terms_flow_spec.rb
 - spec/features/progressive_tips_spec.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/disable_user_flow_spec.rb
-- spec/features/invitations_flow_spec.rb
+- spec/features/immersive_redirection_spec.rb
+- spec/features/not_found_public_flow_spec.rb
 - spec/features/guides_flow_spec.rb
+- spec/features/chapters_flow_spec.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/home_private_flow_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/disable_user_flow_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
 - spec/features/runner_assets_spec.rb
-- spec/features/discussion_flow_spec.rb
+- spec/features/home_public_flow_spec.rb
+- spec/features/topic_flow_spec.rb
+- spec/features/guide_reset_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/invitations_flow_spec.rb
+- spec/features/certificate_programs_flow_spec.rb
+- spec/features/profile_flow_spec.rb
+- spec/features/lessons_flow_spec.rb
 - spec/features/exercise_flow_spec.rb
-- spec/features/exams_flow_spec.rb
-- spec/javascripts/i18n-spec.js
-- spec/javascripts/bridge-spec.js
+- spec/teaspoon_env.rb
+- spec/login_helper.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/evaluation_helper.rb
+- spec/spec_helper.rb
 - spec/javascripts/timeout-spec.js
-- spec/javascripts/results-renderers-spec.js
-- spec/javascripts/kids-button-spec.js
-- spec/javascripts/timer-spec.js
 - spec/javascripts/sync-mode-spec.js
-- spec/javascripts/events-spec.js
+- spec/javascripts/kids-button-spec.js
+- spec/javascripts/csrf-token-spec.js
 - spec/javascripts/editors-spec.js
+- spec/javascripts/i18n-spec.js
+- spec/javascripts/submissions-store-spec.js
 - spec/javascripts/exercise-spec.js
+- spec/javascripts/speech-bubble-renderer-spec.js
+- spec/javascripts/events-spec.js
 - spec/javascripts/elipsis-spec.js
 - spec/javascripts/upload-spec.js
+- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/timer-spec.js
 - spec/javascripts/spec-helper.js
-- spec/javascripts/submissions-store-spec.js
-- spec/javascripts/gamification-spec.js
-- spec/javascripts/csrf-token-spec.js
+- spec/javascripts/bridge-spec.js
 - spec/javascripts/global-spec.js
-- spec/javascripts/speech-bubble-renderer-spec.js
-- spec/teaspoon_env.rb
-- spec/helpers/exercise_input_helper_spec.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/helpers/with_navigation_spec.rb
+- spec/javascripts/gamification-spec.js
+- spec/controllers/users_api_controller_spec.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/exam_registrations_controller_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/exam_authorization_requests_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/certificates_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/discussions_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/api_helper.rb
+- spec/capybara_helper.rb
 - spec/helpers/authors_helper_spec.rb
+- spec/helpers/exercise_input_helper_spec.rb
+- spec/helpers/avatar_helper_spec.rb
 - spec/helpers/certificate_helper_spec.rb
-- spec/helpers/email_helper_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
 - spec/helpers/with_choices_spec.rb
-- spec/helpers/avatar_helper_spec.rb
+- spec/helpers/with_navigation_spec.rb
+- spec/helpers/email_helper_spec.rb
+- spec/helpers/user_activity_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/application_helper_spec.rb
 - spec/helpers/icons_helper_spec.rb
 - spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/breadcrumbs_helper_spec.rb