moodle2cc 0.2.4 → 0.2.5

data/lib/moodle2cc/moodle2converter/migrator.rb

@@ -14,13 +14,17 @@ module Moodle2CC::Moodle2Converter
         cc_course.discussions += convert_discussions(moodle_course.forums)
         cc_course.assignments += convert_assignments(moodle_course.assignments)
 
-        cc_course.assessments += convert_assessments(moodle_course.quizzes)
+        cc_course.mute_assignments! unless moodle_course.show_grades
+
+        cc_course.assessments += convert_assessments(moodle_course.quizzes, moodle_course.choices,
+          moodle_course.feedbacks, moodle_course.questionnaires)
         cc_course.question_banks += convert_question_banks(moodle_course.question_categories)
         cc_course.resolve_question_references
 
         cc_course.pages += convert_sections_to_pages(moodle_course.sections)
         cc_course.pages += convert_folders(moodle_course)
         cc_course.pages += convert_books(moodle_course.books)
+        cc_course.pages += convert_labels(moodle_course.labels)
         cc_course.pages += convert_glossaries(moodle_course)
 
         cc_course.canvas_modules += convert_sections(moodle_course.sections)
@@ -82,15 +86,25 @@ module Moodle2CC::Moodle2Converter
       books.map { |book| book_converter.convert_to_pages(book) }.flatten
     end
 
+    def convert_labels(labels)
+      label_converter = Moodle2CC::Moodle2Converter::LabelConverter.new
+      labels.map { |label| label_converter.convert_to_pages(label) }.flatten
+    end
+
     def convert_glossaries(moodle_course)
       glossary_converter = Moodle2CC::Moodle2Converter::GlossaryConverter.new(moodle_course)
       moodle_course.glossaries.map { |glossary| glossary_converter.convert(glossary) }
     end
 
     # convert quizzes to assessments
-    def convert_assessments(quizzes)
+    def convert_assessments(quizzes, choices, feedbacks, questionnaires)
       assessment_converter = Moodle2CC::Moodle2Converter::AssessmentConverter.new
-      quizzes.map { |quiz| assessment_converter.convert(quiz) }
+      assessments = []
+      assessments += quizzes.map { |quiz| assessment_converter.convert_quiz(quiz) }
+      assessments += choices.map { |choice| assessment_converter.convert_choice(choice) }
+      assessments += feedbacks.map { |feedback| assessment_converter.convert_feedback(feedback) }
+      assessments += questionnaires.map { |questionnaire| assessment_converter.convert_questionnaire(questionnaire) }
+      assessments
     end
 
     # convert question categories to question banks

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

@@ -1,6 +1,8 @@
 module Moodle2CC::Moodle2Converter
   module QuestionConverters
     class QuestionConverter
+      include ConverterHelper
+
       class << self
         attr_accessor :canvas_question_type
       end
@@ -30,7 +32,8 @@ module Moodle2CC::Moodle2Converter
 
       def convert_question(moodle_question, question_type = nil)
         canvas_question = create_canvas_question(question_type)
-        canvas_question.identifier = moodle_question.id
+        canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, '_quiz_question')
+        canvas_question.original_identifier = moodle_question.id
         canvas_question.title = moodle_question.name
         canvas_question.general_feedback = moodle_question.general_feedback
         canvas_question.answers = moodle_question.answers.map do |moodle_answer|

data/lib/moodle2cc/moodle2converter/questionnaire_converter.rb

