mumuki-laboratory 7.6.2 → 7.7.0

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

@@ -24,7 +24,6 @@
 <% end %>
 
   <%= content_for :no_container do %>
-  <%= render partial: 'layouts/modals/new_discussion', locals: {debatable: @debatable} %>
 <% end if current_user? %>
 
 

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

@@ -0,0 +1,33 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_discussion @discussion, @debatable %>
+<% end %>
+
+<%= form_for [@debatable, @discussion] do |f| %>
+  <div>
+    <div class="discussion-context">
+      <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
+    </div>
+  </div>
+
+  <hr class="message-divider">
+
+  <%= render layout: 'discussions/message_container', locals: {user: @discussion.initiator} do %>
+    <div class="discussion-message-bubble" id="new-discussion-description-container">
+      <div class="discussion-message-bubble-header">
+        <div class="discussion-message-bubble-title">
+          <%= @discussion.initiator.name %>
+        </div>
+      </div>
+      <div class="discussion-message-bubble-content">
+        <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)} %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <%= f.submit t(:save), class: 'btn btn-success btn-block discussion-new-message-button' %>
+  <% end %>
+<% end %>

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

@@ -3,55 +3,25 @@
 <% end %>
 
 <div>
-  <div class="row">
-    <% if current_user %>
-      <div class="mu-inline-block-right hidden-xs discussion-user-menu">
-        <h3>
-          <% if @discussion.subscribable? %>
-            <a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
-              <%= fa_icon(:eye, class: 'fa-xs') %>
-              <%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion) %>
-            </a>
-          <% end %>
-          <% if @discussion.solved? %>
-            <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
-              <%= fa_icon(:star, class: 'fa-xs') %>
-              <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion) %>
-            </a>
-          <% end %>
-        </h3>
-      </div>
-    <% end %>
-    <div class="mu-inline-block-left">
-      <div class="discussion-header">
-        <h3 class="discussion-title">
-          <%= @discussion.title %>
-        </h3>
-      </div>
-      <div class="discussion-description">
-        <%= label_for_contextualization(@discussion) %> ·
-        <span class="discussion-info">
-          <span class="discussion-initiator-name">
-            <%= @discussion.initiator.name %>
-          </span>
-          <%= discussion_info(@discussion) %>
-        </span>
-      </div>
-    </div>
-  </div>
-
   <div class="discussion-context">
     <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
   </div>
-
 </div>
 
 <% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
-  <hr class="message-divider">
+  <div>
+    <h3>
+      <%= t :messages %>
+      <% if @discussion.last_moderator_access_visible_for?(current_user) %>
+        <small class="pull-right">
+          <span><%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %></span>
+          <span><%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %></span>
+        </small>
+      <% end %>
+    </h3>
+  </div>
 
-  <h3>
-    <%= t :messages %>
-  </h3>
+  <hr class="message-divider">
 
   <% if @discussion.has_messages? %>
     <div class="discussion-messages">

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

@@ -9,13 +9,40 @@
 
 <details open>
   <summary class="discussion-summary">
-    <div class="mu-inline-block-right hidden-xs">
-      <h1><%= language_icon @debatable.language %></h1>
-    </div>
     <h3 class="discussion-exercise-title">
-      <span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>:&nbsp;</span>
-      <span><%= @debatable.name %></span>
+      <span>
+        <span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>:&nbsp;</span>
+        <span><%= exercise.name %></span>
+      </span>
+      <span class="mu-inline-block-right hidden-xs">
+        <h1 class="no-margin"><%= language_icon exercise.language %></h1>
+      </span>
     </h3>
+    <div class="discussion-description">
+      <%= label_for_contextualization(@discussion, class: 'hidden-xs') %> ·
+      <span class="discussion-info">
+          <span class="discussion-initiator-name">
+            <%= @discussion.initiator.name %>
+          </span>
+        <span class="hidden-xs"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
+      </span>
+      <% if current_user && @discussion.persisted? %>
+        <span class="mu-inline-block-right discussion-user-menu no-margin">
+          <% if @discussion.subscribable? %>
+            <a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
+              <%= fa_icon(:eye, class: 'fa-xs') %>
+              <%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion), class: 'hidden-sm hidden-xs' %>
+            </a>
+          <% end %>
+          <% if @discussion.solved? %>
+            <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
+              <%= fa_icon('thumbs-o-up', class: 'fa-xs') %>
+              <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion), class: 'hidden-sm hidden-xs' %>
+            </a>
+          <% end %>
+        </span>
+      <% end %>
+    </div>
   </summary>
 
   <% if should_render_read_only_exercise_tabs?(@discussion) %>
@@ -64,7 +91,7 @@
 
         <div role="tabpanel" class="tab-pane" id="results">
           <div class="mu-tab-body">
-            <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion } do %>
+            <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion} do %>
               <div class="row">
                 <div class="col-md-12 submission-results">
                   <%= render partial: 'exercise_solutions/contextualization_results_body',

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

@@ -20,6 +20,14 @@
       <%= discussion_dropdown_filter :sort, Discussion.sorting_filters do |sorting_filter| %>
         <%= t sorting_filter %>
       <% end %>
+
+      <% if current_user&.moderator_here? %>
+        <div class="discussion-requires-attention pull-right">
+          <%= label_tag :requires_moderator_response, t(:requires_attention) %>
+          <%= check_box_tag :requires_moderator_response, true, discussion_filter_params[:requires_moderator_response], class: 'form-input', onclick: 'mumuki.Forum.discussionsToggleCheckbox($(this))' %>
+        </div>
+      <% end %>
+
     </div>
   </div>
   <% if @filtered_discussions.empty? %>
@@ -48,7 +56,17 @@
                   <span class="discussion-status-icon">
                     <%= discussion_status_fa_icon(discussion) %>
                   </span>
-                  <%= discussion.title %>
+                  <span class="hidden-sm hidden-xs"><%= discussion.exercise.friendly %></span>
+                  <span class="hidden-md hidden-lg"><%= discussion.exercise.name %></span>
+                  <% if discussion.last_moderator_access_visible_for?(current_user) %>
+                    <div class="pull-right discussion-moderator-access" >
+                      <%= profile_picture_for(discussion.last_moderator_access_by, 32) %>
+                      <span class="moderator-initials">
+                        <%= discussion.last_moderator_access_by.name_initials %>
+                      </span>
+                    </div>
+                  <% end %>
+
                 </div>
                 <span class="discussion-description">
                   <%= discussion.description %>

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

@@ -19,7 +19,7 @@
         <% else %>
           <span class="text-success mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
-            <%= test_result[:title] %>
+            <%= render_test_result_header test_result %>
           </span>
         <% end %>
 

data/app/views/layouts/exercise_inputs/editors/_custom.html.erb

@@ -4,4 +4,4 @@
 
 <%= form.hidden_field :content, id: "mu-custom-editor-value", value: @current_content %>
 <%= form.hidden_field :content_extra, id: "mu-custom-editor-extra", value: @exercise.extra %>
-<%= form.hidden_field :content, id: "mu-custom-editor-test", value: @exercise.test %>
+<%= form.hidden_field :content_test, id: "mu-custom-editor-test", value: @exercise.test %>

data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb

@@ -3,7 +3,7 @@
              html: {role: 'form', class: 'new_solution mu-editor mu-editor-overlap'}) do |f| %>
   <%= render_exercise_input_editor f, exercise %>
 
-  <div class="actions mu-kids-submit-button">
+  <div class="actions mu-submit-button mu-kids-submit-button">
     <%= render_submit_button(@assignment) %>
   </div>
   <div class="actions mu-kids-reset-button"></div>

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -33,7 +33,7 @@
                  html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap #{pending_messages_filter(@assignment)}"}) do |f| %>
       <%= render_exercise_input_editor f, exercise %>
 
-      <div class="actions">
+      <div class="actions mu-submit-button">
         <%= render_submit_button(@assignment) %>
       </div>
     <% end %>

data/app/views/layouts/exercise_inputs/layouts/_input_bottom.html.erb

@@ -4,7 +4,7 @@
   </div>
 </div>
 <div class="row">
-  <div class="col-md-12 ace-editor-col">
+  <div class="mu-exercise-content col-md-12 ace-editor-col">
     <%= yield :exercise_content %>
   </div>
 </div>

data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb

@@ -0,0 +1,40 @@
+<% content_for :no_container do %>
+
+    <div <%= turbolinks_enable_for exercise %>>
+
+      <div class="mu-kids-landscape-support container-fluid">
+        <img class="mu-kids-character-animation"/>
+        <h3><%= t :only_landscape_support %></h3>
+      </div>
+
+      <div class="mu-kids-exercise mu-kindergarten container-fluid">
+
+        <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
+          <div class="mu-kids-character">
+            <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
+          </div>
+        </div>
+        <div class="mu-kids-exercise-workspace">
+          <div class="mu-exercise-content mu-kids-blocks">
+            <%= yield :exercise_content %>
+          </div>
+          <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
+            <div class="mu-scenarios">
+              <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
+                <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
+              </div>
+              <div class="mu-kids-state mu-state-final mu-final-state">
+                <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
+              </div>
+            </div>
+            <ol class="indicators"></ol>
+          </div>
+        </div>
+      </div>
+
+      <%= render partial: 'layouts/modals/kids_results', locals: {exercise: exercise, assignment: @assignment} %>
+      <%= render partial: 'layouts/modals/kids_results_aborted' %>
+      <%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
+
+    </div>
+<% end %>

data/app/views/layouts/exercise_inputs/layouts/{_input_kids.html.erb → _input_primary.html.erb}

@@ -13,7 +13,7 @@
           <div class="mu-kids-character">
             <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
           </div>
-          <div class="mu-kids-blocks">
+          <div class="mu-exercise-content mu-kids-blocks">
             <%= yield :exercise_content %>
           </div>
         </div>

data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb

@@ -2,7 +2,7 @@
   <div class="col-md-6 exercise-assignment">
     <%= yield :assignment %>
   </div>
-  <div class="col-md-6 ace-editor-col">
+  <div class="mu-exercise-content col-md-6 ace-editor-col">
     <%= yield :exercise_content %>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="modal fade mu-kids-context" id="kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -24,10 +24,3 @@
     </div>
   </div>
 </div>
-
-<script>
-  $('#kids-context').modal({
-    backdrop: 'static',
-    keyboard: false
-  });
-</script>

data/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
     root to: 'book#show'
 
     concern :debatable do |options|
-      resources :discussions, options.merge(only: [:index, :show, :create, :update, :destroy]) do
+      resources :discussions, options.merge(only: [:index, :new, :show, :create, :update, :destroy]) do
         post :subscription, on: :member
         post :upvote, on: :member
       end
@@ -17,6 +17,7 @@ Rails.application.routes.draw do
     resources :discussions, only: [] do
       resources :messages, only: [:create, :destroy], controller: 'discussions_messages' do
         post :approve, on: :member
+        post :question, on: :member
       end
     end
 

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -33,8 +33,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
 
   def progress_json
     {
-      guide_finished_by_solution: guide_finished_by_solution?,
-      class_for_progress_list_item: class_for_progress_list_item(@exercise, true)
+      guide_finished_by_solution: guide_finished_by_solution?
     }
   end
 

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

@@ -58,6 +58,7 @@ en:
   destroy: Destroy
   disabled_explanation: You are trying to visit a permamently disabled or deleted resource
   disabled_organization_explanation: This path has already finished.
+  discussion_description_placeholder: You can add more information regarding your doubt.
   discussion_updated: Discussion updated
   discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
@@ -113,6 +114,7 @@ en:
   kids_default_success: You did it great!
   language: Language
   last_name: Last Name
+  last_seen: "Seen by %{name}"
   last_submission_date: Last submission
   latest_exercises: Latest exercises
   learning: Learning
@@ -184,7 +186,10 @@ en:
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
+  requires_attention: Requires attention
   reset_query: Clear current search filters
+  responses_count_asc: By less validated replies
+  responses_count_desc: By more validated replies
   restart: Restart
   results: Results
   results_hidden: Your solution was submitted successfully!

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

@@ -65,6 +65,7 @@ es:
   details: Detalles
   disabled_explanation: Estás intentando acceder a un recurso que fue deshabilitado o eliminado de forma permamente
   disabled_organization_explanation: ¡Este recorrido ha finalizado!
+  discussion_description_placeholder: Podés agregar información para detallar más tu consulta
   discussion_updated: Consulta actualizada
   discussions: Consultas
   dont_leave_us: ¡No nos abandones! Aprender a programar es divertido. Sólo tenés que seguir practicando.
@@ -123,6 +124,7 @@ es:
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solución
   latest_exercises: Últimos ejercicios
   learning: Aprendizaje
@@ -202,7 +204,10 @@ es:
   read: Leido
   read_messages: Ver mensajes
   refresh_or_wait: Si no se muestra automáticamente en unos segundos, presioná F5
+  requires_attention: Requiere atención
   reset_query: Borrar los filtros de búsqueda actuales
+  responses_count_asc: Con menos respuestas validadas
+  responses_count_desc: Con más respuestas validadas
   restart: Reiniciar
   results_hidden: ¡Tu solución fue enviada con éxito!
   results: Resultados

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

@@ -62,6 +62,7 @@ pt:
   details: Detalhes
   disabled_explanation: Você está tentando acessar um recurso que foi desativado ou removido permanentemente
   disabled_organization_explanation: Este curso terminou!
+  discussion_description_placeholder: Você pode adicionar mais informações sobre sua dúvida
   discussion_updated: Consulta actualizada
   discussions: Consultas
   download: Faça o download do que você fez
@@ -119,6 +120,7 @@ pt:
   language: Linguagem
   languages: Linguagens
   last_name: Sobrenome
+  last_seen: "Visto por %{name}"
   last_submission_date: Última solução
   latest_exercises: Últimos exercícios
   learning: Aprendendo
@@ -132,8 +134,8 @@ pt:
   male: Masculino
   manual_evaluation_pending: Obrigado por enviar sua solução! Seus professores irão corrigi-lo em breve
   message_count:
-      one: 1 mensagem
-      other: '%{count} mensagens'
+    one: 1 mensagem
+    other: '%{count} mensagens'
   message: Mensagem
   messages: Mensagens
   messages_error: As mensagens acima não estão disponíveis no momento. Eu tentei novamente mais tarde!
@@ -195,6 +197,7 @@ pt:
   read: Ler
   read_messages: Ver mensagens
   refresh_or_wait: Se não mostrar automaticamente em alguns segundos, pressione F5
+  requires_attention: Requer atenção
   reset_query: Limpar filtros de pesquisa atuais
   restart: Reiniciar
   results: Resultados

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '7.6.2'
+    VERSION = '7.7.0'
   end
 end