moodle2cc 0.2.9 → 0.2.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGZkMWM1ODcxZGM3NzlkMTg2NmYzZjE0YTUzYTU4ODQxOGExZjQ5NQ==
+    NmY2ODJmNDFmYWI4NzNlNWE3MWM4ZTFlMmE4Y2Y2YTk4YjljZWRiOA==
   data.tar.gz: !binary |-
-    Yzc3M2I1MWI1MzljZWFkMTM2YzI1YzFkODRmMzJkZDM5ZGYwZDc4Yg==
+    NjQ2ZDlhOTc4NDcxYzY0NDdiZmEyNDcyZGI0MzY1ZjBiZWM5ZDUzMw==
 SHA512:
   metadata.gz: !binary |-
-    MDg2MmRjMmExMTUwM2NmMmEyMGY1NzNlZDgwZmZhM2Y0ZDJlYjAzNTBmM2Nh
-    ODJiZmM4YWY0OWI2YWYxNjcyZDQ4MWZjZjk0NTRhMmQ3ZjE4MTM0ZDAxNjE1
-    NGJhODA5MGQ4MjU1N2RjZDlhYzRlZDczM2JhYjQ0N2ZjMzU3MTI=
+    ZjI4M2FmYzQ1NmQ5NWJhMzExOTY5ZTViYTYxYmUyNjJmNWQ2ODgzODA1YzAx
+    YWMzNzJmNGY2MTI0YzkwNjRkODVhNjZiYWZlNzRhMWVmN2NhMWZhOGQwNzNl
+    N2M4NmFkNGJhODZmZWI1NGQzMTcwZWNlY2Y3Njc2N2NkN2EzY2Y=
   data.tar.gz: !binary |-
-    Nzc1YWExZGQ4YjhmNjJkNTBjZTM2M2I0OWYxMThhMjEzZGIyZGI0ODMzN2M4
-    NGZkYjU2NWE3Zjg3NTE3ZWYzMGUyMzUwNzk4NWY0MmE4MDNlOGRjNWQyNDE5
-    MTE5MTBhZjI3M2E5MTFkM2YxM2ZmNjYwNDgxZTA1NDA2MzJhNTg=
+    NTM4YjMwODIwNmQ4MWZkNzk0NGQyZGExMjNhMzdmMDRjZGJkMmE3MWMyMDEy
+    MTg5MGRmODA0MjExNDNlZGRhYjE1MWU5YTAzZGVjYWJlYjNkMzg5ZjYwYjhm
+    NDA1NjdkMzA3NGMyNTk4MzFmMTRjNzU4ZmQyMzdkNmQ3NWVhM2U=

data/Changelog

@@ -1,3 +1,7 @@
+2014-06-19 Version 0.2.10
+  * Require students to post before viewing converted Q & A forums
+  * Convert multiple attempts settings from feedback activites
+
 2014-06-05 Version 0.2.9
   * Minor fixes for multi-answer and html conversion
 

data/lib/moodle2cc/canvas_cc/discussion_writer.rb

@@ -42,6 +42,7 @@ module Moodle2CC::CanvasCC
           xml.position
           xml.type 'topic'
           xml.discussion_type discussion.discussion_type
+          xml.require_initial_post discussion.require_initial_post
         }
       end.to_xml
       File.open(File.join(@work_dir, meta_resource.href), 'w') { |f| f.write(xml) }

data/lib/moodle2cc/canvas_cc/models/discussion.rb

@@ -1,6 +1,6 @@
 module Moodle2CC::CanvasCC::Models
   class Discussion
-    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state
+    attr_accessor :identifier, :title, :text, :discussion_type, :workflow_state, :require_initial_post
     DISCUSSION_ID_POSTFIX = '_DISCUSSION'
     DISCUSSION_META_POSTFIX = '_meta'
     IMSDT_TYPE = 'imsdt_xmlv1p1'

data/lib/moodle2cc/moodle2/models/feedback.rb

@@ -2,7 +2,7 @@ module Moodle2CC::Moodle2::Models
   class Feedback
 
     attr_accessor :id, :module_id, :name, :intro, :intro_format, :time_open, :time_close,
-                  :time_modified, :items, :visible
+                  :time_modified, :items, :visible, :multiple_submit
 
     def initialize
       @items = []

data/lib/moodle2cc/moodle2/models/quizzes/multianswer_question.rb

@@ -4,6 +4,7 @@ module Moodle2CC::Moodle2::Models::Quizzes
     attr_accessor :embedded_question_references, :embedded_questions
 
     def initialize
+      super
       @embedded_questions = []
     end
 

data/lib/moodle2cc/moodle2/parsers/feedback_parser.rb

@@ -32,6 +32,8 @@ module Moodle2CC::Moodle2::Parsers
         feedback.time_close = parse_text(xml, '/activity/feedback/timeclose')
         feedback.time_modified = parse_text(xml, '/activity/feedback/timemodified')
 
+        feedback.multiple_submit = parse_boolean(xml, '/activity/feedback/multiple_submit')
+
         xml.search('/activity/feedback/items/item').each do |node|
           item = Moodle2CC::Moodle2::Models::Feedback::Question.new
           item.id = node.attributes['id'].value

data/lib/moodle2cc/moodle2converter/discussion_converter.rb

@@ -10,7 +10,7 @@ module Moodle2CC::Moodle2Converter
       discussion.text = forum.intro
       discussion.discussion_type = 'threaded'
       discussion.workflow_state = workflow_state(forum.visible)
-
+      discussion.require_initial_post = (forum.type == 'qanda')
       discussion
     end
 

data/lib/moodle2cc/moodle2converter/feedback_converter.rb

@@ -15,6 +15,8 @@ module Moodle2CC::Moodle2Converter
       canvas_assessment.scoring_policy = 'keep_latest'
       canvas_assessment.quiz_type = 'survey'
 
+      canvas_assessment.allowed_attempts = -1 if moodle_feedback.multiple_submit
+
       canvas_assessment.items = []
       moodle_feedback.items.each do |item|
         if canvas_question = convert_feedback_question(item)

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/moodle2cc/moodle2/models/quizzes/multianswer_question_spec.rb

@@ -6,7 +6,7 @@ module Moodle2CC::Moodle2::Models::Quizzes
     it_behaves_like 'a Moodle2CC::Moodle2::Models::Quizzes::Question'
 
     it_behaves_like 'it has an attribute for', :embedded_question_references
-    it_behaves_like 'it has an attribute for', :embedded_questions
+    it_behaves_like 'it has an attribute for', :embedded_questions, []
 
     it_behaves_like 'it is registered as a Question', 'multianswer'
 

data/spec/moodle2cc/moodle2/parsers/feedback_parser_spec.rb

@@ -5,10 +5,8 @@ describe Moodle2CC::Moodle2::Parsers::FeedbackParser do
 
   it 'should parse a feedback activity' do
     feedbacks = subject.parse
-    expect(feedbacks.count).to eq 1
-    feedback = feedbacks.first
-
-    expect(feedback.id).to eq '7'
+    expect(feedbacks.count).to eq 2
+    feedback = feedbacks.detect{|f| f.id == '7'}
 
     expect(feedback.module_id).to eq '58588'
     expect(feedback.name).to eq 'feedback name'
@@ -17,6 +15,7 @@ describe Moodle2CC::Moodle2::Parsers::FeedbackParser do
     expect(feedback.time_close).to eq '0'
     expect(feedback.time_open).to eq '0'
     expect(feedback.time_modified).to eq '1397566320'
+    expect(feedback.multiple_submit).to eq false
 
     expect(feedback.items.count).to eq 9
     item = feedback.items.last
@@ -26,6 +25,9 @@ describe Moodle2CC::Moodle2::Parsers::FeedbackParser do
     expect(item.position).to eq '9'
     expect(item.type).to eq 'textfield'
     expect(item.presentation).to eq '30|5'
+
+    feedback2 = feedbacks.detect{|f| f.id == '8'}
+    expect(feedback2.multiple_submit).to eq true
   end
 
 end

data/spec/moodle2cc/moodle2converter/discussion_converter_spec.rb

