moodle2cc 0.1.9 → 0.1.10

data/Changelog

@@ -1,3 +1,6 @@
+2013-08-15 Version 0.1.10
+    * improve multiple dropdown question handling
+
 2013-08-01 Version 0.1.9
     * fix whitespace handling issue with mod_type
 

data/lib/moodle2cc/canvas/question.rb

@@ -120,9 +120,22 @@ module Moodle2CC::Canvas
       material = RDiscount.new(material).to_html if question.format == 4 # markdown
       @material = material
 
-      if @question_type == 'multiple_dropdowns_question' && !@answers.empty?
-        responses = @answers[@length..-1]
-        responses.each_with_index do |response, index|
+      if @question_type == 'multiple_dropdowns_question' && !@answers.empty? && @length
+        choices = @answers[0..(@length-1)]
+        if @length >= @answers.length || !choices.all?{|a| !!a.text.match(/^\d/)}
+          # the choices don't seem to be present, so construct them
+          choices = (1..@length).map do |i|
+            Moodle2CC::OpenStruct.new(
+              :id => "#{i}",
+              :text => "#{i}"
+            )
+          end
+          @responses = @answers
+        else
+          @responses = @answers[@length..-1]
+        end
+        @answers = choices
+        @responses.each_with_index do |response, index|
           @material << "\n#{response.text} [response#{index + 1}]"
         end
       end
@@ -231,16 +244,14 @@ module Moodle2CC::Canvas
           end
         end
       when 'multiple_dropdowns_question'
-        answers = @answers[0...@length]
-        responses = @answers[@length..-1]
-        responses.each_with_index do |response, index|
+        @responses.each_with_index do |response, index|
           response_id = index + 1
           presentation_node.response_lid(:ident => "response_response#{response_id}") do |response_node|
             response_node.material do |material_node|
               material_node.mattext "response#{response_id}"
             end
             response_node.render_choice do |choice_node|
-              answers.each do |answer|
+              @answers.each do |answer|
                 choice_node.response_label(:ident => "#{response_id}#{answer.id}") do |label_node|
                   label_node.material do |material_node|
                     material_node.mattext answer.text, :texttype => 'text/html'
@@ -340,14 +351,12 @@ module Moodle2CC::Canvas
           condition_node.setvar('100', :varname => 'SCORE', :action => 'Set')
         end
       when 'multiple_dropdowns_question'
-        answers = @answers[0...@length]
-        responses = @answers[@length..-1]
-        score = 100.0 / responses.length.to_f
-        responses.each_with_index do |response, index|
+        score = 100.0 / @responses.length.to_f
+        @responses.each_with_index do |response, index|
           response_id = index + 1
           processing_node.respcondition do |condition_node|
             condition_node.conditionvar do |var_node|
-              var_node.varequal "#{response_id}#{answers.first.id}", :respident => "response_response#{response_id}"
+              var_node.varequal "#{response_id}#{@answers.first.id}", :respident => "response_response#{response_id}"
             end
             condition_node.setvar "%.2f" % score, :varname => 'SCORE', :action => 'Add'
           end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/test/test_question_helper.rb

@@ -74,6 +74,21 @@ module TestQuestionHelper
     @question.choices = [choice1, choice2, choice3, choice4, choice5]
   end
 
+  def multiple_dropdowns_question_without_choices!
+    @question.type = nil
+    @question.type_id = 8 # rate 1..5 question
+    @question.length = 3
+    @question.text = nil
+    @question.content = "This is a rating question but not formatted very well"
+    choice1 = Moodle2CC::Moodle::Question::Choice.new
+    choice1.id = 1
+    choice1.content = "this isn't actually a choice"
+    choice2 = Moodle2CC::Moodle::Question::Choice.new
+    choice2.id = 2
+    choice2.content = 'so add the choices automatically'
+    @question.choices = [choice1, choice2]
+  end
+
   def multiple_answers_question!
     @question.type = nil
     @question.type_id = 5 # check boxes question

data/test/unit/canvas/question_test.rb

@@ -142,6 +142,12 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     assert_equal "This is a rating question\nI test my code [response1]\nI am happy [response2]", question.material
   end
 
+  def test_it_converts_material_for_multiple_dropdowns_question_without_choices
+    multiple_dropdowns_question_without_choices!
+    question = Moodle2CC::Canvas::Question.new @question
+    assert_equal "This is a rating question but not formatted very well\nthis isn't actually a choice [response1]\nso add the choices automatically [response2]", question.material
+  end
+
   def test_it_converts_general_feedback
     @question.general_feedback = "This should be easy"
     question = Moodle2CC::Canvas::Question.new @question
@@ -662,6 +668,44 @@ class TestUnitCanvasQuestion < MiniTest::Unit::TestCase
     assert var, 'score does not exist for second answer'
   end
 
+  def test_it_creates_item_xml_for_multiple_dropdowns_question_without_choices
+    multiple_dropdowns_question_without_choices!
+
+    question = Moodle2CC::Canvas::Question.new @question
+    node = Builder::XmlMarkup.new
+    xml = Nokogiri::XML(question.create_item_xml(node))
+
+    # Responses
+    response = xml.root.xpath('presentation/response_lid[@ident="response_response1"]').first
+    assert response, 'first response for multiple dropdowns question does not exist'
+    assert response.xpath('material/mattext["response1"]').first, 'material text does not exist for multiple dropdowns question first response'
+    assert_equal '1', response.xpath('render_choice/response_label[@ident="11"]/material/mattext[@texttype="text/html"]').text
+    assert_equal '2', response.xpath('render_choice/response_label[@ident="12"]/material/mattext[@texttype="text/html"]').text
+    assert_equal '3', response.xpath('render_choice/response_label[@ident="13"]/material/mattext[@texttype="text/html"]').text
+    refute response.xpath('render_choice/response_label[4]').first, 'there should not be a response for answer text'
+    refute response.xpath('render_choice/response_label[5]').first, 'there should not be a response for answer text'
+
+    response = xml.root.xpath('presentation/response_lid[@ident="response_response2"]').first
+    assert response, 'second response for multiple dropdowns question does not exist'
+    assert response.xpath('material/mattext["response2"]').first, 'material text does not exist for multiple dropdowns question second response'
+    assert_equal '1', response.xpath('render_choice/response_label[@ident="21"]/material/mattext[@texttype="text/html"]').text
+    assert_equal '2', response.xpath('render_choice/response_label[@ident="22"]/material/mattext[@texttype="text/html"]').text
+    assert_equal '3', response.xpath('render_choice/response_label[@ident="23"]/material/mattext[@texttype="text/html"]').text
+    refute response.xpath('render_choice/response_label[4]').first, 'there should not be a response for answer text'
+    refute response.xpath('render_choice/response_label[5]').first, 'there should not be a response for answer text'
+
+    # Conditions
+    condition = xml.root.xpath('resprocessing/respcondition/conditionvar/varequal[@respident="response_response1" and text()="11"]/../..').first
+    assert condition, 'condition does not exist for first answer'
+    var = condition.xpath('setvar[@varname="SCORE" and @action="Add" and text()="50.00"]').first
+    assert var, 'score does not exist for first answer'
+
+    condition = xml.root.xpath('resprocessing/respcondition/conditionvar/varequal[@respident="response_response2" and text()="21"]/../..').first
+    assert condition, 'condition does not exist for first answer'
+    var = condition.xpath('setvar[@varname="SCORE" and @action="Add" and text()="50.00"]').first
+    assert var, 'score does not exist for second answer'
+  end
+
   def test_it_create_item_xml_for_multiple_answers_question
     multiple_answers_question!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip