canvas_cc 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 634e631128ef78e7235bc84c81c835368dff8e54
-  data.tar.gz: ed2995fa6f648444c01fcd947f76c3f4352ada7f
+  metadata.gz: 215d68e5bdbefbaab28a329496b73f6fe167d422
+  data.tar.gz: 76ab2243a6cdf4314a364cd1140319b0503f98aa
 SHA512:
-  metadata.gz: 77fd48f7f6dbdd3140427b79104a31e70ceda37374394dbdebef95fdfde0a4adbce2c9deffd0c8fde0497e2a987c1fc7e298c6c52a1971c561ab61725ba3dc16
-  data.tar.gz: 9e4b161dbdba73396a56afed3e4889cb4ddfcfe6b855a6fc519ff275951955ac1fcb47100b35856dd11f386c7f572e93692cae5d25421d3b527bcbfc2e9f9510
+  metadata.gz: fe36f46276607099db48ce0b18715237f4c16adc34e9dd86f3bde2beaa2432968aed60be54faf19adeb18050d09e7bc589c85b673508c0ab4c4b4fe0a6a2f1bb
+  data.tar.gz: d898cb94005cf56feeaa1074e3d8d4e660197e84d134232443bc343c56da8a9cb9b7801db8f609752579f0b99fcaebd5a8e36211ce33c8378fe0f6c63143eddc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    canvas_cc (0.0.12)
+    canvas_cc (0.0.13)
       builder
       happymapper
       nokogiri

data/lib/canvas_cc/canvas_cc/models/numerical_question.rb

@@ -2,6 +2,6 @@ module CanvasCc::CanvasCC::Models
   class NumericalQuestion < Question
     register_question_type 'numerical_question'
 
-    attr_accessor :tolerances
+    attr_accessor :tolerances, :ranges
   end
-end
+end

data/lib/canvas_cc/canvas_cc/models/range.rb

@@ -0,0 +1,6 @@
+module CanvasCc::CanvasCC::Models
+  class Range
+    attr_accessor :low_range, :high_range
+
+  end
+end

data/lib/canvas_cc/canvas_cc/numerical_question_writer.rb

@@ -16,14 +16,22 @@ module CanvasCc::CanvasCC
       question.answers.each do |answer|
         tolerance = question.tolerances[answer.id]
         processing_node.respcondition(:continue => 'No') do |condition_node|
-          condition_node.conditionvar do |var_node|
-            var_node.or do |or_node|
-              or_node.varequal answer.answer_text, :respident => 'response1'
-              or_node.and do |and_node|
-                and_node.vargte answer.answer_text.to_f - tolerance.to_f, :respident => 'response1'
-                and_node.varlte answer.answer_text.to_f + tolerance.to_f, :respident => 'response1'
+          if answer.answer_text
+            condition_node.conditionvar do |var_node|
+              var_node.or do |or_node|
+                or_node.varequal answer.answer_text, :respident => 'response1'
+                or_node.and do |and_node|
+                  and_node.vargte answer.answer_text.to_f - tolerance.to_f, :respident => 'response1'
+                  and_node.varlte answer.answer_text.to_f + tolerance.to_f, :respident => 'response1'
+                end
               end
             end
+          elsif question.ranges.has_key?(answer.id)
+            range = question.ranges[answer.id]
+            condition_node.conditionvar do |var_node|
+              var_node.vargte range.low_range, :respident => 'response1'
+              var_node.varlte range.high_range, :respident => 'response1'
+            end
           end
           condition_node.setvar(convert_fraction_to_score(answer.fraction), :varname => "SCORE", :action => 'Set')
           if answer.feedback && answer.feedback.strip.length > 0
@@ -37,4 +45,4 @@ module CanvasCc::CanvasCC
       write_standard_answer_feedbacks(item_node, question)
     end
   end
-end
+end

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/canvas_cc.rb

@@ -92,6 +92,7 @@ module CanvasCc
       autoload :Page, 'canvas_cc/canvas_cc/models/page'
       autoload :Discussion, 'canvas_cc/canvas_cc/models/discussion'
       autoload :WorkflowState, 'canvas_cc/canvas_cc/models/workflow_state'
+      autoload :Range, 'canvas_cc/canvas_cc/models/range'
     end
   end
 end

data/spec/moodle2cc/canvas_cc/numerical_question_writer_spec.rb

@@ -65,5 +65,50 @@ module CanvasCc::CanvasCC
       expect(setvar.attributes['varname'].value).to eq 'SCORE'
       expect(setvar.attributes['action'].value).to eq 'Set'
     end
+
+    it 'creates the range question item xml for a numerical question' do
+      question.identifier = 9001
+      question.title = 'its over nine thousannnd'
+      question.general_feedback = 'ur totes awesome'
+      question.material = 'this is a question, or is it?'
+      question.ranges = {}
+      question.tolerances = {}
+
+      answer1 = CanvasCc::CanvasCC::Models::Answer.new
+      answer1.id = 'answer1_id'
+      answer1.fraction = 1
+      answer1.feedback = 'feedbak1'
+      answer1_range = CanvasCc::CanvasCC::Models::Range.new
+      answer1_range.low_range = 1
+      answer1_range.high_range = 4
+      question.ranges[answer1.id] = answer1_range
+      question.answers = [answer1]
+
+      xml = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |node|
+        QuestionWriter.write_question(node, question)
+      end.doc
+      expect(xml.at_xpath('item/@ident').value).to eq question.identifier.to_s
+      expect(xml.at_xpath('item/@title').value).to eq question.title
+      expect(xml.at_xpath("item/itemmetadata/qtimetadata/qtimetadatafield[fieldlabel=\"question_type\" and fieldentry=\"#{question.question_type}\"]")).to_not be_nil
+
+      response = xml.at_xpath('item/presentation/response_str')
+      expect(response.attributes['rcardinality'].value).to eq 'Single'
+      expect(response.attributes['ident'].value).to eq 'response1'
+      expect(response.at_xpath('render_fib').attributes['fibtype'].value).to eq 'Decimal'
+      expect(response.at_xpath('render_fib/response_label').attributes['ident'].value).to eq 'answer1'
+
+      condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"No\"]/displayfeedback[@linkrefid=\"#{answer1.id}_fb\"]/..")
+      varequal = condition.at_xpath('conditionvar/or/varequal[@respident="response1"]')
+
+      vargte = condition.at_xpath('conditionvar/vargte[@respident="response1"]')
+      expect(vargte.text).to eq (answer1_range.low_range).to_s
+      varlte = condition.at_xpath('conditionvar/varlte[@respident="response1"]')
+      expect(varlte.text).to eq (answer1_range.high_range).to_s
+
+      setvar = condition.at_xpath('setvar')
+      expect(setvar.text).to eq '100'
+      expect(setvar.attributes['varname'].value).to eq 'SCORE'
+      expect(setvar.attributes['action'].value).to eq 'Set'
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -283,6 +283,7 @@ files:
 - lib/canvas_cc/canvas_cc/models/question.rb
 - lib/canvas_cc/canvas_cc/models/question_bank.rb
 - lib/canvas_cc/canvas_cc/models/question_group.rb
+- lib/canvas_cc/canvas_cc/models/range.rb
 - lib/canvas_cc/canvas_cc/models/resource.rb
 - lib/canvas_cc/canvas_cc/models/web_content.rb
 - lib/canvas_cc/canvas_cc/models/web_link.rb