mumuki-laboratory 7.11.1 → 7.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903851981f51f22780009e65ff573bddce2b56e08beb8275fa72697234d28677
-  data.tar.gz: b3b792488e50dda3738fcf4ad0927f18ad3648c240d2391d77504b823ae6a8d2
+  metadata.gz: f6139ebdb5d0f4a7148fb6fd64c07a2b7c28ea534fdafe4593cb185ab2b95371
+  data.tar.gz: cea3b7ec16acc73e48a58a9257194a22ad5cf6c46e4dc0530d2b2a92c93dc0cd
 SHA512:
-  metadata.gz: b2d82a1055c55db3410f36e594932c9f8a17e3ae2cd145c844066e3897018f2699fa1b399b5ca26dd96f772a356c509e7153c41f0ed635fec34e7f8499b0770e
-  data.tar.gz: 891fd97d04e4192d74b6b96990c481064f431eadb0a27a4b828ac660f24f11263c1f07fdf99f246a6a14f16b35aef6a21783bda98c1d67d78b94ce5f369aaaea
+  metadata.gz: 95b409773eb897492565a17980ae66cb30e8fbb341edc2034b83d01f117b1f6d6ac1a47c7367179cbf67c430b3c02208c2bda9e5dbc347cd19e3de91ee4d3543
+  data.tar.gz: d58e05c853128d3d12b188160066231494945cc571704b588899f4bf61a88b69054d7c50ffca51478328a39110cc346f24008dbccdd907c22a197515a60987b9

data/README.md

