mumuki-laboratory 5.5.0 → 5.6.0

data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb

@@ -0,0 +1,3 @@
+<div class="field form-group">
+  <%= Mumukit::ContentType::Markdown.to_html(Mumukit::ContentType::Markdown.highlighted_code(exercise.language.name, content)) %>
+</div>

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

@@ -0,0 +1,6 @@
+<%= render_runner_assets exercise.language, :editor %>
+
+<%= render_custom_editor(exercise, true) %>
+<%= hidden_field :content, id: "mu-custom-editor-value", value: content %>
+<%= hidden_field :default_content, id: "mu-custom-editor-default-value", value: exercise.default_content %>
+<%= hidden_field :content_extra, id: "mu-custom-editor-extra", value: exercise.extra %>

data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_choice.html.erb

@@ -0,0 +1,8 @@
+<div class="form-group">
+  <% exercise.pretty_choices.each do |choice| %>
+    <div class="field checkbox complementary complementary-checkbox">
+      <%= check_box_tag(choice.id, '1', checked?(choice, content), disabled: true, class: 'solution-choice mu-read-only', 'data-index' => choice.index) %>
+      <%= label_tag(choice.id, choice.text) %>
+    </div>
+  <% end %>
+</div>

data/app/views/layouts/exercise_inputs/read_only_editors/_single_choice.html.erb

@@ -0,0 +1,8 @@
+<div class="form-group">
+  <% exercise.pretty_choices.each do |choice| %>
+    <div class="field radio complementary complementary-radio">
+      <%= radio_button_tag :content, choice.value, checked?(choice, content), disabled: true, class: 'mu-read-only' %>
+      <%= label_tag(choice.id, choice.text) %>
+    </div>
+  <% end %>
+</div>

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

@@ -3,7 +3,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="text-center">
-          <strong><%= "#{@exercise.number}. #{@exercise.name}" %></strong>
+          <strong><%= "#{exercise.number}. #{exercise.name}" %></strong>
         </h4>
       </div>
       <div class="modal-body">
@@ -11,7 +11,7 @@
           <div class="row">
             <div class="col-md-12 text-box">
               <img src="/character/kids/yellow_context.svg" class="capital-animation"/>
-              <%= @exercise.description_context %>
+              <%= exercise.description_context %>
             </div>
           </div>
         </div>

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

@@ -0,0 +1,27 @@
+<div class="modal fade new-discussion-modal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <%= form_for [@debatable, Discussion.new] do |f| %>
+      <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>
+          <h3 class="text-left">Nueva Consulta</h3>
+        </div>
+        <div class="modal-body">
+          <div class="container-fluid">
+            <div class="row form-group">
+              <div><%= f.text_field :title, class: 'form-control', placeholder: t(:title), required: true %></div>
+            </div>
+            <div class="row form-group">
+              <div><%= f.text_area :description, class: 'form-control', placeholder: t(:description) %></div>
+            </div>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-success btn-block"> <%= t :send %> </button>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -16,6 +16,11 @@
   <li role="presentation">
     <a data-target="#messages" aria-controls="messages" role="tab" data-toggle="tab"><%= t :messages %></a>
   </li>
+  <% if @watched_discussions.present? %>
+    <li role="presentation">
+      <a data-target="#discussions" aria-controls="discussions" role="tab" data-toggle="tab"><%= t :discussions %></a>
+    </li>
+  <% end %>
 </ul>
 
 <div class="tab-content">
@@ -26,15 +31,15 @@
             <%= image_tag @user.image_url, size: '250x250', class: 'img-circle' %>
           </div>
           <div class="col-md-8">
-            <fieldset class="form-group"> 
+            <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"> 
+            <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"> 
+            <fieldset class="form-group">
               <div><%= f.label(t :email) %></div>
               <div><%= f.text_field :email, readonly: true, class: 'form-control' %></div>
             </fieldset>
@@ -69,4 +74,19 @@
       </table>
     <% end %>
   </div>
+  <% if @watched_discussions.present? %>
+    <div role="tabpanel" class="tab-pane" id="discussions">
+      <table class="table table-striped">
+        <% @watched_discussions.each do |discussion| %>
+          <tr>
+            <td>
+              <%= icon_for_read(discussion.read_by?(@user)) %>
+            </td>
+            <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
+            <td><%= time_ago_in_words discussion.last_message_date %></td>
+          </tr>
+        <% end %>
+      </table>
+    </div>
+  <% end %>
 </div>

data/config/routes.rb

@@ -5,8 +5,22 @@ Rails.application.routes.draw do
   Mumukit::Platform.map_organization_routes!(self) do
     root to: 'book#show'
 
+    concern :debatable do |options|
+      resources :discussions, options.merge(only: [:index, :show, :create, :update, :destroy]) do
+        post :subscription, on: :member
+        post :upvote, on: :member
+      end
+    end
+
+    concerns :debatable, controller: 'book_discussions', only: :index
+
+    resources :discussions, only: [] do
+      resources :messages, only: [:create, :destroy], controller: 'discussions_messages'
+    end
+
     resources :book, only: [:show]
     resources :chapters, only: [:show] do
+      concerns :debatable, debatable_class: 'Chapter'
       resource :appendix, only: :show
     end
 
@@ -19,12 +33,18 @@ Rails.application.routes.draw do
       resources :tries, controller: 'exercise_tries', only: :create
     end
 
+    resources :exercises, only: :show do
+      concerns :debatable, debatable_class: 'Exercise'
+    end
+
     # All users
     resources :guides, only: :show do
       resource :progress, controller: 'guide_progress', only: :destroy
     end
 
-    resources :lessons, only: :show
+    resources :lessons, only: :show do
+      concerns :debatable, debatable_class: 'Lesson'
+    end
     resources :complements, only: :show
     resources :exams, only: :show
 

data/db/migrate/20180504173548_create_discussions.rb

@@ -0,0 +1,12 @@
+class CreateDiscussions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :discussions do |t|
+      t.integer :status, default: 0
+      t.string :title
+      t.text :description
+      t.references :initiator, index: true
+      t.references :item, polymorphic: true, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180504185845_add_discussion_id_to_message.rb

@@ -0,0 +1,5 @@
+class AddDiscussionIdToMessage < ActiveRecord::Migration[5.1]
+  def change
+    add_column :messages, :discussion_id, :integer
+  end
+end

data/db/migrate/20180605143727_add_submission_to_discussion.rb

@@ -0,0 +1,16 @@
+class AddSubmissionToDiscussion < ActiveRecord::Migration[5.1]
+  def change
+    change_table :discussions do |t|
+      t.text "solution"
+      t.integer "submission_status", default: 0
+      t.text "result"
+      t.text "expectation_results"
+      t.text "feedback"
+      t.text "test_results"
+      t.string "submission_id"
+      t.string "queries", default: [], array: true
+      t.text "query_results"
+      t.text "manual_evaluation_comment"
+    end
+  end
+end

data/db/migrate/20180619182555_create_subscriptions.rb

@@ -0,0 +1,9 @@
+class CreateSubscriptions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :subscriptions do |t|
+      t.references :user, index: true
+      t.references :discussion, index: true
+      t.boolean :read, default: true
+    end
+  end
+end

data/db/migrate/20180702153442_create_upvotes.rb

@@ -0,0 +1,8 @@
+class CreateUpvotes < ActiveRecord::Migration[5.1]
+  def change
+    create_table :upvotes do |t|
+      t.references :user, index: true
+      t.references :discussion, index: true
+    end
+  end
+end

data/db/migrate/20180702175220_add_upvotes_count_to_discussions.rb

@@ -0,0 +1,5 @@
+class AddUpvotesCountToDiscussions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :discussions, :upvotes_count, :integer
+  end
+end

data/db/migrate/20180704150839_rename_assignment_status_to_submission_status.rb