@@ -0,0 +1,58 @@
+module Moodle2CC::Moodle2Converter
+  module QuestionnaireConverter
+    include ConverterHelper
+
+    def convert_questionnaire(moodle_questionnaire)
+      canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
+      canvas_assessment.identifier = generate_unique_identifier_for(moodle_questionnaire.id, QUESTIONNAIRE_ASSESSMENT_SUFFIX)
+      canvas_assessment.title = moodle_questionnaire.name
+      canvas_assessment.description = moodle_questionnaire.intro
+      canvas_assessment.workflow_state = workflow_state(moodle_questionnaire.visible)
+
+      canvas_assessment.lock_at = Time.at(Integer(moodle_questionnaire.close_date)) if moodle_questionnaire.close_date
+      canvas_assessment.unlock_at = Time.at(Integer(moodle_questionnaire.open_date)) if moodle_questionnaire.open_date
+
+      canvas_assessment.scoring_policy = 'keep_latest'
+      canvas_assessment.quiz_type = 'survey'
+
+      canvas_assessment.items = []
+      moodle_questionnaire.questions.each do |question|
+        if canvas_question = convert_questionnaire_question(question)
+          canvas_assessment.items << canvas_question
+        end
+      end
+
+      canvas_assessment
+    end
+
+    QUESTION_TYPE_ID_MAP = {
+        1 =>  'true_false_question', # yes/no question
+        2 =>  'essay_question', # text box question
+        3 =>  'essay_question', # essay box question
+        4 =>  'multiple_choice_question', # radio buttons question
+        5 =>  'multiple_answers_question', # check boxes question
+        6 =>  'multiple_choice_question', # dropdown box question
+        8 =>  'multiple_choice_question', # rate 1..5 question
+        9 =>  'essay_question', # date question
+        10 =>  'numerical_question', # numeric question
+        100 =>  'text_only_question', # label question
+    }
+
+    def convert_questionnaire_question(moodle_question)
+      return unless canvas_type = QUESTION_TYPE_ID_MAP[moodle_question.type_id.to_i]
+
+      canvas_question = Moodle2CC::CanvasCC::Models::Question.create(canvas_type)
+      canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, "_questionnaire_question")
+      canvas_question.title = moodle_question.name
+      canvas_question.material = moodle_question.content
+      canvas_question.answers = []
+      moodle_question.choices.each do |choice|
+        answer = Moodle2CC::CanvasCC::Models::Answer.new
+        answer.id = choice[:id]
+        answer.answer_text = choice[:content]
+        canvas_question.answers << answer
+      end
+      canvas_question
+    end
+  end
+end

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -3,7 +3,8 @@ module Moodle2CC
     include Moodle2Converter::ConverterHelper
 
     ACTIVITY_CONVERTERS = {
-      Moodle2::Models::Book => Moodle2Converter::BookConverter
+      Moodle2::Models::Book => Moodle2Converter::BookConverter,
+      Moodle2::Models::Label => Moodle2Converter::LabelConverter,
     }
 
     def initialize
@@ -30,7 +31,7 @@ module Moodle2CC
       canvas_page.workflow_state = workflow_state(moodle_section.visible)
       canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
       canvas_page.body = moodle_section.summary
-      canvas_page.href = generate_unique_resource_path(CanvasCC::Models::Page::WIKI_CONTENT, CGI::escape("#{moodle_section.name}-summary"))
+      canvas_page.href = generate_unique_resource_path(CanvasCC::Models::Page::WIKI_CONTENT, Moodle2CC::CanvasCC::Models::Page.convert_name_to_url("#{moodle_section.name}-summary"))
 
       canvas_page
     end
@@ -49,7 +50,7 @@ module Moodle2CC
       module_item.workflow_state = workflow_state(moodle_activity.visible)
       module_item.title = moodle_activity.name
       unless moodle_activity.is_a? Moodle2::Models::Label
-        if  moodle_activity.is_a? Moodle2::Models::ExternalUrl
+        if moodle_activity.is_a? Moodle2::Models::ExternalUrl
           module_item.identifierref = module_item.identifier
           module_item.url = moodle_activity.external_url.gsub(/\s/, '%20')
         elsif moodle_activity.is_a? Moodle2::Models::Resource

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/moodle2cc/canvas_cc/assignment_writer_spec.rb

@@ -29,6 +29,7 @@ describe Moodle2CC::CanvasCC::AssignmentWriter do
     assignment.peer_reviews = 'false'
     assignment.automatic_peer_reviews = 'true'
     assignment.grade_group_students_individually = 'false'
