moodle2cc 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f969d2f7368900021156821b2c2ae6a281537a62
-  data.tar.gz: d7a74aabc0ac5b8e6685609c8585842160ff1fc6
+  metadata.gz: 6b1d22bdd944f0925c2befbbee3d813434430390
+  data.tar.gz: 9df2399db6f8d7c7f69cd06dc614a47efd19e466
 SHA512:
-  metadata.gz: b1425675e06c543e115183e120b3445de515a08534b355016d39d2e7b34d04c8e3cb4fb45959fc27e00314b5af3383a47ccb9d542299b2576542723e51dbb71e
-  data.tar.gz: 66257861517ed93c453649385228d3ea377c8da48fdfb5b7e9784c236ce395f44ba64890b60f62a9f26b38f40b03a602a93f1de5946e342c1d569bae53c6ca86
+  metadata.gz: fa64d74660520a99a1a10684f9dce33f93a5561b4e082e71143274ea9a04bbf29a39869fd58ce63e46c4703f2ea59cd87e0dded1b1dedced31fed52360bf4771
+  data.tar.gz: b984fdff074b0571fe6374da222ec5afc7e22e0ffbc063440f9c1458ad1d42f9547a3eb12a7578d31c63bac0bd7794e8c969704cd033bad3acfc6e27b6f20761

data/lib/moodle2cc/canvas_cc/matching_question_writer.rb

@@ -9,13 +9,13 @@ module Moodle2CC::CanvasCC
         presentation_node.response_lid(:ident => "response_#{match[:id]}") do |response_node|
           next unless match[:question_text].length > 0
           response_node.material do |material_node|
-            material_node.mattext(match[:question_text], :texttype => 'text/plain')
+            material_node.mattext(match[:question_text], :texttype => ((match[:question_text_format].to_i == 1) ? 'text/html' : 'text/plain'))
           end
           response_node.render_choice do |choice_node|
             question.matches.each do |possible_match|
               choice_node.response_label(:ident => possible_match[:id]) do |label_node|
                 label_node.material do |material_node|
-                  material_node.mattext(possible_match[:answer_text], :texttype => 'text/plain')
+                  material_node.mattext(possible_match[:answer_text], :texttype => ((match[:answer_text_format].to_i == 1) ? 'text/html' : 'text/plain'))
                 end
               end
             end

data/lib/moodle2cc/moodle2converter/question_converters/matching_converter.rb

@@ -12,8 +12,10 @@ module Moodle2CC::Moodle2Converter
           copy = match.dup
           copy[:question_text] ||= ''
           copy[:question_text].gsub(/\{(.*?)\}/, '[\1]')
-          copy[:question_text] = RDiscount.new(copy[:question_text]).to_html if copy[:question_text_format].to_i == 4 # markdown
-
+          if copy[:question_text_format].to_i == 4 # markdown
+            copy[:question_text] = RDiscount.new(copy[:question_text]).to_html
+            copy[:question_text_format] = '1' # html
+          end
           canvas_question.matches << copy
         end
         canvas_question

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.33"
+  VERSION = "0.2.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip