canvas_cc 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7dfc1c2bf4252d4053f16853838d682655a0a2
-  data.tar.gz: e315e80d6d0c91ae436161078a9a54a276550e11
+  metadata.gz: 00a8e65390d41cd471d721eaace37d095f02853b
+  data.tar.gz: dfb6fe7cd316dfd180ac885a71231944cedd254b
 SHA512:
-  metadata.gz: 8a26e8359abd426e7c7a6f644b701a3b66d6195c4ac5334526c1fd7a366f974814ea3af5fdf9ea4748126543e3a70a88e27360eaae98203649d8148d1f45a332
-  data.tar.gz: 15127a311a52298dd08911ed9b9c6cd13ed783c4fb80f152baaca1981dbfa5500f2c1781483eb3c89ef7080418c36715984c24001b62e43870d167e638841f95
+  metadata.gz: b7d132358fe8e2890e9be96d7d6213fc898b086141a935e9ac4b3056e991f9bbceb4ea01f6e826d059729b8a5af01282c6bb89b4ef4b295eb8b68aba371dcc72
+  data.tar.gz: 960548089f8c5e7593ff4b7a9bff02bf40e67d058c0279331d9b1732e6cd2d52a2e02e67843697b9ffdb7aabdf0e8ff2ba52e80c2e0564e15e3c32a53f001728

data/lib/canvas_cc/canvas_cc/models/question.rb

@@ -5,7 +5,8 @@ module CanvasCc::CanvasCC::Models
                                'multiple_choice_question', 'multiple_answers_question',
                                'short_answer_question', 'text_only_question', 'true_false_question']
 
-    attr_accessor :identifier, :original_identifier, :title, :material, :answers, :general_feedback, *QTI_META_ATTRIBUTES
+    attr_accessor :identifier, :original_identifier, :title, :material, :answers, :general_feedback,
+    :general_incorrect_feedback, :general_correct_feedback, *QTI_META_ATTRIBUTES
 
     @@subclasses = {}
 
@@ -34,4 +35,4 @@ end
 require_relative 'calculated_question'
 require_relative 'matching_question'
 require_relative 'multiple_dropdowns_question'
-require_relative 'numerical_question'
+require_relative 'numerical_question'

data/lib/canvas_cc/canvas_cc/multiple_blanks_question_writer.rb

@@ -7,7 +7,7 @@ module CanvasCc::CanvasCC
     def self.write_responses(presentation_node, question)
       resp_idents = question.answers.map{|a| a.resp_ident}.uniq
       resp_idents.each do |resp_ident|
-        presentation_node.response_lid(:ident => resp_ident, :rcardinality => 'Single') do |response_node|
+        presentation_node.response_lid(:ident => resp_ident) do |response_node|
           response_node.render_choice do |choice_node|
             question.answers.select{|a| a.resp_ident == resp_ident}.each do |answer|
               choice_node.response_label(:ident => answer.id) do |label_node|
@@ -35,7 +35,7 @@ module CanvasCc::CanvasCC
 
       # Scores
       question.answers.each do |answer|
-        processing_node.respcondition(:continue => 'No') do |condition_node|
+        processing_node.respcondition() do |condition_node|
           condition_node.conditionvar do |var_node|
             var_node.varequal answer.id, :respident => answer.resp_ident
           end
@@ -44,8 +44,8 @@ module CanvasCc::CanvasCC
       end
     end
 
-    def self.write_additional_nodes(item_node, question)
-      write_standard_answer_feedbacks(item_node, question)
-    end
+    # def self.write_additional_nodes(item_node, question)
+    #   write_standard_answer_feedbacks(item_node, question)
+    # end
   end
-end
+end

data/lib/canvas_cc/canvas_cc/question_writer.rb

@@ -83,7 +83,27 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => 'general_fb') do |fb_node|
           fb_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext(question.general_feedback, :texttype => 'text/html')
+              material_node.mattext(question.general_feedback, :texttype => 'text/plain')
+            end
+          end
+        end
+      end
+
+      if question.general_correct_feedback && question.general_correct_feedback.length > 0
+        item_node.itemfeedback(:ident => 'general_correct_fb') do |fb_node|
+          fb_node.flow_mat do |flow_node|
+            flow_node.material do |material_node|
+              material_node.mattext(question.general_correct_feedback, :texttype => 'text/plain')
+            end
+          end
+        end
+      end
+
+      if question.general_incorrect_feedback && question.general_incorrect_feedback.length > 0
+        item_node.itemfeedback(:ident => 'general_incorrect_fb') do |fb_node|
+          fb_node.flow_mat do |flow_node|
+            flow_node.material do |material_node|
+              material_node.mattext(question.general_incorrect_feedback, :texttype => 'text/plain')
             end
           end
         end
@@ -101,7 +121,7 @@ module CanvasCc::CanvasCC
         item_node.itemfeedback(:ident => "#{answer.id}_fb") do |feedback_node|
           feedback_node.flow_mat do |flow_node|
             flow_node.material do |material_node|
-              material_node.mattext answer.feedback, :texttype => 'text/html'
+              material_node.mattext answer.feedback, :texttype => 'text/plain'
             end
           end
         end

data/lib/canvas_cc/version.rb

@@ -1,3 +1,3 @@
 module CanvasCc
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_cc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Instructure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip