mumuki-laboratory 6.7.7 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b96e3b8082bef01d50a2404ca348fbdf6857a4d8bbcd1d7691968b81899cca
-  data.tar.gz: 875a4c259fe0fa99d06184aa55d73095d55565be8c7a71a714d466d4c6393618
+  metadata.gz: 1c6b1188abd55b6cc2e7513c01c50752084996a25766f20e91cedc311a4cc7d9
+  data.tar.gz: a871f5ae58b6ed062e4717479eac69939e21b72c60031685d51e1d8be8e8931e
 SHA512:
-  metadata.gz: df091d3aa1279f000fb0548a9de42167d71a8145f4a67f740542740e305e51a26fe1d848ba6b5c44c6c10a5343549bd3115fe16d9dcf24e9b9ce261586b97594
-  data.tar.gz: 70c642ce217b333880c5862e249ee18965cc570598176e56f8e4e342867044be9df15d7f57a6ad12bf98900a188211d8fdb491071d1cc21fe2911b1009c37c3d
+  metadata.gz: 77ecc43fcd8055f1758d657e0c99e9df742e5e74b53dbcb25beeda2e037782b18172eca551a89c37bf0d50ba6a65e302c3bfbabea36f5d97ae9ed5aeb9faa2a4
+  data.tar.gz: 3801ccbeccdba0c2c0698f8efeced34482031c2269e4cdc9ad03432e345793eeedb05937dd4cbc7bc9d192b44062ad9082ff9753b1be2401cc14c5f1bc31fb3a

data/README.md

@@ -220,7 +220,7 @@ Before using the API, you must create an `ApiClient` using `rails c`, which will
 
 Before using the API, take a look to the roles hierarchy:
 
-![roles hierarchy](https://yuml.me/diagram/plain/class/[Owner]%5E-[Janitor],[Owner]%5E-[Moderator],%20[Janitor]%5E-[Headmaster],%20[Headmaster]%5E-[Teacher],%20[Teacher]%5E-[Student],%20,%20[Owner]%5E-[Editor],%20[Editor]%5E-[Writer]).
+![roles hierarchy](https://yuml.me/diagram/plain/class/[Admin]%5E-[Janitor],[Admin]%5E-[Moderator],%20[Janitor]%5E-[Headmaster],%20[Headmaster]%5E-[Teacher],%20[Teacher]%5E-[Student],%20,%20[Admin]%5E-[Editor],%20[Editor]%5E-[Writer],%20[Owner]%5E-[Admin]).
 
 Permissions are bound to a scope, that states in which context the operation can be performed. Scopes are simply two-level contexts, expressed as slugss `<first>/<second>`, without any explicit semantic. They exact meaning depends on the role:
 
@@ -229,6 +229,7 @@ Permissions are bound to a scope, that states in which context the operation can
   * writer and editor: `organization/content`
   * janitor: `organization/_`
   * moderator: `organization/_`
+  * admin: `_/_`
   * owner: `_/_`
 
 ### Users
@@ -422,7 +423,7 @@ DELETE /course/:id/teachers/:uid
 
 #### Destroy single user
 
-**Minimal permission**: `owner`
+**Minimal permission**: `admin`
 
 ```
 DELETE /users/:uid
@@ -454,7 +455,7 @@ DELETE /organization/:id/courses/:id
 
 #### Destroy single course
 
-**Minimal permission**: `owner`
+**Minimal permission**: `admin`
 
 ```
 DELETE /courses/:id
@@ -543,7 +544,7 @@ post /organizations
 ```
 ... with at least the required fields.
 
-**Minimal permission**: `owner` of that organization
+**Minimal permission**: `admin` of that organization
 
 #### Update organization
 
@@ -552,7 +553,7 @@ put /organizations/:name
 ```
 ... with a partial update.
 
-**Minimal permission**: `owner` of `:name`
+**Minimal permission**: `admin` of `:name`
 
 
 ## Authentication Powered by Auth0

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

@@ -6,11 +6,16 @@ var mumuki = mumuki || {};
     var currentTime = Date.now();
     var diffTime = endTime - currentTime;
     var duration = moment.duration(diffTime, 'milliseconds');
-    var interval = 1000;
+    var intervalDuration = 1000;
 
-    setInterval(function () {
-      duration = moment.duration(duration - interval, 'milliseconds');
-      $('#timer').text(duration.hours() + ":" + duration.minutes() + ":" + duration.seconds())
-    }, interval);
+    var interval = setInterval(function () {
+      duration = moment.utc(duration - intervalDuration);
+      if(duration.valueOf() <= 0) {
+        clearInterval(interval);
+        window.location.reload();
+      } else {
+        $('#timer').text(duration.format("HH:mm:ss"));
+      }
+    }, intervalDuration);
   };
 })(mumuki);

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