+    assignment.muted = true
 
     subject.write
     xml = Nokogiri::XML(File.read(File.join(work_dir, assignment.assignment_resource.files.select{ |f| f.split(//).last(4).join("").to_s == '.xml'}.first)))
@@ -51,6 +52,7 @@ describe Moodle2CC::CanvasCC::AssignmentWriter do
     expect(xml.%('assignment/peer_reviews').text).to eq 'false'
     expect(xml.%('assignment/automatic_peer_reviews').text).to eq 'true'
     expect(xml.%('assignment/grade_group_students_individually').text).to eq 'false'
+    expect(xml.%('assignment/muted').text).to eq 'true'
 
   end
 

data/spec/moodle2cc/canvas_cc/models/assessment_spec.rb

@@ -19,23 +19,30 @@ describe Moodle2CC::CanvasCC::Models::Assessment do
   it_behaves_like 'it has an attribute for', :question_references, []
   it_behaves_like 'it has an attribute for', :items
 
-  it 'creates a resource' do
-    subject.stub(:assessment_resource) {:assessment_resource}
-    expect(subject.resources).to eq [:assessment_resource]
+  it 'returns both resources' do
+    subject.stub(:cc_assessment_resource) {:cc_resource}
+    subject.stub(:canvas_assessment_resource) {:canvas_resource}
+    expect(subject.resources).to eq [:cc_resource, :canvas_resource]
   end
 
-  it 'generates an assessment resource' do
+  it 'creates resources' do
     subject.identifier = 'assessment_id'
     subject.title = 'My Assessment'
 
-    resource = subject.assessment_resource
-    expect(resource).to be_a_kind_of Moodle2CC::CanvasCC::Models::Resource
-    expect(resource.files.count).to eq 2
-    expect(resource.identifier).to eq 'assessment_id'
-    expect(resource.type).to eq 'associatedcontent/imscc_xmlv1p1/learning-application-resource'
-    expect(resource.href).to eq 'assessment_id/assessment_meta.xml'
-    expect(resource.files).to include 'assessment_id/assessment_meta.xml'
-    expect(resource.files).to include 'non_cc_assessments/assessment_id.xml.qti'
+    cc_resource = subject.cc_assessment_resource
+    expect(cc_resource).to be_a_kind_of Moodle2CC::CanvasCC::Models::Resource
+    expect(cc_resource.type).to eq 'imsqti_xmlv1p2/imscc_xmlv1p1/assessment'
+    expect(cc_resource.identifier).to eq 'assessment_id'
+    expect(cc_resource.dependencies).to include 'assessment_id_meta'
+
+    canvas_resource = subject.canvas_assessment_resource
+    expect(canvas_resource).to be_a_kind_of Moodle2CC::CanvasCC::Models::Resource
+    expect(canvas_resource.files.count).to eq 2
+    expect(canvas_resource.identifier).to eq 'assessment_id_meta'
+    expect(canvas_resource.type).to eq 'associatedcontent/imscc_xmlv1p1/learning-application-resource'
+    expect(canvas_resource.href).to eq 'assessment_id/assessment_meta.xml'
+    expect(canvas_resource.files).to include 'assessment_id/assessment_meta.xml'
+    expect(canvas_resource.files).to include 'non_cc_assessments/assessment_id.xml.qti'
   end
 
   it 'resolves assessment questions' do
@@ -49,14 +56,14 @@ describe Moodle2CC::CanvasCC::Models::Assessment do
 
     qb1 = Moodle2CC::CanvasCC::Models::QuestionBank.new
     q1 = Moodle2CC::CanvasCC::Models::Question.new
-    q1.identifier = '1'
+    q1.original_identifier = '1'
     q2 = Moodle2CC::CanvasCC::Models::Question.new
-    q2.identifier = '3'
+    q2.original_identifier = '3'
     qb1.questions = [q1, q2]
 
     qb2 = Moodle2CC::CanvasCC::Models::QuestionBank.new
     q3 = Moodle2CC::CanvasCC::Models::Question.new
-    q3.identifier = '2'
+    q3.original_identifier = '2'
     qb2.questions = [q3]
 
     group = Moodle2CC::CanvasCC::Models::QuestionGroup.new
@@ -68,10 +75,10 @@ describe Moodle2CC::CanvasCC::Models::Assessment do
     subject.resolve_question_references([qb1, qb2])
 
     expect(subject.items.count).to eq 3
-    expect(subject.items.detect{|q| q.identifier == '1'}.points_possible).to eq '2'
-    expect(subject.items.detect{|q| q.identifier == '2'}.points_possible).to eq '3'
+    expect(subject.items[0].points_possible).to eq '2'
+    expect(subject.items[1].points_possible).to eq '3'
     # should not include q2 because it's already part of the group
-    expect(subject.items.detect{|q| q.identifier == group.identifier}.points_per_item).to eq 2
+    expect(subject.items[2].points_per_item).to eq 2
   end
 
 

data/spec/moodle2cc/canvas_cc/multiple_answers_question_writer_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+module Moodle2CC::CanvasCC
+  describe MultipleAnswersQuestionWriter do
+
+    let(:question) { Moodle2CC::CanvasCC::Models::Question.create('multiple_answers_question')}
+
+    it 'creates the question item xml for a multiple_choice_question' do
+      question.identifier = 420
+      question.title = 'hello'
+      question.general_feedback = 'feedbacks'
+      question.material = 'materiaru'
+
+      answer1 = Moodle2CC::CanvasCC::Models::Answer.new
+      answer1.id = '1'
+      answer1.answer_text = 'something'
+      answer2 = Moodle2CC::CanvasCC::Models::Answer.new
+      answer2.id = '2'
+      answer2.answer_text = 'something else'
+      answer3 = Moodle2CC::CanvasCC::Models::Answer.new
+      answer3.id = '3'
+      answer3.answer_text = 'something something else'
+      question.answers = [answer1, answer2, answer3]
+
+      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_lid')
+      expect(response.attributes['rcardinality'].value).to eq 'Multiple'
+      expect(response.attributes['ident'].value).to eq 'response1'
+
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{answer1.id}\"]/material/mattext[@texttype=\"text/html\" and text()=\"#{answer1.answer_text}\"]")).not_to be_nil
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{answer2.id}\"]/material/mattext[@texttype=\"text/html\" and text()=\"#{answer2.answer_text}\"]")).not_to be_nil
+      expect(response.at_xpath("render_choice/response_label[@ident=\"#{answer3.id}\"]/material/mattext[@texttype=\"text/html\" and text()=\"#{answer3.answer_text}\"]")).not_to be_nil
+
+      condition = xml.at_xpath("item/resprocessing/respcondition[@continue=\"No\"]")
+      expect(condition.at_xpath("conditionvar/and/varequal[@respident=\"response1\" and text()=\"#{answer1.id}\"]")).not_to be_nil
+      expect(condition.at_xpath("conditionvar/and/not/varequal[@respident=\"response1\" and text()=\"#{answer2.id}\"]")).not_to be_nil
+      expect(condition.at_xpath("conditionvar/and/not/varequal[@respident=\"response1\" and text()=\"#{answer3.id}\"]")).not_to be_nil
+    end
+  end
+end

data/spec/moodle2cc/moodle2/extractor_spec.rb

@@ -17,6 +17,9 @@ module Moodle2CC::Moodle2
       Parsers::FolderParser.any_instance.stub(:parse)
       Parsers::QuestionCategoryParser.any_instance.stub(:parse)
       Parsers::QuizParser.any_instance.stub(:parse)
+      Parsers::ChoiceParser.any_instance.stub(:parse)
+      Parsers::FeedbackParser.any_instance.stub(:parse)
+      Parsers::QuestionnaireParser.any_instance.stub(:parse)
       Parsers::GlossaryParser.any_instance.stub(:parse)
       Parsers::LabelParser.any_instance.stub(:parse)
       Parsers::ExternalUrlParser.any_instance.stub(:parse)
@@ -144,6 +147,27 @@ module Moodle2CC::Moodle2
       expect(course.quizzes).to eq [quiz]
     end
 
+    it 'parses choices' do
+      choice = Models::Choice.new
+      Parsers::ChoiceParser.any_instance.stub(:parse).and_return([choice])
+      extractor.extract {}
+      expect(course.choices).to eq [choice]
+    end
+
+    it 'parses feedbacks' do
+      feedback = Models::Feedback.new
+      Parsers::FeedbackParser.any_instance.stub(:parse).and_return([feedback])
+      extractor.extract {}
+      expect(course.feedbacks).to eq [feedback]
+    end
+
+    it 'parses questionnaires' do
+      questionnaire = Models::Questionnaire.new
+      Parsers::QuestionnaireParser.any_instance.stub(:parse).and_return([questionnaire])
+      extractor.extract {}
+      expect(course.questionnaires).to eq [questionnaire]
+    end
+
     it 'parses glossaries' do
       glossary = Models::Glossary.new
       Parsers::GlossaryParser.any_instance.stub(:parse).and_return([glossary])

data/spec/moodle2cc/moodle2/models/label_spec.rb

@@ -9,5 +9,76 @@ module Moodle2CC::Moodle2::Models
     it_behaves_like 'it has an attribute for', :intro_format
     it_behaves_like 'it has an attribute for', :visible
 
+
+    describe '#process_for_conversion!' do
+      it 'should use the intro text if the name has no text' do
+        subject.name = '<hr>'
+        subject.intro = 'use me'
+
+        expect(subject.converted_title).to eq 'use me'
+        expect(subject.convert_to_page?).to eq false
+        expect(subject.convert_to_header?).to eq true
+      end
+
+      it 'should use the intro text if the name is just "Label"' do
+        subject.name = 'Label'
+        subject.intro = 'use me'
+
+        expect(subject.converted_title).to eq 'use me'
+        expect(subject.convert_to_page?).to eq false
+        expect(subject.convert_to_header?).to eq true
+      end
+
+      it 'should use the intro text if the name was truncated' do
+        subject.name = ("a" * 50) + "..."
+        subject.intro = ("a" * 70)
+
+        expect(subject.converted_title).to eq ("a" * 70)
+        expect(subject.convert_to_page?).to eq false
+        expect(subject.convert_to_header?).to eq true
+      end
+
+      it 'should truncate the intro text if it is too long' do
+        subject.name = '<hr>'
+        subject.intro = ("a" * 90)
+
+        expect(subject.converted_title).to eq (("a" * 80) + '...')
+        expect(subject.convert_to_page?).to eq true
+        expect(subject.convert_to_header?).to eq false
+      end
+
+      it 'should come up with a label if there is nothing else' do
+        subject.name = '<hr>'
+        subject.intro = '<img src="somelinky">'
+
+        expect(subject.converted_title).to eq Moodle2CC::Moodle2::Models::Label::DEFAULT_PAGE_TITLE
+        expect(subject.convert_to_page?).to eq true
+        expect(subject.convert_to_header?).to eq false
+      end
+
+      it 'should not convert to anything if there is no content' do
+        subject.name = '<hr>'
+        subject.intro = '<br>'
+
+        expect(subject.convert_to_page?).to eq false
+        expect(subject.convert_to_header?).to eq false
+      end
+
+      it 'should not convert to page if the name and intro have the same text' do
+        subject.name = 'blah'
+        subject.intro = '<p>blah</p>'
+
+        expect(subject.convert_to_page?).to eq false
+        expect(subject.convert_to_header?).to eq true
+      end
+
+      it 'should convert to page if the intro has different text' do
+        subject.name = 'blah'
+        subject.intro = '<p>blah blah</p>'
+
+        expect(subject.convert_to_page?).to eq true
+        expect(subject.convert_to_header?).to eq false
+      end
+    end
   end
 end

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Moodle2CC::Moodle2::Parsers::ChoiceParser do
+  subject { Moodle2CC::Moodle2::Parsers::ChoiceParser.new(fixture_path(File.join('moodle2', 'backup'))) }
+
+  it 'should parse a choice activity' do
+    choices = subject.parse
+    expect(choices.count).to eq 1
+    choice = choices.first
+
+    expect(choice.id).to eq '1'
+
+    expect(choice.module_id).to eq '56547'
+    expect(choice.name).to eq 'Example Choice Activity'
+    expect(choice.intro).to eq 'Choice activity description'
+    expect(choice.intro_format).to eq '1'
+    expect(choice.time_open).to eq '0'
+    expect(choice.time_close).to eq '0'
+    expect(choice.time_modified).to eq '1376437841'
+
+    expect(choice.publish).to eq '0'
+    expect(choice.show_results).to eq '0'
+    expect(choice.display).to eq '1'
+    expect(choice.allow_update).to eq '1'
+    expect(choice.show_unanswered).to eq '1'
+    expect(choice.limit_answers).to eq '1'
+    expect(choice.completion_submit).to eq '0'
+
+    expect(choice.options).to eq ['Option 1', 'Option 2']
+  end
+
+end