mumuki-laboratory 5.5.0 → 5.6.0

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

@@ -33,28 +33,12 @@
   <% end %>
 </div>
 
-
 <% content_for :assignment do %>
-    <div class="text-box">
-      <%= @exercise.description_html %>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <div class="hint-box <%= 'hidden' if @exercise.hint.blank? %>">
-          <% if @exercise.hint.present? %>
-              <a data-toggle="collapse" href="#hint-section" class="text-info">
-                <%= fa_icon 'lightbulb-o' %> <%= t :need_a_hint %>
-              </a>
+  <%= render partial: 'exercise_assignment', locals: {exercise: @exercise} %>
+<% end %>
 
-              <div id="hint-section" class="collapse">
-                <p>
-                  <%= @exercise.hint_html %>
-                </p>
-              </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
+<%= content_for :exercise_content do %>
+  <%= render partial: 'layouts/exercise_inputs/forms/form', locals: {exercise: @exercise} %>
 <% end %>
 
 <%= render_exercise_input_layout(@exercise) %>

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

@@ -0,0 +1,68 @@
+<div class="discussions-list">
+  <%= discussions_reset_query_link %>
+  <div class="discussions-toolbar">
+    <div class="discussions-toolbar-status">
+      <div class="hidden-xs hidden-sm">
+        <% discussions_statuses.each do |status| %>
+          <%= discussion_status_filter_link(status, @discussions) %>
+        <% end %>
+      </div>
+    </div>
+    <div>
+      <div class="hidden-md hidden-lg ">
+        <%= discussion_dropdown_filter :status, discussions_statuses do |status_filter| %>
+          <%= t status_filter %>
+        <% end %>
+      </div>
+
+      <%= yield :extra_filters %>
+
+      <%= discussion_dropdown_filter :sort, Discussion.sorting_filters do |sorting_filter| %>
+        <%= t sorting_filter %>
+      <% end %>
+    </div>
+  </div>
+  <% if @filtered_discussions.empty? %>
+    <div class="discussions-no-filtered-results">
+      <div>
+        <%= fa_icon('exclamation-circle', class: 'fa-lg') %>
+      </div>
+      <span>
+        <%= t :no_discussions %>
+      </span>
+    </div>
+  <% else %>
+    <div class="discussions">
+      <% @filtered_discussions.each do |discussion| %>
+        <%= link_to item_discussion_path(discussion) do %>
+          <div class="discussion">
+            <div class="discussion-row">
+              <%= discussion_messages_icon(discussion) %>
+              <% unless @debatable.respond_to? :language %>
+                <div class="discussion-language-icon">
+                  <%= language_icon(discussion.language) %>
+                </div>
+              <% end %>
+              <div>
+                <div class="discussion-title">
+                  <span class="discussion-status-icon">
+                    <%= discussion_status_fa_icon(discussion) %>
+                  </span>
+                  <%= discussion.title %>
+                </div>
+                <span class="discussion-description">
+                  <%= discussion.description %>
+                </span>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div class="discussion-pagination">
+      <%= paginate @filtered_discussions %>
+    </div>
+
+  <% end %>
+</div>

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

@@ -1,18 +1,21 @@
 <img src="/anim_amarillo.svg" alt="">
-<div class="mu-kids-character-speech-bubble <%= 'no-tabs' unless @exercise.hint? %>">
-  <% if @exercise.hint? %>
+<div class="mu-kids-character-speech-bubble <%= 'no-tabs' unless exercise.hint? %>">
+  <% if exercise.hint? %>
       <ul class="mu-kids-character-speech-bubble-tabs">
-        <li class="active" data-target="description" title="<%= t :task %>"><i class="fa fa-fw fa-file-text-o"></i>
+        <li class="active" data-target="description" title="<%= t :task %>">
+          <i class="fa fa-fw fa-file-text-o"></i>
         </li>
         <li class="separator"></li>