@@ -22,3 +22,4 @@
 @import "modules/kids_results";
 @import "modules/discussion";
 @import "modules/popover";
+@import "modules/datepicker";

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

@@ -0,0 +1,10 @@
+input[type="date"] {
+  &::-webkit-clear-button {
+    display: none;
+  }
+
+  &::-webkit-inner-spin-button {
+    display: none;
+  }
+}
+

data/app/controllers/api/organizations_controller.rb

@@ -3,7 +3,7 @@ module Api
     include OrganizationsControllerTemplate
 
     before_action :authorize_janitor!, only: [:show, :index]
-    before_action :authorize_owner!, only: [:update, :create]
+    before_action :authorize_admin!, only: [:update, :create]
 
     def index
       render json: { organizations: Organization.accessible_as(current_user, :janitor) }

data/app/controllers/application_controller.rb

@@ -67,9 +67,10 @@ class ApplicationController < ActionController::Base
   end
 
   def validate_user_profile!
-    return if !current_user.has_student_granted_organizations? || current_user.profile_completed?
-    flash.notice = I18n.t :please_fill_profile_data
-    redirect_to user_path
+    unless current_user.profile_completed?
+      flash.notice = I18n.t :please_fill_profile_data
+      redirect_to user_path
+    end
   end
 
   def set_locale!

data/app/controllers/concerns/organizations_controller_template.rb

@@ -26,9 +26,9 @@ module OrganizationsControllerTemplate
       .require(:organization)
       .permit(:book,
               :name,
-              *Mumukit::Platform::Organization::Profile.attributes,
-              *Mumukit::Platform::Organization::Theme.attributes,
-              *(Mumukit::Platform::Organization::Settings.attributes - [:login_methods]),
+              *Mumuki::Domain::Organization::Profile.attributes,
+              *Mumuki::Domain::Organization::Theme.attributes,
+              *(Mumuki::Domain::Organization::Settings.attributes - [:login_methods]),
               login_methods: [])
       .tap { |it| it.merge!(book: Book.find_by!(slug: it[:book])) if it[:book] }
   end

data/app/controllers/concerns/with_authorization.rb

@@ -5,8 +5,8 @@ module WithAuthorization
     authorize! :janitor
   end
 
-  def authorize_owner!
-    authorize! :owner
+  def authorize_admin!
+    authorize! :admin
   end
 
   def authorization_slug

data/app/controllers/invitations_controller.rb

@@ -1,6 +1,10 @@
 class InvitationsController < ApplicationController
   before_action :authenticate!
   before_action :set_invitation!
+  before_action :set_user!
+
+  skip_before_action :validate_user_profile!
+  skip_before_action :authorize_if_private!
 
   def show
     redirect_to_organization! if current_user.student_of? @invitation.course
@@ -13,10 +17,6 @@ class InvitationsController < ApplicationController
     redirect_to_organization!
   end
 
-  def authorize_if_private!
-    # This controller must never be authenticated
-  end
-
   private
 
   def redirect_to_organization!
@@ -31,4 +31,8 @@ class InvitationsController < ApplicationController
     @invitation = Invitation.locate!(params[:code]).unexpired
     @organization = @invitation.organization
   end
+
+  def set_user!
+    @user = current_user
+  end
 end

data/app/controllers/users_controller.rb

@@ -25,7 +25,7 @@ class UsersController < ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:first_name, :last_name)
+    params.require(:user).permit(User.profile_fields)
   end
 
   def set_user!

data/app/helpers/menu_bar_helper.rb

@@ -23,7 +23,10 @@ module MenuBarHelper
   def link_to_application(icon, app_name, minimal_permissions)
     return unless current_user&.send(minimal_permissions)
     url = url_for_application(app_name)
+    menu_item icon, app_name, url
+  end
 
-    link_to fixed_fa_icon(icon, text: t(app_name)), url, role: 'menuitem', tabindex: '-1'
+  def menu_item(icon, name, url)
+    link_to fixed_fa_icon(icon, text: t(name)), url, role: 'menuitem', tabindex: '-1'
   end
 end

data/app/views/errors/gone.html.erb

@@ -1,6 +1,6 @@
 <%= render layout: 'layouts/error' do %>
     <div class="header">
-      <img src="/astor.png">
+      <img class="error-code-img" src="/error/410.svg">
     </div>
     <div class="body">
       <p>

data/app/views/invitations/_invitation_form.html.erb

