mumuki-laboratory 7.8.0 → 7.10.1

data/app/controllers/application_controller.rb

@@ -93,7 +93,7 @@ class ApplicationController < ActionController::Base
   def validate_user_profile!
     unless current_user.profile_completed?
       flash.notice = I18n.t :please_fill_profile_data
-      redirect_to user_path
+      redirect_to edit_user_path
     end
   end
 

data/app/controllers/users_controller.rb

@@ -11,7 +11,7 @@ class UsersController < ApplicationController
 
   def update
     current_user.update_and_notify! user_params
-    redirect_to root_path, notice: I18n.t(:user_data_updated)
+    redirect_to user_path, notice: I18n.t(:user_data_updated)
   end
 
   def unsubscribe
@@ -21,6 +21,10 @@ class UsersController < ApplicationController
     redirect_to root_path, notice: t(:unsubscribed_successfully)
   end
 
+  def permissible_params
+    super << :avatar_id
+  end
+
   private
 
   def validate_user_profile!

data/app/helpers/application_helper.rb

@@ -6,12 +6,14 @@ module ApplicationHelper
     html_escape html.to_str
   end
 
-  def profile_picture
-    profile_picture_for current_user
+  def profile_picture_for(user, **options)
+    options.merge!(height: 40, onError: "this.onerror = null; this.src = '#{image_url(user.placeholder_image_url)}'")
+    avatar_image(user.profile_picture, options)
   end
 