-        <li data-target="hint" title="<%= t :need_a_hint %>"><i class="fa fa-fw fa-lightbulb-o"></i></li>
+        <li data-target="hint" title="<%= t :need_a_hint %>">
+          <i class="fa fa-fw fa-lightbulb-o"></i>
+        </li>
       </ul>
   <% end %>
   <div class="mu-kids-character-speech-bubble-normal">
     <i class="mu-kids-prev-speech fa fa-fw fa-caret-up"></i>
     <i class="mu-kids-next-speech fa fa-fw fa-caret-down"></i>
-    <div class="description"><%= @exercise.description_task %></div>
-    <div class="hint" style="display: none"><%= @exercise.hint_html %></div>
+    <div class="description"><%= exercise.description_task %></div>
+    <div class="hint" style="display: none"><%= exercise.hint_html %></div>
   </div>
   <div class="mu-kids-character-speech-bubble-failed <%= @assignment&.status %>" style="display: none"></div>
 </div>

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

@@ -8,7 +8,7 @@
         </a>
       </li>
       <% messages.each do |message| %>
-          <li class="<%= message.sender == current_user_uid ? 'self' : 'other' %>">
+          <li class="<%= sender_class(message) %>">
             <div class="message">
               <p> <%= message.content_html %></p>
               <div class="sender"><%= message.sender unless message.sender == current_user_uid %></div>

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

@@ -1,4 +1,4 @@
-<% unless assignment.exercise.hidden? %>
+<% unless contextualization.exercise.hidden? %>
   <strong><%= t :results %>:</strong>
 <% end %>
-<%= assignment.result_html %>
+<%= contextualization.result_html %>

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

@@ -1,15 +1,15 @@
-<% if assignment.single_visual_result? %>
-  <%= assignment.single_visual_result_html %>
+<% if contextualization.single_visual_result? %>
+  <%= contextualization.single_visual_result_html %>
 <% else %>
   <strong><%= t :test_results %>:</strong>
   <ul class="results-list">
-    <% assignment.test_results.each_with_index do |test_result, index| %>
+    <% contextualization.test_results.each_with_index do |test_result, index| %>
       <li>
         <% if test_result[:status].failed? %>
           <span class="text-danger">
             <%= status_icon(test_result[:status]) %>
             <strong class="example-title"><%= test_result[:title] %></strong>
-            <% unless assignment.visible_success_output? %>
+            <% unless contextualization.visible_success_output? %>
               <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more">Ver detalles</a>
             <% end %>
           </span>
@@ -20,8 +20,8 @@
           </span>
         <% end %>
 
-        <div class="example-result collapse <%= 'in' if assignment.visible_success_output? %>" id="example-result-<%= index %>">
-          <%= assignment.output_content_type.to_html test_result[:result] %>
+        <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
+          <%= contextualization.output_content_type.to_html test_result[:result] %>
         </div>
       </li>
     <% end %>

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

@@ -55,23 +55,24 @@
     <div class="mu-navbar-avatar">
       <% if current_user? %>
           <div class="dropdown">
-          <span>
-            <a class="notifications-box <%= has_messages? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_path}#messages" %>>
-              <i class="fa fa-bell fa-fw fa-lg"></i>
-                <span class="badge badge-notifications"><%= messages_count %></span>
-            </a>
-          </span>
+            <span>
+              <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
+                <i class="fa fa-bell fa-fw fa-lg"></i>
+                  <span class="badge badge-notifications"><%= notifications_count %></span>
+              </a>
+            </span>
           </div>
           <div class="dropdown">
-          <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
-            <%= image_tag(current_user.image_url, height: 40, class: 'img-circle') %>
-          </span>
+            <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
+              <%= image_tag(current_user.image_url, height: 40, class: 'img-circle') %>
+            </span>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <li>
                 <%= link_to fixed_fa_icon('user-o', text: t(:profile)), user_path, role: 'menuitem' %>
               </li>
               <li><%= link_to_classroom %></li>
               <li><%= link_to_bibliotheca %></li>
+              <li><%= solve_discussions_link %></li>
               <li class="divider"></li>
               <li><%= link_to(t(:sign_out), logout_path(origin: url_for), role: 'menuitem') %></li>
             </ul>

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

@@ -1,11 +1,10 @@
 <% if current_user? %>