@@ -9,6 +9,7 @@ describe DiscussionConverter do
       forum.name = 'Forum Name'
       forum.intro = 'Forum Introduction'
       forum.visible = false
+      forum.type = 'qanda'
 
       discussion = subject.convert(forum)
 
@@ -17,7 +18,11 @@ describe DiscussionConverter do
       expect(discussion.text).to eq 'Forum Introduction'
       expect(discussion.discussion_type).to eq 'threaded'
       expect(discussion.workflow_state).to eq 'unpublished'
+      expect(discussion.require_initial_post).to eq true
 
+      forum.type = 'general'
+      discussion2 = subject.convert(forum)
+      expect(discussion2.require_initial_post).to eq false
     end
   end
 end

data/test/fixtures/moodle2/backup/activities/feedback_58589/feedback.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<activity id="8" moduleid="58589" modulename="feedback" contextid="162391">
+  <feedback id="8">
+    <name>feedback name</name>
+    <intro>&lt;p&gt;feedback description&lt;/p&gt;</intro>
+    <introformat>1</introformat>
+    <anonymous>1</anonymous>
+    <email_notification>0</email_notification>
+    <multiple_submit>1</multiple_submit>
+    <autonumbering>0</autonumbering>
+    <site_after_submit></site_after_submit>
+    <page_after_submit></page_after_submit>
+    <page_after_submitformat>1</page_after_submitformat>
+    <publish_stats>0</publish_stats>
+    <timeopen>0</timeopen>
+    <timeclose>0</timeclose>
+    <timemodified>1397566320</timemodified>
+    <completionsubmit>0</completionsubmit>
+    <items>
+      <item id="123">
+        <template>0</template>
+        <name>Captcha</name>
+        <label>Captcha</label>
+        <presentation></presentation>
+        <typ>captcha</typ>
+        <hasvalue>0</hasvalue>
+        <position>1</position>
+        <required>1</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="124">
+        <template>0</template>
+        <name>Information question</name>
+        <label>informationlabel</label>
+        <presentation>3</presentation>
+        <typ>info</typ>
+        <hasvalue>1</hasvalue>
+        <position>2</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="125">
+        <template>0</template>
+        <name>label</name>
+        <label></label>
+        <presentation>&lt;p&gt;Label "question"&lt;/p&gt;</presentation>
+        <typ>label</typ>
+        <hasvalue>0</hasvalue>
+        <position>3</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="126">
+        <template>0</template>
+        <name></name>
+        <label></label>
+        <presentation></presentation>
+        <typ>pagebreak</typ>
+        <hasvalue>0</hasvalue>
+        <position>4</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="127">
+        <template>0</template>
+        <name>longer text answer</name>
+        <label>longertextanswerlabel</label>
+        <presentation>30|5</presentation>
+        <typ>textarea</typ>
+        <hasvalue>1</hasvalue>
+        <position>5</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="128">
+        <template>0</template>
+        <name>multiple choice question</name>
+        <label>multiplechoicelabel</label>
+        <presentation>r&gt;&gt;&gt;&gt;&gt;Option 1
+|Option 2
+|Option 3</presentation>
+        <typ>multichoice</typ>
+        <hasvalue>1</hasvalue>
+        <position>6</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="129">
+        <template>0</template>
+        <name>multiple choice rated</name>
+        <label>ratedlabel</label>
+        <presentation>r&gt;&gt;&gt;&gt;&gt;1####Something
+          |2####something else
+          |3####something something else</presentation>
+        <typ>multichoicerated</typ>
+        <hasvalue>1</hasvalue>
+        <position>7</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="130">
+        <template>0</template>
+        <name>numeric question</name>
+        <label>numbericquestisonlabel</label>
+        <presentation>1|100</presentation>
+        <typ>numeric</typ>
+        <hasvalue>1</hasvalue>
+        <position>8</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+      <item id="131">
+        <template>0</template>
+        <name>short text question</name>
+        <label>shorttextlabel</label>
+        <presentation>30|5</presentation>
+        <typ>textfield</typ>
+        <hasvalue>1</hasvalue>
+        <position>9</position>
+        <required>0</required>
+        <dependitem>0</dependitem>
+        <dependvalue></dependvalue>
+        <options></options>
+      </item>
+    </items>
+    <completeds>
+    </completeds>
+    <trackings>
+    </trackings>
+  </feedback>
+</activity>