@@ -0,0 +1,5 @@
+class RenameAssignmentStatusToSubmissionStatus < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :assignments, :status, :submission_status
+  end
+end

data/lib/mumuki/laboratory.rb

@@ -14,6 +14,8 @@ require 'mumukit/randomizer'
 require 'mumukit/inspection'
 require 'mumukit/bridge'
 require 'mumukit/content_type'
+require 'kaminari'
+require 'bootstrap-kaminari-views'
 
 require_relative './laboratory/mumukit/auth'
 require_relative './laboratory/mumukit/directives'

data/lib/mumuki/laboratory/controllers.rb

@@ -4,7 +4,8 @@ end
 require_relative './controllers/authorization'
 require_relative './controllers/current_organization'
 require_relative './controllers/dynamic_errors'
-require_relative './controllers/messages'
+require_relative './controllers/notifications'
 require_relative './controllers/nested_in_exercise'
 require_relative './controllers/results_rendering'
 require_relative './controllers/exercise_seed'
+require_relative './controllers/content'

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

@@ -0,0 +1,12 @@
+module Mumuki::Laboratory::Controllers::Content
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :validate_used_here!, only: :show
+  end
+
+  # ensures contents are in current organization's path
+  def validate_used_here! #TODO refactor subject logic (e.g. we can't move validate_accessible! here because ExerciseSolutionsController does not declare a subject)
+    raise Mumuki::Laboratory::NotFoundError unless subject&.used_in?(Organization.current)
+  end
+end

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

@@ -0,0 +1,31 @@
+module Mumuki::Laboratory::Controllers::Notifications
+  def user_notifications_path
+    "#{user_path}##{notifications_path}"
+  end
+
+  def has_notifications?
+    notifications_count > 0
+  end
+
+  def notifications_count
+    messages_count + discussions_count
+  end
+
+  private
+
+  def notifications_path
+    has_messages? ? 'messages' : 'discussions'
+  end
+
+  def has_messages?
+    messages_count > 0
+  end
+
+  def messages_count
+    current_user.try(:unread_messages).try(:count) || 0
+  end
+
+  def discussions_count
+    current_user.try(:unread_discussions).try(:count) || 0
+  end
+end

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

@@ -28,7 +28,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
 
   def render_results_title_html(assignment)
     render_to_string partial: 'exercise_solutions/results_title',
-                     locals: {assignment: assignment}
+                     locals: {contextualization: assignment}
   end
 
   def render_results_button_html(assignment)

data/lib/mumuki/laboratory/engine.rb

@@ -21,8 +21,6 @@ module Mumuki
       config.registration_notification_format = {only: [:id, :name, :email, :image_url]}
       config.action_dispatch.perform_deep_munge = false
 