@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/mumuki/mumuki-laboratory.svg?branch=master)](https://travis-ci.org/mumuki/mumuki-laboratory)
+[![Build Status](https://travis-ci.com/mumuki/mumuki-laboratory.svg?branch=master)](https://travis-ci.com/mumuki/mumuki-laboratory)
 [![Code Climate](https://codeclimate.com/github/mumuki/mumuki-laboratory/badges/gpa.svg)](https://codeclimate.com/github/mumuki/mumuki-laboratory)
-[![Test Coverage](https://codeclimate.com/github/mumuki/mumuki-laboratory/badges/coverage.svg)](https://codeclimate.com/github/mumuki/mumuki-laboratory)
 [![Issue Count](https://codeclimate.com/github/mumuki/mumuki-laboratory/badges/issue_count.svg)](https://codeclimate.com/github/mumuki/mumuki-laboratory)
 
 <img width="60%" src="https://raw.githubusercontent.com/mumuki/mumuki-laboratory/master/laboratory-screenshot.png"></img>

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

@@ -118,9 +118,10 @@ mumuki.load(() => {
         mumuki.kids._showOnSuccessPopup(data);
         $('#kids-results .modal-content').addClass(data.status);
       },
-      _showOnFailurePopup() {
-        mumuki.kids.submitButton.disable();
+      _showOnFailurePopup(data) {
         mumuki.kids._getResultsAbortedModal().modal();
+        $('#kids-results-aborted .modal-header').html(data.title_html);
+        $('#kids-results-aborted .modal-content').addClass(data.status);
         mumuki.presenterCharacter.playAnimation('failure', mumuki.kids._getCharacterImage());
       }
     }

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -83,6 +83,10 @@ mumuki.SubmissionsStore = (() => {
       return this.submissionSolutionContent(one) === this.submissionSolutionContent(other);
     }
 
+    clear() {
+      window.localStorage.clear();
+    }
+
     // private API
 
     _asString(object) {
@@ -96,3 +100,11 @@ mumuki.SubmissionsStore = (() => {
 
   return SubmissionsStore;
 })();
+
+mumuki.load(() => {
+  $('.mu-restart-guide').on("confirm:complete", (e) => {
+    if (e.detail[0]) {
+      mumuki.SubmissionsStore.clear();
+    }
+  })
+})

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

@@ -24,6 +24,7 @@
 @import "modules/popover";
 @import "modules/progress_bar";
 @import "modules/progress_listing";
+@import "modules/terms";
 @import "modules/timer";
 @import "modules/upload";
 @import "modules/user_profile";

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

@@ -214,6 +214,9 @@ $modal-footer-height: 95px;
   .modal-body{
     height: calc(100% - #{$modal-header-height});
   }
+  h4.modal-header {
+    margin: 0;
+  }
 }
 
 $bubble-border-width: 3px;

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

@@ -0,0 +1,44 @@
+summary.terms-summary {
+  font-size: 29px;
+  outline: 0;
+  cursor: pointer;
+  .terms-summary-title {
+    display: inline;
+  }
+}
+
+.terms-card {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border: 1px solid rgba(0,0,0,.125);
+  border-radius: .25rem;
+  &:not(:first-child) {
+    border-top: none;
+  }
+  .terms-card-header {
+    cursor: pointer;
+    font-weight: bold;
+    padding: .75rem 1.25rem;
+    margin-bottom: 0;
+    background-color: rgba(0,0,0,.03);
+    border-bottom: 1px solid rgba(0,0,0,.125);
+  }
+  &:first-child .terms-card-header{
+    border-radius: calc(.25rem - 1px) calc(.25rem - 1px) 0 0;
+  }
+}
+.terms-card-body {
+  padding: 1.25rem;
+}
+
+.terms-acceptance-btn {
+  margin-top: 10px;
+  display: block
+}

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

@@ -1,7 +1,7 @@
 class UsersController < ApplicationController
   include WithUserParams
 
-  before_action :authenticate!
+  before_action :authenticate!, except: :terms
   before_action :set_user!
 
   def show
@@ -11,9 +11,14 @@ class UsersController < ApplicationController
 
   def update
     current_user.update_and_notify! user_params
+    current_user.accept_profile_terms!
     redirect_to user_path, notice: I18n.t(:user_data_updated)
   end
 
+  def terms
+    @profile_terms ||= Term.profile_terms_for(current_user)
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!
@@ -33,4 +38,5 @@ class UsersController < ApplicationController
   def set_user!
     @user = current_user
   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, user_terms_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/organization_list_helper.rb

@@ -1,6 +1,5 @@
 module OrganizationListHelper
   def organizations_for(user)
-    # TODO use immersive contexts here
-    (user.student_granted_organizations + [Organization.central]).uniq.compact
+    user.immersive_organizations_at(nil)
   end
 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/invitations/_invitation_form.html.erb

@@ -4,6 +4,7 @@
       <div class="row mu-tab-body">
         <div class="col-md-12">
           <%= render partial: 'users/profile_fields', locals: {form: f} %>
+          <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
         </div>
       </div>
     </div>

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

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

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

@@ -0,0 +1,6 @@
+<% if user.has_profile_terms_to_accept? %>
+  <br>
+  <span>
+    <%= t(:terms_and_conditions_continue_disclaimer, terms_link: link_to_profile_terms).html_safe %>
+  </span>
+<% end %>

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

@@ -6,8 +6,7 @@
               <i class="fa fa-fw fa-times fa-3x"></i>
             </span>
       </button>
-      <h4 class="modal-header text-broken">
-        <strong><%= t :errored %></strong>
+      <h4 class="modal-header">
       </h4>
       <div class="modal-body">
         <div class="container-fluid">

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

@@ -13,6 +13,7 @@
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>
+      <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
   <div class="mu-profile-actions mobile visible-xs">

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

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

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

@@ -0,0 +1,18 @@
+<%= content_for :breadcrumbs do %>
+  <% if current_user? %>
+    <%= breadcrumbs @user %>
+  <% else %>
+    <%= header_breadcrumbs %>
+  <% end %>
+<% end %>
+
+<div class="mu-user-header">
+  <h1><%= t(:terms_and_conditions) %></h1>
+</div>
+
+<div>
+  <% @profile_terms.each do |term| %>
+    <%= render partial: 'term', locals: {term: term, collapsed: current_user&.has_accepted?(term)} %>
+  <% end %>
+</div>
+

data/config/routes.rb

@@ -12,6 +12,7 @@ Rails.application.routes.draw do
       end
     end
 
+    get '/discussions/terms' => 'book_discussions#terms'
     concerns :debatable, controller: 'book_discussions', only: :index
 
     resources :discussions, only: [] do
@@ -53,6 +54,7 @@ Rails.application.routes.draw do
 
     # All users
     resource :user, only: [:show, :edit]
+    get '/user/terms' => 'users#terms'
 
     # Current user
     resources :messages, only: [:index, :create]

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

@@ -3,7 +3,9 @@ en:
   aborted: Oops, we couldn't evaluate your solution
   abort_explanation_html: <li>Check that your program does not have recursion or an infinite loop</li> <li>Check that you have an internet connection</li> <li>Wait a while and try again</li>
   about: About
-  accept_terms: I accept the terms and conditions
+  accept: Accept
+  accept_terms: I have read and accept the terms and conditions
+  accept_terms_to_continue: Accept terms to continue
   actions: Actions
   activity: Activity
   actual_state: Obtained board
@@ -103,6 +105,8 @@ en:
   first_name: First Name
   forbidden_explanation: Please verify you have logged in with the right account
   format: Format
+  forum_terms: Forum rules
+  forum_terms_link: If you have any questions, please check %{terms_link}
   fullscreen: "Fullscreen"
   gender: Gender
   get_messages: "View messages"
@@ -244,7 +248,10 @@ en:
   teacher_info: Information for teachers
   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_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
   time_ago: "%{time} ago"
   time_left: You have

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

@@ -103,6 +103,7 @@ es-CL:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
+  forum_terms_link: Si tienes alguna duda, consulta las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -257,6 +258,8 @@ es-CL:
   tell_us_how: ¡Cuéntanos cómo te pasó esto!
   tell_us_if_our_error: Si piensas que es un error nuestro, %{issues}
   terms_and_conditions: Términos y condiciones
+  terms_and_conditions_continue_disclaimer: Al continuar aceptas los %{terms_link}
+  terms_and_conditions_must_be_accepted: Tienes que aceptar los términos y condiciones
   test_results: Resultados de las pruebas
   time_since: "hace %{time}"
   time_left: Te quedan

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

@@ -3,7 +3,9 @@ es:
   aborted: Ups, no pudimos evaluar tu solución
   abort_explanation_html: <li>Revisá que tu programa no tenga recursión o algún bucle infinito</li><li>Revisá que tengas conexión a internet</li><li>Esperá un rato e intentalo nuevamente</li>
   about: Detalles
-  accept_terms: Acepto los términos y condiciones
+  accept: Aceptar
+  accept_terms: He leido y acepto los términos y condiciones
+  accept_terms_to_continue: Para continuar es necesario aceptar los términos y condiciones
   actions: Acciones
   activity: Actividad
   actual_state: Tablero obtenido
@@ -109,6 +111,8 @@ es:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
+  forum_terms: Reglas del foro
+  forum_terms_link: Si tenés alguna duda, consultá las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -267,7 +271,10 @@ es:
   teacher_info: Información para docentes
   tell_us_how: ¡Contanos cómo te pasó esto!
   tell_us_if_our_error: Si pensás que es un error nuestro, %{issues}
+  terms_accepted: Los términos y condiciones fueron aceptados
   terms_and_conditions: Términos y condiciones
+  terms_and_conditions_continue_disclaimer: Al continuar estás aceptando los %{terms_link}
+  terms_and_conditions_must_be_accepted: Tenés que aceptar los términos y condiciones
   test_results: Resultados de las pruebas
   time_since: "hace %{time}"
   time_left: Te quedan

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

@@ -3,7 +3,9 @@ pt:
   aborted: Opa, não pudemos avaliar sua solução
   abort_explanation_html: <li>Verifique se o seu programa não possui recursão ou um loop infinito</li> <li>Verifique se você tem uma conexão com a internet</li> <li>Espere um pouco e tente novamente</li>
   about: Detalhes
-  accept_terms: Aceito os termos e condições
+  accept: Aceitar
+  accept_terms: Eu li e aceito ceito os termos e condições
+  accept_terms_to_continue: Aceite os termos e condições para continuar
   actions: Ações
   activity: Atividade
   actual_state: Tablero obtido
@@ -105,6 +107,8 @@ pt:
   first_name: Nome
   forbidden_explanation: Você poderia ter entrado com uma conta incorreta?
   format: Formato
+  forum_terms: Regras do fórum
+  forum_terms_link: Se você tiver alguma dúvida, consulte as %{terms_link}
   fullscreen: Tela completa
   gender: Gênero
   get_messages: Ver mensagens
@@ -252,7 +256,10 @@ pt:
   teacher_info: Informação para professores
   tell_us_how: Conte-nos como isso aconteceu com você!
   tell_us_if_our_error: Se você acha que é nosso erro, %{issues}
+  terms_accepted: Os termos e condições foram aceitos
   terms_and_conditions: Termos e Condições
+  terms_and_conditions_continue_disclaimer: Ao continuar, você concorda %{terms_link}
+  terms_and_conditions_must_be_accepted: Você deve aceitar os Termos e Condições
   test_results: Resultados do teste
   time_since: "há %{time}"
   time_left: Te deixam

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.11.1'
+    VERSION = '7.12.0'
   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: 20201027134205) do
+ActiveRecord::Schema.define(version: 20201027152806) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -350,6 +350,15 @@ ActiveRecord::Schema.define(version: 20201027134205) do
     t.index ["user_id"], name: "index_subscriptions_on_user_id"
   end
 
+  create_table "terms", force: :cascade do |t|
+    t.string "locale"
+    t.string "scope"
+    t.text "content"
+    t.text "header"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "topics", id: :serial, force: :cascade do |t|
     t.string "name"
     t.string "locale"
@@ -416,6 +425,14 @@ ActiveRecord::Schema.define(version: 20201027134205) do
     t.datetime "disabled_at"
     t.boolean "trusted_for_forum"
     t.string "avatar_type", default: "Avatar"
+    t.datetime "headmaster_terms_accepted_at"
+    t.datetime "janitor_terms_accepted_at"
+    t.datetime "moderator_terms_accepted_at"
+    t.datetime "student_terms_accepted_at"
+    t.datetime "teacher_terms_accepted_at"
+    t.datetime "privacy_terms_accepted_at"
+    t.datetime "legal_terms_accepted_at"
+    t.datetime "forum_terms_accepted_at"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"