data/test/fixtures/moodle2/backup/activities/feedback_58589/filters.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<filters>
+  <filter_actives>
+  </filter_actives>
+  <filter_configs>
+  </filter_configs>
+</filters>

data/test/fixtures/moodle2/backup/activities/feedback_58589/grades.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<activity_gradebook>
+  <grade_items>
+  </grade_items>
+  <grade_letters>
+  </grade_letters>
+</activity_gradebook>

data/test/fixtures/moodle2/backup/activities/feedback_58589/inforef.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inforef>
+</inforef>

data/test/fixtures/moodle2/backup/activities/feedback_58589/module.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module id="58588" version="2013050100">
+  <modulename>feedback</modulename>
+  <sectionid>34361</sectionid>
+  <sectionnumber>2</sectionnumber>
+  <idnumber>$@NULL@$</idnumber>
+  <added>1397566320</added>
+  <score>0</score>
+  <indent>0</indent>
+  <visible>1</visible>
+  <visibleold>1</visibleold>
+  <groupmode>0</groupmode>
+  <groupingid>0</groupingid>
+  <groupmembersonly>0</groupmembersonly>
+  <completion>1</completion>
+  <completiongradeitemnumber>$@NULL@$</completiongradeitemnumber>
+  <completionview>0</completionview>
+  <completionexpected>0</completionexpected>
+  <availablefrom>0</availablefrom>
+  <availableuntil>0</availableuntil>
+  <releasecode>code</releasecode>
+  <showavailability>1</showavailability>
+  <showdescription>0</showdescription>
+  <plugin_outcomesupport_mod_module>
+  </plugin_outcomesupport_mod_module>
+  <availability_info>
+  </availability_info>
+</module>

data/test/fixtures/moodle2/backup/activities/feedback_58589/roles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<roles>
+  <role_overrides>
+  </role_overrides>
+  <role_assignments>
+  </role_assignments>
+</roles>

data/test/fixtures/moodle2/backup/moodle_backup.xml

@@ -127,6 +127,13 @@
           <title>feedback name</title>
           <directory>activities/feedback_58588</directory>
         </activity>
+        <activity>
+          <moduleid>58589</moduleid>
+          <sectionid>7</sectionid>
+          <modulename>feedback</modulename>
+          <title>feedback name</title>
+          <directory>activities/feedback_58589</directory>
+        </activity>
         <activity>
           <moduleid>58541</moduleid>
           <sectionid>7</sectionid>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -580,6 +580,12 @@ files:
 - test/fixtures/moodle2/backup/activities/feedback_58588/inforef.xml
 - test/fixtures/moodle2/backup/activities/feedback_58588/module.xml
 - test/fixtures/moodle2/backup/activities/feedback_58588/roles.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/feedback.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/filters.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/grades.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/inforef.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/module.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/roles.xml
 - test/fixtures/moodle2/backup/activities/folder_7/calendar.xml
 - test/fixtures/moodle2/backup/activities/folder_7/comments.xml
 - test/fixtures/moodle2/backup/activities/folder_7/completion.xml
@@ -816,7 +822,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package
@@ -991,6 +997,12 @@ test_files:
 - test/fixtures/moodle2/backup/activities/feedback_58588/inforef.xml
 - test/fixtures/moodle2/backup/activities/feedback_58588/module.xml
 - test/fixtures/moodle2/backup/activities/feedback_58588/roles.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/feedback.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/filters.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/grades.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/inforef.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/module.xml
+- test/fixtures/moodle2/backup/activities/feedback_58589/roles.xml
 - test/fixtures/moodle2/backup/activities/folder_7/calendar.xml
 - test/fixtures/moodle2/backup/activities/folder_7/comments.xml
 - test/fixtures/moodle2/backup/activities/folder_7/completion.xml