-  <% if @exercise.console? %>
-    <%= hidden_field_tag(:stateful_console, @exercise.stateful_console?) %>
-    <%= hidden_field_tag(:prompt, @exercise.prompt) %>
+  <% if exercise.console? %>
+    <%= hidden_field_tag(:stateful_console, exercise.stateful_console?) %>
+    <%= hidden_field_tag(:prompt, exercise.prompt) %>
   <% end %>
-  <div>
-    <%= render_exercise_input_form @exercise %>
-  </div>
+  <%= render_exercise_input_form exercise %>
+
 <% else %>
   <p><%= t :you_must_sign_in_before_submitting %></p>
 

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

@@ -1,10 +1,10 @@
-<%= hidden_field_tag :console_endpoint, exercise_tries_path(@exercise) %>
+<%= hidden_field_tag :console_endpoint, exercise_tries_path(exercise) %>
 <%= hidden_field_tag :historical_queries, @assignment&.queries_with_results.to_json %>
 
-<% if @exercise.extra_visible? %>
+<% if exercise.extra_visible? %>
   <ul class="nav nav-tabs" role="tablist">
     <%= console_tab %>
-    <% if @exercise.extra_visible? %>
+    <% if exercise.extra_visible? %>
       <%= extra_code_tab %>
     <% end %>
   </ul>
@@ -15,7 +15,7 @@
     <% if @assignment&.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
-             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(@exercise) %>', '<%= read_messages_path(@exercise) %>')"
+             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
              class="<%= hidden_pending(@assignment) %>"
              data-waiting="<%= t(:sending_solution) %>">
             <%= t :get_messages %>
@@ -29,7 +29,7 @@
     </div>
    </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= @exercise.extra_preview_html(current_user) %>
+    <%= exercise.extra_preview_html(current_user) %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
     <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} if @assignment %>

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

@@ -1,20 +1,12 @@
-<% if current_user? %>
-  <%= form_for([@exercise, @solution],
-               remote: true,
-               html: {role: 'form', class: 'new_solution mu-editor mu-editor-overlap'}) do |f| %>
-    <%= render_exercise_input_editor f, @exercise %>
+<%= form_for([exercise, @solution],
+             remote: true,
+             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">
-      <%= render_submit_button(@exercise) %>
-    </div>
-    <div class="actions mu-kids-reset-button"></div>
-    <img class="mu-kids-compass-rose" src="/compass_rose.svg">
-    <div class="mu-kids-overlay" style="display: none"></div>
-  <% end %>
-<% else %>
-  <p><%= t :you_must_sign_in_before_submitting %></p>
-
-  <div class="actions">
-    <%= login_button class: 'btn btn-success btn-block' %>
+  <div class="actions mu-kids-submit-button">
+    <%= render_submit_button(exercise) %>
   </div>
+  <div class="actions mu-kids-reset-button"></div>
+  <img class="mu-kids-compass-rose" src="/compass_rose.svg">
+  <div class="mu-kids-overlay" style="display: none"></div>
 <% end %>

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

@@ -1,9 +1,9 @@
-<%= hidden_field_tag :console_endpoint, exercise_queries_path(@exercise) %>
+<%= hidden_field_tag :console_endpoint, exercise_queries_path(exercise) %>
 
-<% if @exercise.extra_visible? %>
+<% if exercise.extra_visible? %>
   <ul class="nav nav-tabs" role="tablist">
     <%= console_tab %>
-    <% if @exercise.extra_visible? %>
+    <% if exercise.extra_visible? %>
       <%= extra_code_tab %>
     <% end %>
   </ul>
@@ -18,9 +18,9 @@
     </div>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= @exercise.extra_preview_html(current_user) %>
+    <%= exercise.extra_preview_html(current_user) %>
   </div>
 </div>
 <div class="actions">
-  <%= next_exercise_button @exercise %>
+  <%= next_exercise_button exercise %>
 </div>

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

@@ -1,18 +1,18 @@
-<%= hidden_field_tag(:exercise_language, @exercise.highlight_mode) %>
-<%= hidden_field_tag :console_endpoint, exercise_queries_path(@exercise) %>
+<%= hidden_field_tag(:exercise_language, exercise.highlight_mode) %>
+<%= hidden_field_tag :console_endpoint, exercise_queries_path(exercise) %>
 
-<% if should_render_problem_tabs? @exercise, current_user %>
+<% if should_render_problem_tabs? exercise, current_user %>
   <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active">
       <a data-target="#editor" aria-controls="editor" tabindex="0" role="tab" data-toggle="tab" class="editor-tab"><%= fa_icon 'pencil-square' %> <%= t :solution %></a>
     </li>
-    <% if @exercise.extra_visible? %>
+    <% if exercise.extra_visible? %>
       <%= extra_code_tab %>
     <% end %>
-    <% if @exercise.queriable? %>
+    <% if exercise.queriable? %>
       <%= console_tab %>
     <% end %>
-    <%= messages_tab @exercise %>
+    <%= messages_tab exercise %>
   </ul>
 <% end %>
 
@@ -21,20 +21,20 @@
     <% if @assignment&.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
-             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(@exercise) %>', '<%= read_messages_path(@exercise) %>')"
+             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
              class="<%= hidden_pending(@assignment) %>"
              data-waiting="<%= t(:sending_solution) %>">
             <%= t :get_messages %>
           </a>
         </span>
     <% end %>
-    <%= form_for([@exercise, @solution],
+    <%= form_for([exercise, @solution],
                  remote: true,
                  html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap #{pending_messages_filter(@assignment)}"}) do |f| %>
-      <%= render_exercise_input_editor f, @exercise %>
+      <%= render_exercise_input_editor f, exercise %>
 
       <div class="actions">
-        <%= render_submit_button(@exercise) %>
+        <%= render_submit_button(exercise) %>
       </div>
     <% end %>
   </div>
@@ -52,7 +52,7 @@
     </div>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
-    <%= @exercise.extra_preview_html(current_user) %>
+    <%= exercise.extra_preview_html(current_user) %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
     <%= render partial: 'layouts/messages', locals: {messages: @assignment.messages} if @assignment %>

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

@@ -1,3 +1,3 @@
 <div class="actions">
-  <%= next_exercise_button @exercise %>
+  <%= next_exercise_button exercise %>
 </div>

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

@@ -5,7 +5,7 @@
 </div>
 <div class="row">
   <div class="col-md-12 ace-editor-col">
-    <%= render partial: 'layouts/exercise_inputs/forms/form' %>
+    <%= yield :exercise_content %>
   </div>
 </div>
 

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

@@ -1,6 +1,6 @@
 <% content_for :no_container do %>
 
-    <div <%= turbolinks_enable_for @exercise %>>
+    <div <%= turbolinks_enable_for exercise %>>
 
       <div class="mu-kids-landscape-support container-fluid">
         <img src="/anim_amarillo.svg"/>
@@ -11,10 +11,10 @@
 
         <div class="mu-kids-exercise-description">
           <div class="mu-kids-character">
-            <%= render partial: 'layouts/kids' %>
+            <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
           </div>
           <div class="mu-kids-blocks">
-            <%= render partial: 'layouts/exercise_inputs/forms/kids_form' %>
+            <%= yield :exercise_content %>
           </div>
         </div>
 
@@ -22,19 +22,19 @@
           <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial">
             <strong id="mu-initial-state-text"><%= t :initial_state %></strong>
             <strong id="mu-actual-state-text"><%= t :actual_state %></strong>
-            <div class="mu-kids-state-image"><%= @exercise.initial_state&.html_safe %></div>
+            <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
           </div>
           <div class="mu-kids-state mu-state-final">
             <strong><%= t :expected_state %></strong>
-            <div class="mu-kids-state-image"><%= @exercise.final_state&.html_safe %></div>
+            <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
           </div>
         </div>
 
       </div>
 
-      <%= render partial: 'layouts/modals/kids_results', locals: {exercise: @exercise, assignment: @assignment} %>
+      <%= 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} %>
+      <%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
 
     </div>
 <% end %>

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

@@ -3,7 +3,7 @@
     <%= yield :assignment %>
   </div>
   <div class="col-md-6 ace-editor-col">
-    <%= render partial: 'layouts/exercise_inputs/forms/form' %>
+    <%= yield :exercise_content %>
   </div>
 </div>