@@ -0,0 +1,23 @@
+<%= form_for current_user, method: 'post', url: {action: 'join'} do |f| %>
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="info">
+      <div class="row mu-tab-body">
+        <div class="col-md-12">
+          <%= render partial: 'users/profile_fields', locals: {form: f} %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <% if @organization.terms_of_service.present? %>
+    <div>
+      <h3><%= t :terms_and_conditions %></h3>
+      <pre class="terms-of-service"><%= simple_format @organization.terms_of_service %></pre>
+      <div>
+        <input id="accept_terms" type="checkbox"> <span><%= t :accept_terms %></span>
+      </div>
+    </div>
+  <% end %>
+  <div>
+    <%= f.submit t(:confirm), id: 'confirm_data', class: 'btn btn-success', disabled: @organization.terms_of_service.present? %>
+  </div>
+<% end %>

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

@@ -7,45 +7,7 @@
 <div>
   <span><%= t :please_validate %></span>
 </div>
-
-<%= form_for current_user, method: 'post', url: {action: 'join'} do |f| %>
-
-    <div class="tab-content">
-      <div role="tabpanel" class="tab-pane active" id="info">
-        <div class="row mu-tab-body">
-          <div class="col-md-12">
-            <fieldset class="form-group"> 
-              <div><%= f.label(t :first_name) %></div>
-              <div><%= f.text_field :first_name, class: 'form-control' %></div>
-            </fieldset>
-            <fieldset class="form-group"> 
-              <div><%= f.label(t :last_name) %></div>
-              <div><%= f.text_field :last_name, class: 'form-control' %></div>
-            </fieldset>
-            <fieldset class="form-group"> 
-              <div><%= f.label(t :email) %></div>
-              <div><%= f.text_field :email, class: 'form-control' %></div>
-            </fieldset>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div>
-      <h3><%= t :terms_and_conditions %></h3>
-
-      <pre class="terms-of-service"><%= simple_format @organization.terms_of_service %></pre>
-
-      <div class="col-md-10">
-        <input id="accept_terms" type="checkbox"> <span><%= t :accept_terms %></span>
-      </div>
-      <div class="col-md-1">
-        <%= f.submit t(:confirm), id: 'confirm_data', class: 'btn btn-success', disabled: true %>
-      </div>
-    </div>
-
-<% end %>
-
+<%= render partial: 'invitation_form' %>
 <script>
   $('#accept_terms').click(function () {
     $("#confirm_data").prop('disabled', function (i, value) {

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

@@ -0,0 +1,20 @@
+<fieldset class="form-group">
+  <div><%= form.label(t :first_name) %></div>
+  <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset class="form-group">
+  <div><%= form.label(t :last_name) %></div>
+  <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset class="form-group">
+  <div><%= form.label(t :gender) %></div>
+  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset class="form-group">
+  <div><%= form.label(t :birthdate) %></div>
+  <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
+</fieldset>
+<fieldset class="form-group">
+  <div><%= form.label(t :email) %></div>
+  <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
+</fieldset>

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

@@ -0,0 +1,11 @@
+<%= 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.image_url, size: '250x250', class: 'img-circle' %>
+    </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>
+  </div>
+<% end %>

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

@@ -25,29 +25,7 @@
 
 <div class="tab-content">
   <div role="tabpanel" class="tab-pane active" id="info">
-    <%= 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.image_url, size: '250x250', class: 'img-circle' %>
-          </div>
-          <div class="col-md-8">
-            <fieldset class="form-group">
-              <div><%= f.label(t :first_name) %></div>
-              <div><%= f.text_field :first_name, class: 'form-control' %></div>
-            </fieldset>
-            <fieldset class="form-group">
-              <div><%= f.label(t :last_name) %></div>
-              <div><%= f.text_field :last_name, class: 'form-control' %></div>
-            </fieldset>
-            <fieldset class="form-group">
-              <div><%= f.label(t :email) %></div>
-              <div><%= f.text_field :email, readonly: true, class: 'form-control' %></div>
-            </fieldset>
-            <br>
-            <div><%= f.submit t(:save), class: 'btn btn-success btn-block' %></div>
-          </div>
-        </div>
-    <% end %>
+    <%= render partial: 'user_form' %>
   </div>
   <div role="tabpanel" class="tab-pane" id="organizations">
     <div class="row mu-tab-body">

data/config/routes.rb

@@ -79,7 +79,7 @@ Rails.application.routes.draw do
 
 
     namespace :api do
-      organization_regexp = Regexp.new Mumukit::Platform::Organization::Helpers.valid_name_regex
+      organization_regexp = Regexp.new Mumukit::Platform::Organization.valid_name_regex
       uid_regexp = /[^\/]+/
 
       resources :users, only: [:create, :update],  constraints: {id: uid_regexp}

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

@@ -24,6 +24,7 @@ en:
   authoring_note_with_collaborators_html: This guide's content was developed by %{authors} and <a href="%{collaborators}" target="_blank">many others</a>, under the terms of <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons License Share-Alike, 4.0</a>
   back_to_mumuki: Back to Mumuki!
   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_subscription: Cancel your subscription.
   chapter: Chapter
@@ -79,9 +80,11 @@ en:
   explain_redirect: You have registered in another organization
   failed: Oops, something went wrong
   feedback: Feedback
+  female: Female
   finish: Finish
   first_name: First Name
   forbidden_explanation: You are not allowed to see this content.
+  gender: Gender
   go_to: 'Go to %{organization}'
   gone_explanation: This exam is no longer available.
   guide: Guide
@@ -110,6 +113,7 @@ en:
   lesson_number: Lesson %{number}
   let_us_know: please let us know!
   load_solution_into_console: Load your solution into the console
+  male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
   message_count:
     one: 1 message
@@ -147,6 +151,7 @@ en:
   office: Office
   opened: Open
   opened_count: '%{count} opened'
+  other: Other
   out_of_attempts: You've run out of attempts. You should proceed to the next exercise!
   output: Output
   overview: Overview

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

@@ -26,6 +26,7 @@ es:
   authoring_note_with_collaborators_html: Esta guía fue desarrollada por %{authors} y <a href="%{collaborators}" target="_blank">muchas personas más</a>, bajo los términos de la <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Licencia Creative Commons Compartir-Igual, 4.0</a>.
   back_to_mumuki: ¡Volvé a Mumuki!
   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_subscription: Cancelá tu subscripción.
   chapter: Capítulo
@@ -87,9 +88,11 @@ es:
   explain_redirect: Notamos que te registraste en otra organización.
   failed: Tu solución no pasó las pruebas
   feedback: Problemas que encontramos
+  female: Mujer
   finish: Terminar
   first_name: Nombre
   forbidden_explanation: Es decir que no tenés autorización para ver este contenido. <br> ¿Puede que hayas ingresado con una cuenta incorrecta?
+  gender: Género
   go_to: 'Ir a %{organization}'
   gone_explanation: ¡Ups! Esto es lo que se conoce como %{error}, es decir que ya no podés ver este examen.
   guide: Lección
@@ -122,6 +125,7 @@ es:
   lesson_number: Lección %{number}
   let_us_know: ¡Por favor avisanos!
   load_solution_into_console: Cargar la solución en la consola
+  male: Hombre
   manual_evaluation_pending: ¡Gracias por enviar tu solución! Tus docentes la corregirán pronto
   message_count:
     one: 1 mensaje
@@ -166,6 +170,7 @@ es:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
+  other: Otro
   out_of_attempts: Te quedaste sin intentos. ¡Seguí al proximo ejercicio!
   output: Salida
   overview: Vista general

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

@@ -25,6 +25,7 @@ pt:
   authoring_note_with_collaborators_html: 'Este guia foi desenvolvido por %{authors} e <a href="%{collaborators}" target="_blank">muitas outras pessoas </a>, nos termos do <a href = "https://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> Creative Commons License Share-Equal, 4.0 </a>.'
   back_to_mumuki: Voltei para Mumuki!
   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?
   chapter: Capítulo
   chapter_finished_html: Você terminou %{chapter}! Parabéns!
@@ -82,10 +83,12 @@ pt:
   explain_redirect: Percebemos que você se registrou em outra organização.
   failed: Sua solução não passou as provas
   feedback: Problemas que encontramos
+  female: Feminino
   finish: Terminar
   first_name: Nome
   forbidden_explanation: Isso significa que você não tem autorização para ver esse conteúdo. <br> Você poderia ter entrado com uma conta incorreta?
   fullscreen: Tela completa
+  gender: Gênero
   get_messages: Ver mensagens
   go_to: Vá para %{organization}
   gone_explanation: Opa! Isto é o que é conhecido como %{error}, ou seja, você não pode mais ver esse exame.
@@ -117,6 +120,7 @@ pt:
   lesson_number: Lição %{number}
   let_us_know: Por favor, avise-nos!
   load_solution_into_console: Carregue a solução no console
+  male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
       one: 1 mensagem
@@ -158,6 +162,7 @@ pt:
   opened: Aberto
   opened_count: '%{count} aberto'
   organizations: Organizações
+  other: Outro
   out_of_attempts: Você ficou sem tentativas. Você deve prosseguir para o próximo exercício!
   output: Sair
   overview: Visão global