-  def profile_picture_for(user, height = 40)
-    image_tag(user.profile_picture, height: height, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
+  def avatar_image(avatar_url, **options)
+    options.merge!(class: "img-circle #{options[:class]}")
+    image_tag(image_url(avatar_url), options)
   end
 
   def paginate(object, options = {})

data/app/helpers/avatar_helper.rb

@@ -0,0 +1,9 @@
+module AvatarHelper
+  def avatars_for(user)
+    (Avatar.with_current_audience_for(user) + [user.avatar]).compact.uniq
+  end
+
+  def show_avatar_item(item)
+    avatar_image(item.image_url, alt: item.description, 'mu-avatar-id': item.id, class: 'mu-avatar-item')
+  end
+end

data/app/helpers/discussions_helper.rb

@@ -48,8 +48,8 @@ module DiscussionsHelper
     {status: :solved, sort: :upvotes_count_desc}
   end
 
-  def user_avatar(user, image_class = '')
-    image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
+  def user_avatar(user, image_class='')
+    profile_picture_for(user, class: image_class)
   end
 
   def discussions_link_with_teaser(item)

data/app/helpers/profile_helper.rb

@@ -0,0 +1,5 @@
+module ProfileHelper
+  def edit_profile_button
+    link_to t(:edit_profile), edit_user_path, class: 'btn btn-success'
+  end
+end

data/app/mailers/user_mailer.rb

@@ -2,7 +2,7 @@ class UserMailer < ApplicationMailer
   def welcome_email(user, organization)
     with_locale(user, organization) do
       organization_name = organization.display_name || t(:your_new_organization)
-      build_email t(:welcome, name: organization_name), { inline: organization.welcome_email_template }
+      build_email t(:welcome, name: organization_name), { inline: organization.welcome_email_template }, from: organization.welcome_email_sender
     end
   end
 
@@ -28,10 +28,10 @@ class UserMailer < ApplicationMailer
 
   private
 
-  def build_email(subject, template)
-    mail to: @user.email,
-         subject: subject,
-         content_type: 'text/html',
-         body: render(template)
+  def build_email(subject, template, **options)
+    mail options.compact.merge(to: @user.email,
+                               subject: subject,
+                               content_type: 'text/html',
+                               body: render(template))
   end
 end

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

@@ -47,6 +47,7 @@
 <%= hidden_field_tag default_content_tag_id(@exercise), @default_content %>
 <%= hidden_field_tag "mu-exercise-id", @exercise.id %>
 <%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
+<%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">

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

@@ -12,8 +12,7 @@
 
 <% if !loads_more_assets && show_loading_for?(language, assets_kind) %>
   <script id="<%= assets_kind %>-loading-script">
-    let assetsKind = '<%= assets_kind %>';
-    mumuki.load(() => mumuki.assetsLoaderFor(assetsKind));
+    mumuki.load(() => mumuki.assetsLoaderFor('<%= assets_kind %>'));
   </script>
 <% end %>
 

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

@@ -28,7 +28,7 @@
           </div>
           <div class="dropdown">
             <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
-              <%= profile_picture %>
+              <%= profile_picture_for current_user %>
             </span>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>

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

@@ -0,0 +1,16 @@
+<div class="modal fade" id="mu-avatar-picker" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span></button>
+        <div class="modal-title">
+          <h3 class="text-left" id="gridSystemModalLabel"><%= t :choose_your_avatar %> </h3>
+        </div>
+      </div>
+      <div class="modal-body">
+        <%= render partial: 'avatar_list' %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="mu-avatar-list">
+    <% avatars_for(@user).sort_by(&:id).each do |avatar| %>
+      <%= show_avatar_item(avatar) %>
+    <% end %>
+
+    <% if @user.image_url %>
+      <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image' %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,22 @@
+<%= form_for :user, url: update_user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
+  <div class="mu-user-header">
+    <h1><%= t(:edit_profile) %></h1>
+    <div class="mu-profile-actions">
+      <%= link_to t(:cancel), :back, class: 'btn btn-default' if @user.profile_completed? %>
+      <%= f.submit t(:save), disabled: true, class: 'btn btn-success', id: 'mu-edit-profile-btn' %>
+    </div>
+  </div>
+  <div class="row mu-tab-body">
+    <div class="col-md-4 text-center">
+      <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+      <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon"></i>
+    </div>
+    <div class="col-md-8">
+      <%= render partial: 'profile_fields', locals: {form: f} %>
+    </div>
+  </div>
+<% end %>
+
+<%= content_for :no_container do %>
+  <%= render partial: 'layouts/modals/avatar_picker' %>
+<% end %>

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

@@ -1,11 +1,24 @@
-<%= form_for :user, url: update_user_path, method: :put do |f| %>
-  <div class="row mu-tab-body">
-    <div class="col-md-4 text-center">
-      <%= image_tag @user.profile_picture, size: '250x250', class: 'img-circle' %>
+<div class="mu-user-header">
+  <h1><%= @user.name %></h1>
+  <div class="mu-profile-actions">
+    <%= edit_profile_button %>
+  </div>
+</div>
+<div class="row mu-tab-body">
+  <div class="col-md-4 text-center">
+    <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
+  </div>
+  <div class="col-md-8 mu-profile-info">
+    <% if @user.age.present? %>
+      <div>
+        <span> <strong><%= t :age %>:</strong> <%= "#{@user.age} #{t :years}" %> </span>
+      </div>
+    <% end %>
+    <div>
+      <span> <strong><%= t :email %>:</strong> <%= @user.email %> </span>
     </div>
-    <div class="col-md-8">
-      <%= render partial: 'profile_fields', locals: {form: f} %>
-      <div><%= f.submit t(:save), class: 'btn btn-success btn-block' %></div>
+    <div>
+      <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
     </div>
   </div>
-<% end %>
+</div>

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

@@ -0,0 +1,5 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @user %>
+<% end %>
+
+<%= render partial: 'edit_user_form' %>

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

@@ -2,10 +2,6 @@
     <%= breadcrumbs @user %>
 <% end %>
 
-<div>
-  <h1><%= @user.name %></h1>
-</div>
-
 <ul class="nav nav-tabs" role="tablist">
   <li role="presentation" class="active">
     <a data-target="#info" aria-controls="info" role="tab" data-toggle="tab"><%= t :profile %></a>

data/config/routes.rb

@@ -52,7 +52,7 @@ Rails.application.routes.draw do
     resources :exams, only: :show
 
     # All users
-    resource :user, only: :show
+    resource :user, only: [:show, :edit]
 
     # Current user
     resources :messages, only: [:index, :create]

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

@@ -3,23 +3,23 @@ es:
   datetime:
     distance_in_words:
       about_x_hours:
-        one: Alrededor de 1 hora
-        other: Alrededor de %{count} horas
+        one: aproximadamente una hora
+        other: aproximadamente %{count} horas
       about_x_months:
-        one: Alrededor de 1 mes
-        other: Alrededor de %{count} meses
+        one: aproximadamente un mes
+        other: aproximadamente %{count} meses
       less_than_x_minutes:
-        one: Hace menos de 1 minuto
-        other: Hace menos de %{count} minutos
+        one: menos de un minuto
+        other: menos de %{count} minutos
       x_days:
-        one: Hace 1 dia
-        other: Hace %{count} dias
+        one: un día
+        other: '%{count} días'
       x_minutes:
-        one: Hace 1 minuto
-        other: Hace %{count} minutos
+        one: un minuto
+        other: '%{count} minutos'
       x_months:
-        one: Hace 1 mes
-        other: Hace %{count} meses
+        one: un mes
+        other: '%{count} meses'
       x_seconds:
-        one: Hace 1 segundo
-        other: Hace %{count} segundos
+        one: un segundo
+        other: '%{count} segundos'

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

@@ -7,6 +7,7 @@ en:
   actions: Actions
   activity: Activity
   actual_state: Obtained board
+  age: Age
   all: All
   appendix: "Appendix"
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
@@ -28,11 +29,13 @@ en:
   bibliotheca_ui: Bibliotheca
   birthdate: Birthdate
   blocked_forum_explanation: You are not allowed to see this content. <br> Are you in the middle of an exam right now?
+  cancel: Cancel
   cancel_subscription: Cancel your subscription.
   chapter: Chapter
   chapters: Chapters
   chapter_finished_html: You have finished %{chapter}!
   chapter_number: Chapter %{number}
+  choose_your_avatar: Choose your avatar
   classroom_ui: Classroom
   clear_console: Clear console
   closed: Closed
@@ -65,6 +68,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_profile: Edit profile
   editor_placeholder: "write your solution here..."
   email: Email
   error_description: This is known as a <span class="error-link">%{error}</span>.
@@ -187,6 +191,7 @@ en:
   processing_your_solution: We are processing you solution
   profile: Profile
   profile_of: Profile of %{username}
+  programming_since: Started programming
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
@@ -267,6 +272,7 @@ en:
   welcome: Welcome to %{name}!
   working: "Working"
   wrong_answer: The answer is wrong
+  years: years old
   you_must_sign_in_before_submitting: You must sign in before submitting your solutions
   you_never_submitted_solutions: It seems that you've never submitted solutions since you created your account.
   your_new_organization: your new organization

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

@@ -7,6 +7,7 @@ es:
   actions: Acciones
   activity: Actividad
   actual_state: Tablero obtenido
+  age: Edad
   all: Todos
   and: y
   appendix: "Apéndice"
@@ -29,11 +30,13 @@ es:
   bibliotheca_ui: Biblioteca
   birthdate: Fecha de nacimiento
   blocked_forum_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que estés en medio de un examen?
+  cancel: Cancelar
   cancel_subscription: Cancelá tu subscripción.
   chapter: Capítulo
   chapters: Capítulos
   chapter_finished_html: ¡Terminaste %{chapter}! ¡Felicitaciones!
   chapter_number: 'Capítulo %{number}'
+  choose_your_avatar: Elegí tu avatar
   classroom_ui: Aula
   clear_console: Reiniciar consola
   closed: Cerrada
@@ -72,6 +75,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_profile: Editar perfil
   editor_placeholder: "...escribí tu solución acá..."
   email: Email
   error_description: ¡Ups! <br> Esto es lo que se conoce como <span class="error-link">%{error}</span>.
@@ -204,6 +208,7 @@ es:
   processing_your_solution: Estamos procesando tu solución
   profile: Perfil
   profile_of: Perfil de %{username}
+  programming_since: Programando desde
   progress: Progreso
   read: Leido
   read_messages: Ver mensajes
@@ -288,13 +293,14 @@ es:
   view_details: Ver detalles
   want_permissions: El siguiente usuario requiere permisos
   we_miss_you: ¡Te extrañamos!
-  welcome: Te damos la bienvenida a %{name}!
+  welcome: ¡Te damos la bienvenida a %{name}!
   will_paginate:
     previous_label: "&#8592; Anterior"
     next_label: "Siguiente &#8594;"
     page_gap: "&hellip;"
   working: "Procesando"
   wrong_answer: La respuesta no es correcta
+  years: años
   you_must_sign_in_before_submitting: Tenés que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.
   your_new_organization: tu nueva organización

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

@@ -7,6 +7,7 @@ pt:
   actions: Ações
   activity: Atividade
   actual_state: Tablero obtido
+  age: Idade
   all: Todos
   and: e
   appendix: Apêndice
@@ -29,10 +30,12 @@ pt:
   bibliotheca_ui: Biblioteca
   birthdate: Fecha de nacimiento
   blocked_forum_explanation: Você não tem permissão para ver este conteúdo. <br> Você está no meio de um exame agora?
+  cancel: Cancelar
   chapter: Capítulo
   chapters: Capítulos
   chapter_finished_html: Você terminou %{chapter}! Parabéns!
   chapter_number: Capítulo %{number}
+  choose_your_avatar: Escolha seu avatar
   classroom_ui: Sala de aula
   clear_console: Reiniciar o console
   closed: Fechado
@@ -68,6 +71,7 @@ pt:
   discussions: Consultas
   download: Faça o download do que você fez
   edit: Editar
+  edit_profile: Editar perfil
   editor_placeholder: ... Escreva sua solução aqui ...
   email: E-mail
   error_description: Opa! <br> Isto é o que é conhecido como <span class = "error-link"> %{error} </ span>.
@@ -195,6 +199,7 @@ pt:
   processing_your_solution: Estamos processando sua solução
   profile: Perfil
   profile_of: Perfil de %{username}
+  programming_since: Sou programador
   progress: Progresso
   read: Ler
   read_messages: Ver mensagens
@@ -270,5 +275,6 @@ pt:
   welcome: Convidamos você a {name}!
   working: Processamento
   wrong_answer: A resposta não é correta
+  years: anos
   you_must_sign_in_before_submitting: Você deve fazer o login antes de começar a enviar suas soluções
   your_new_organization: sua nova organização

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.8.0'
+    VERSION = '7.10.1'
   end
 end

data/spec/dummy/db/schema.rb

@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(version: 20200804191643) do
     t.bigint "organization_id"
     t.datetime "submitted_at"
     t.bigint "parent_id"
+    t.integer "top_submission_status"
     t.index ["exercise_id"], name: "index_assignments_on_exercise_id"
     t.index ["organization_id"], name: "index_assignments_on_organization_id"
     t.index ["parent_id"], name: "index_assignments_on_parent_id"
@@ -54,6 +55,7 @@ ActiveRecord::Schema.define(version: 20200804191643) do
   create_table "avatars", force: :cascade do |t|
     t.string "image_url"
     t.string "description"
+    t.integer "target_audience", default: 0
   end
 
   create_table "books", id: :serial, force: :cascade do |t|
@@ -309,6 +311,7 @@ ActiveRecord::Schema.define(version: 20200804191643) do
     t.text "theme", default: "{}", null: false
     t.text "profile", default: "{}", null: false
     t.integer "progressive_display_lookahead"
+    t.integer "target_audience", default: 0
     t.boolean "incognito_mode_enabled"
     t.index ["book_id"], name: "index_organizations_on_book_id"
     t.index ["name"], name: "index_organizations_on_name", unique: true
@@ -364,6 +367,14 @@ ActiveRecord::Schema.define(version: 20200804191643) do
     t.index ["parent_item_type", "parent_item_id"], name: "index_usages_on_parent_item_type_and_parent_item_id"
   end
 
+  create_table "user_stats", force: :cascade do |t|
+    t.integer "exp", default: 0
+    t.bigint "user_id"
+    t.bigint "organization_id"
+    t.index ["organization_id"], name: "index_user_stats_on_organization_id"
+    t.index ["user_id"], name: "index_user_stats_on_user_id"
+  end
+
   create_table "users", id: :serial, force: :cascade do |t|
     t.string "provider"
     t.string "social_id"