-      config.status_rendering_verbosity = :standard
-
       initializer "static assets" do |app|
           app.middleware.insert_before(::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public")
       end

data/lib/mumuki/laboratory/evaluation/manual.rb

@@ -1,5 +1,5 @@
 class Mumuki::Laboratory::Evaluation::Manual
   def evaluate!(*)
-    {status: Mumuki::Laboratory::Status::ManualEvaluationPending, result: ''}
+    {status: Mumuki::Laboratory::Status::Submission::ManualEvaluationPending, result: ''}
   end
 end

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

@@ -10,8 +10,11 @@ en:
   all: All
   appendix: "Appendix"
   appendix_teaser: Do you want to learn more? <a href="%{link}">Check this chapter's appendix</a>"
+  are_you_sure: 'Are you sure you want to %{action}?'
+  ask_a_question: Ask a question!
   ask_community: Ask community for help
   ask_redirect: Do you want to go there?
+  ask_the_first_question: Be the first one to ask!
   author: Author
   authoring: "Authoring"
   authoring_note: 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>
@@ -23,6 +26,10 @@ en:
   chapter_number: Chapter %{number}
   classroom: Classroom
   clear_console: Clear console
+  closed: Closed
+  created_at_asc: Oldest
+  created_at_desc: Newest
+  comment: Comment
   confirm: Confirm
   confirm_restart: You are about to delete your progress for this guide. Do you want to proceed?
   console: Console
@@ -37,7 +44,11 @@ en:
   create_submission: Submit
   created_at: Created at
   date: Date
+  description: Description
   destroy: Destroy
+  destroy_message: delete the message
+  discussion_updated: Discussion updated
+  discussions: Discussions
   dont_leave_us: Don't leave us! Learning is fun. You just have to keep at it.
   download: Download your solution
   edit: Edit
@@ -93,6 +104,9 @@ en:
   let_us_know: please let us know!
   load_solution_into_console: Load your solution into the console
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
+  message_count:
+    one: 1 message
+    other: '%{count} messages'
   message: Message
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
@@ -108,17 +122,21 @@ en:
   need_help: I need help!
   never: never
   new: New
-  new_message_placeholder: Escribí tu mensaje acá...
+  new_message_placeholder: Write a message for your teacher...
   next_exercise: Next
   next_lesson: 'Next Guide: %{name}'
+  no_discussions: No discussions matched your search.
   no_exercises: Nobody created an exercise for this search yet
   no_guides: Nobody created a guide for this search yet
   no_messages: It seems you don't have any messages yet!
+  no_questions: It seems there isn't any question yet.
   no_submissions: It seems like you haven't tried to solve this exercise
+  no_useful_result: Não encontrou o que estava buscando?
   not_found_explanation: 'You may have mistyped the address or the page may have moved.'
   not_in_any_organizations: It seems you aren't in any organizations yet!
   notify_problem_with_exercise: Report a bug
   office: Office
+  opened: Open
   output: Output
   overview: Overview
   passed: Everything is in order! Your solution passed all our tests!
@@ -126,6 +144,7 @@ en:
   pending: pending
   pending_messages: You have unread messages
   pending_messages_explanation: You can't send new solutions until you read pending messages
+  Pending_review: Pending review
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
@@ -138,6 +157,7 @@ en:
   progress: Progresss
   read: Read
   refresh_or_wait: Please press F5 if results are not displayed after a few seconds
+  reset_query: Clear current search filters
   restart: Restart
   results: Results
   retry_exercise: Retry
@@ -150,8 +170,13 @@ en:
   sign_out: Sign Out
   sign_up_date: User since
   solution: Solution
+  solved: Solved
+  solve_doubts: Solve other's doubts
+  solve_your_doubts: Solve your doubts
+  solve_your_doubts_teaser: Do you have any doubts?
   something_went_wrong: Something went wrong!
   something_went_wrong_explanation: Something is broken in Mumuki.
+  sort: Sort
   start_lesson: Start this lesson!
   start_practicing: Start Practicing!
   start_using_mumuki: Start using Mumuki!
@@ -164,20 +189,31 @@ en:
   submission_for_exercise: Submission for exercise
   submissions_count: Submissions
   submissions_for: Submissions for %{exercise}
+  subscribe: Subscribe
   tag: Tags
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_and_conditions: Terms and conditions
   test_results: Test results
   test_results: Tests results
+  time_ago: "%{time} ago"
   time_left: You have
   title: Title
+  to_closed: Close
+  to_opened: Reopen
+  to_pending_review: Mark as solved
+  to_solved: Mark as solved
   try_again: Oops, something went wrong in Mumuki. Restart the exercise, wait a few seconds and try again.
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
+  undo_upvote: Undo upvote
   unmeet_expectations: "Goals that weren't met"
+  unsubscribe: Unsubscribe
   unsubscribed_successfully: You have successfully unsubscribed from reminders.
   upload_solution: Upload Solution
   uploading_solution: "Uploading solution"
+  upvote: Upvote
+  upvotes_count_asc: Most voted
+  upvotes_count_desc: Least voted
   user: User
   user_data_updated: Your data was updated successfuly
   username: Username