mumuki-domain 7.3.2 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39020a28808b40cdfdfcbbacb3f5548a56ba6886ae4ffec37e46501a9e211ae9
-  data.tar.gz: 80eebf536803172e019da3af5e4e480e4613716db2dff9cb2bd51a09dee20340
+  metadata.gz: 565a262560be1187382a14821310b252774ddd2cfbff5b1ec27f4740009274a8
+  data.tar.gz: f81fcb7e631f8f4e1a88526a95a7152bb854c9cc8beea26cf0342574f68413e3
 SHA512:
-  metadata.gz: 2b92101a2f8af04af9f29722c8581f645533da33146deb68b16af0013babfa86786f6210929ea4d42857cfdb1be871fd8671b76b210321a7c78110a02fbee750
-  data.tar.gz: dcd486ae7a1cbe1500d2ad16b06856ee3ef5ee114ec5d54280754c1ad49c627eba0290f1af0b59d7a11a21e1df9313cdf5f948bef1849b180074c363399519a0
+  metadata.gz: 1f47711214119a25152f602e342ad9934d5e5e72253580639704353bdd9337aeba0899ad975c75d139363f5dfb13ed4574673df381d99896c766e14a9b79abc4
+  data.tar.gz: aab1d74be634268a51719ee81d9a3977ea0412b5b645a8e5b29909b75b690ad2deac25bed2e2872312dfa8b63c48fcf0b5516bd9731fcb50b7dd644d8c2c7fbd

data/app/models/assignment.rb

@@ -18,7 +18,7 @@ class Assignment < Progress
   validates_presence_of :exercise, :submitter
 
   delegate :language, :name, :navigable_parent, :settings,
-           :limited?, :input_kids?, :choice?, to: :exercise
+           :limited?, :input_kids?, :choice?, :results_hidden?, to: :exercise
 
   alias_attribute :status, :submission_status
   alias_attribute :attempts_count, :attemps_count
@@ -59,6 +59,14 @@ class Assignment < Progress
     update! status: teacher_evaluation[:status], manual_evaluation_comment: teacher_evaluation[:manual_evaluation]
   end
 
+  def visible_status
+    if results_hidden? && !pending?
+      :manual_evaluation_pending.to_submission_status
+    else
+      super
+    end
+  end
+
   def persist_submission!(submission)
     transaction do
       messages.destroy_all if submission_id.present?
@@ -190,7 +198,7 @@ class Assignment < Progress
     navigable_parent.attempts_left_for(self)
   end
 
-  # Tells wether the submitter of this
+  # Tells whether the submitter of this
   # assignment can keep on sending submissions
   # which is true for non limited or for assignments
   # that have not reached their submissions limit

data/app/models/concerns/contextualization.rb

@@ -43,14 +43,22 @@ module Contextualization
     output_content_type.to_html test_results.first[:result]
   end
 
-  def results_visible?
-    (visible_success_output? || !passed?) && !exercise.choices? && !manual_evaluation_pending?
+  def results_body_hidden?
+    (passed? && !visible_success_output?) || exercise.choice? || manual_evaluation_pending?
   end
 
   def result_preview
     result.truncate(100) unless passed?
   end
 
+  def visible_status
+    status
+  end
+
+  def iconize
+    visible_status.iconize
+  end
+
   def result_html
     output_content_type.to_html(result)
   end

data/app/models/concerns/guide_container.rb

@@ -38,7 +38,13 @@ module GuideContainer
   # Tells if this guide container
   # imposes any kind of limit to the number of submission
   # to its assignments, which may depend on the exercise's type
-  def limited_for?(exercise)
+  def limited_for?(_exercise)
+    false
+  end
+
+  # Tells if this guide container
+  # hides the results for students
+  def results_hidden_for?(_exercise)
     false
   end
 

data/app/models/exam.rb

@@ -161,6 +161,10 @@ class Exam < ApplicationRecord
     max_attempts_for(exercise).present?
   end
 
+  def results_hidden_for?(exercise)
+    exercise.choice? && results_hidden_for_choices?
+  end
+
   def resettable?
     false
   end

data/app/models/exercise.rb

@@ -55,6 +55,10 @@ class Exercise < ApplicationRecord
     guide.done_for?(user)
   end
 
+  def choice?
+    false
+  end
+
   def previous
     sibling_at number.pred
   end
@@ -192,8 +196,15 @@ class Exercise < ApplicationRecord
     end
   end
 
+  # An exercise with hidden results cannot be limited
+  # as those exercises can be submitted as many times as the
+  # student wants because no result output is given
   def limited?
-    navigable_parent.limited_for?(self)
+    !results_hidden? && navigable_parent.limited_for?(self)
+  end
+
+  def results_hidden?
+    navigable_parent&.results_hidden_for?(self)
   end
 
   def files_for(current_content)

data/db/migrate/20200312181842_add_results_hidden_for_choices_to_exam.rb

@@ -0,0 +1,5 @@
+class AddResultsHiddenForChoicesToExam < ActiveRecord::Migration[5.1]
+  def change
+    add_column :exams, :results_hidden_for_choices, :boolean, default: false
+  end
+end

data/lib/mumuki/domain/factories/exercise_factory.rb

@@ -51,6 +51,13 @@ FactoryBot.define do
     test { 'dont care' }
   end
 
+  factory :multiple_choice, parent: :problem do
+    name { 'A multiple choice problem' }
+    editor { :multiple_choice }
+    description { 'Simple multiple choice problem' }
+    choices { [{value: 'a', checked: true}, {value: 'b', checked: false }] }
+  end
+
   factory :interactive, class: Interactive, parent: :challenge do
     name { 'An interactive problem' }
     description { 'Simple interactive problem' }

data/lib/mumuki/domain/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Domain
-    VERSION = '7.3.2'
+    VERSION = '7.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-domain
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 7.4.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -598,6 +598,7 @@ files:
 - db/migrate/20191217184525_add_progress_fields_to_indicators.rb
 - db/migrate/20200127142401_add_private_to_topics_and_books.rb
 - db/migrate/20200213175736_add_verified_names_to_users.rb
+- db/migrate/20200312181842_add_results_hidden_for_choices_to_exam.rb
 - lib/mumuki/domain.rb
 - lib/mumuki/domain/engine.rb
 - lib/mumuki/domain/evaluation.rb