moodle2cc 0.2.4 → 0.2.5

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

@@ -0,0 +1,19 @@
+module Moodle2CC::Moodle2::Models
+  class Questionnaire
+
+    attr_accessor :id, :module_id, :name, :intro, :intro_format, :open_date, :close_date,
+                  :time_modified, :questions, :visible
+
+    def initialize
+      @questions = []
+    end
+
+    class Question
+      attr_accessor :id, :name, :type_id, :content, :position, :deleted, :choices
+
+      def initialize
+        @choices = []
+      end
+    end
+  end
+end

data/lib/moodle2cc/moodle2/parsers.rb

@@ -2,12 +2,15 @@ module Moodle2CC::Moodle2::Parsers
   require_relative 'parsers/parser_helper'
   require_relative 'parsers/assignment_parser'
   require_relative 'parsers/book_parser'
+  require_relative 'parsers/choice_parser'
   require_relative 'parsers/course_parser'
+  require_relative 'parsers/feedback_parser'
   require_relative 'parsers/file_parser'
   require_relative 'parsers/folder_parser'
   require_relative 'parsers/forum_parser'
   require_relative 'parsers/page_parser'
   require_relative 'parsers/question_category_parser'
+  require_relative 'parsers/questionnaire_parser'
   require_relative 'parsers/quiz_parser'
   require_relative 'parsers/section_parser'
   require_relative 'parsers/question_parsers'

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

@@ -0,0 +1,52 @@
+module Moodle2CC::Moodle2::Parsers
+  class ChoiceParser
+    include ParserHelper
+
+    CHOICE_XML = 'choice.xml'
+    CHOICE_MODULE_NAME = 'choice'
+
+    def initialize(backup_dir)
+      @backup_dir = backup_dir
+    end
+
+    def parse
+      activity_dirs = activity_directories(@backup_dir, CHOICE_MODULE_NAME)
+      activity_dirs.map { |dir| parse_choice(dir) }
+    end
+
+    private
+
+    def parse_choice(dir)
+      choice = Moodle2CC::Moodle2::Models::Choice.new
+      activity_dir = File.join(@backup_dir, dir)
+      File.open(File.join(activity_dir, CHOICE_XML)) do |f|
+        xml = Nokogiri::XML(f)
+        choice.id = xml.at_xpath('/activity/choice/@id').value
+        choice.module_id = xml.at_xpath('/activity/@moduleid').value
+        choice.name = parse_text(xml, '/activity/choice/name')
+        choice.intro = parse_text(xml, '/activity/choice/intro')
+        choice.intro_format = parse_text(xml, '/activity/choice/introformat')
+        
+        choice.time_open = parse_text(xml, '/activity/choice/timeopen')
+        choice.time_close = parse_text(xml, '/activity/choice/timeclose')
+        choice.time_modified = parse_text(xml, '/activity/choice/timemodified')
+
+        choice.publish = parse_text(xml, '/activity/choice/publish')
+        choice.show_results = parse_text(xml, '/activity/choice/showresults')
+        choice.display = parse_text(xml, '/activity/choice/display')
+        choice.allow_update = parse_text(xml, '/activity/choice/allowupdate')
+        choice.show_unanswered = parse_text(xml, '/activity/choice/showunanswered')
+        choice.limit_answers = parse_text(xml, '/activity/choice/limitanswers')
+        choice.completion_submit = parse_text(xml, '/activity/choice/completionsubmit')
+
+        xml.search('/activity/choice/options/option').each do |node|
+          choice.options << parse_text(node, 'text')
+        end
+      end
+      parse_module(activity_dir, choice)
+
+      choice
+    end
+
+  end
+end

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

@@ -1,5 +1,6 @@
 module Moodle2CC::Moodle2::Parsers
   class CourseParser
+    include ParserHelper
 
     COURSE_XML_PATH = 'course/course.xml'
 
@@ -16,6 +17,7 @@ module Moodle2CC::Moodle2::Parsers
         course.fullname = course_doc.at_xpath('/course/fullname').text
         course.shortname = course_doc.at_xpath('/course/shortname').text
         course.summary = course_doc.at_xpath('/course/summary').text
+        course.show_grades = parse_boolean(course_doc, '/course/showgrades')
         if unix_start_date = course_doc.at_xpath('/course/startdate').text
           course.startdate = Time.at(unix_start_date.to_i)
         end

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

@@ -0,0 +1,54 @@
+module Moodle2CC::Moodle2::Parsers
+  class FeedbackParser
+    include ParserHelper
+
+    FEEDBACK_XML = 'feedback.xml'
+    FEEDBACK_MODULE_NAME = 'feedback'
+
+    def initialize(backup_dir)
+      @backup_dir = backup_dir
+    end
+
+    def parse
+      activity_dirs = activity_directories(@backup_dir, FEEDBACK_MODULE_NAME)
+      activity_dirs.map { |dir| parse_feedback(dir) }
+    end
+
+    private
+
+    def parse_feedback(dir)
+      feedback = Moodle2CC::Moodle2::Models::Feedback.new
+      activity_dir = File.join(@backup_dir, dir)
+
+      File.open(File.join(activity_dir, FEEDBACK_XML)) do |f|
+        xml = Nokogiri::XML(f)
+        feedback.id = xml.at_xpath('/activity/feedback/@id').value
+        feedback.module_id = xml.at_xpath('/activity/@moduleid').value
+        feedback.name = parse_text(xml, '/activity/feedback/name')
+        feedback.intro = parse_text(xml, '/activity/feedback/intro')
+        feedback.intro_format = parse_text(xml, '/activity/feedback/introformat')
+
+        feedback.time_open = parse_text(xml, '/activity/feedback/timeopen')
+        feedback.time_close = parse_text(xml, '/activity/feedback/timeclose')
+        feedback.time_modified = parse_text(xml, '/activity/feedback/timemodified')
+
+        xml.search('/activity/feedback/items/item').each do |node|
+          item = Moodle2CC::Moodle2::Models::Feedback::Question.new
+          item.id = node.attributes['id'].value
+          item.name = parse_text(node, 'name')
+          item.label = parse_text(node, 'label')
+          item.type = parse_text(node, 'typ')
+          item.position = parse_text(node, 'position')
+          item.presentation = parse_text(node, 'presentation')
+
+          feedback.items << item
+        end
+        feedback.items.sort_by!{|q| q.position.to_i}
+      end
+      parse_module(activity_dir, feedback)
+
+      feedback
+    end
+
+  end
+end

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

@@ -0,0 +1,58 @@
+module Moodle2CC::Moodle2::Parsers
+  class QuestionnaireParser
+    include ParserHelper
+
+    QUESTIONNAIRE_XML = 'questionnaire.xml'
+    QUESTIONNAIRE_MODULE_NAME = 'questionnaire'
+
+    def initialize(backup_dir)
+      @backup_dir = backup_dir
+    end
+
+    def parse
+      activity_dirs = activity_directories(@backup_dir, QUESTIONNAIRE_MODULE_NAME)
+      activity_dirs.map { |dir| parse_questionnaire(dir) }
+    end
+
+    private
+
+    def parse_questionnaire(dir)
+      questionnaire = Moodle2CC::Moodle2::Models::Questionnaire.new
+      activity_dir = File.join(@backup_dir, dir)
+
+      File.open(File.join(activity_dir, QUESTIONNAIRE_XML)) do |f|
+        xml = Nokogiri::XML(f)
+        questionnaire.id = xml.at_xpath('/activity/questionnaire/@id').value
+        questionnaire.module_id = xml.at_xpath('/activity/@moduleid').value
+        questionnaire.name = parse_text(xml, '/activity/questionnaire/name')
+        questionnaire.intro = parse_text(xml, '/activity/questionnaire/intro')
+        questionnaire.intro_format = parse_text(xml, '/activity/questionnaire/introformat')
+
+        questionnaire.open_date = parse_text(xml, '/activity/questionnaire/opendate')
+        questionnaire.close_date = parse_text(xml, '/activity/questionnaire/closedate')
+        questionnaire.time_modified = parse_text(xml, '/activity/questionnaire/timemodified')
+
+        xml.search('/activity/questionnaire/surveys/survey/questions/question').each do |node|
+          question = Moodle2CC::Moodle2::Models::Questionnaire::Question.new
+          question.id = node.attributes['id'].value
+          question.name = parse_text(node, 'name')
+          question.type_id = parse_text(node, 'type_id')
+          question.position = parse_text(node, 'position')
+          question.content = parse_text(node, 'content')
+          node.search('quest_choices/quest_choice').each do |choice_node|
+            question.choices << {
+              :id => choice_node.attributes['id'].value,
+              :content => parse_text(choice_node, 'content')
+            }
+          end
+          questionnaire.questions << question
+        end
+        questionnaire.questions.sort_by!{|q| q.position.to_i}
+      end
+      parse_module(activity_dir, questionnaire)
+
+      questionnaire
+    end
+
+  end
+end

data/lib/moodle2cc/moodle2converter/assessment_converter.rb

@@ -1,8 +1,14 @@
+require_relative 'feedback_converter'
+require_relative 'questionnaire_converter'
+
 module Moodle2CC::Moodle2Converter
   class AssessmentConverter
     include ConverterHelper
 
-    def convert(moodle_quiz)
+    include FeedbackConverter
+    include QuestionnaireConverter
+
+    def convert_quiz(moodle_quiz)
       canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
       canvas_assessment.identifier = generate_unique_identifier_for(moodle_quiz.id, ASSESSMENT_SUFFIX)
       canvas_assessment.title = moodle_quiz.name
@@ -27,5 +33,35 @@ module Moodle2CC::Moodle2Converter
       canvas_assessment
     end
 
+    def convert_choice(moodle_choice)
+      canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
+      canvas_assessment.identifier = generate_unique_identifier_for(moodle_choice.id, CHOICE_ASSESSMENT_SUFFIX)
+      canvas_assessment.title = moodle_choice.name
+      canvas_assessment.description = ''
+      canvas_assessment.workflow_state = workflow_state(moodle_choice.visible)
+
+      canvas_assessment.lock_at = Time.at(Integer(moodle_choice.time_close)) if moodle_choice.time_close
+      canvas_assessment.unlock_at = Time.at(Integer(moodle_choice.time_open)) if moodle_choice.time_open
+
+      canvas_assessment.allowed_attempts = moodle_choice.completion_submit.to_i == 1 ? 1 : -1
+      canvas_assessment.scoring_policy = 'keep_latest'
+      canvas_assessment.quiz_type = 'survey'
+
+      question = Moodle2CC::CanvasCC::Models::Question.create('multiple_choice_question')
+      question.identifier = generate_unique_identifier_for(moodle_choice.id, '_choice_question')
+      question.title = moodle_choice.name
+      question.material = moodle_choice.intro
+      question.answers = []
+      moodle_choice.options.each_with_index do |option, num|
+        answer = Moodle2CC::CanvasCC::Models::Answer.new
+        answer.id = generate_unique_identifier_for(moodle_choice.id, "_choice_answer#{num + 1}")
+        answer.answer_text = option
+        question.answers << answer
+      end
+
+      canvas_assessment.items = [question]
+      canvas_assessment
+    end
+
   end
 end

data/lib/moodle2cc/moodle2converter/assignment_converter.rb

@@ -14,7 +14,7 @@ module Moodle2CC::Moodle2Converter
       canvas_assignment.points_possible = moodle_assignment.grade
       canvas_assignment.grading_type = 'points'
       canvas_assignment.submission_types << 'online_text_entry' if moodle_assignment.online_text_submission == '1'
-      canvas_assignment.submission_types += %w(online_url online_upload) if moodle_assignment.file_submission == '1'
+      canvas_assignment.submission_types << 'online_upload' if moodle_assignment.file_submission == '1'
 
       canvas_assignment
     end

data/lib/moodle2cc/moodle2converter/book_converter.rb

@@ -26,6 +26,7 @@ module Moodle2CC
         if pages.any?{|p| page.title == p.title}
           page.title = "#{page.title} (Introduction)"
         end
+        page.workflow_state = workflow_state(moodle_book.visible)
         pages.unshift(page)
       end
 

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -5,6 +5,9 @@ module Moodle2CC
     FOLDER_SUFFIX = '_folder'
     PAGE_SUFFIX = '_page'
     ASSESSMENT_SUFFIX = '_assessment'
+    CHOICE_ASSESSMENT_SUFFIX = '_choice_assessment'
+    FEEDBACK_ASSESSMENT_SUFFIX = '_feedback_assessment'
+    QUESTIONNAIRE_ASSESSMENT_SUFFIX = '_questionnaire_assessment'
     ASSIGNMENT_SUFFIX = '_assignment'
     COURSE_SUFFIX = '_course'
     DISCUSSION_SUFFIX = '_discussion'
@@ -22,6 +25,9 @@ module Moodle2CC
       Moodle2::Models::Forum => {suffix: DISCUSSION_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_DISCUSSION_TOPIC},
       Moodle2::Models::BookChapter => {suffix: CHAPTER_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
       Moodle2::Models::Quizzes::Quiz => {suffix: ASSESSMENT_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ},
+      Moodle2::Models::Choice => {suffix: CHOICE_ASSESSMENT_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ},
+      Moodle2::Models::Feedback => {suffix: FEEDBACK_ASSESSMENT_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ},
+      Moodle2::Models::Questionnaire => {suffix: QUESTIONNAIRE_ASSESSMENT_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ},
       Moodle2::Models::Section => {suffix: SUMMARY_PAGE_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
       Moodle2::Models::Label => {suffix: nil, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_CONTEXT_MODULE_SUB_HEADER},
       Moodle2::Models::Glossary => {suffix: GLOSSARY_SUFFIX, content_type: CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE},
@@ -30,7 +36,7 @@ module Moodle2CC
     }
 
     def generate_unique_resource_path(base_path, readable_name, file_extension = 'html')
-      file_name_suffix = readable_name ? CGI::escape(readable_name.downcase.strip.gsub(/\s/, '-')) : ''
+      file_name_suffix = readable_name ? Moodle2CC::CanvasCC::Models::Page.convert_name_to_url(readable_name) : ''
       ext = file_extension ? ".#{file_extension}" : ''
       File.join(base_path, generate_unique_identifier(), "#{file_name_suffix}#{ext}")
     end

data/lib/moodle2cc/moodle2converter/feedback_converter.rb

@@ -0,0 +1,70 @@
+module Moodle2CC::Moodle2Converter
+  module FeedbackConverter
+    include ConverterHelper
+
+    def convert_feedback(moodle_feedback)
+      canvas_assessment = Moodle2CC::CanvasCC::Models::Assessment.new
+      canvas_assessment.identifier = generate_unique_identifier_for(moodle_feedback.id, FEEDBACK_ASSESSMENT_SUFFIX)
+      canvas_assessment.title = moodle_feedback.name
+      canvas_assessment.description = moodle_feedback.intro
+      canvas_assessment.workflow_state = workflow_state(moodle_feedback.visible)
+
+      canvas_assessment.lock_at = Time.at(Integer(moodle_feedback.time_close)) if moodle_feedback.time_close
+      canvas_assessment.unlock_at = Time.at(Integer(moodle_feedback.time_open)) if moodle_feedback.time_open
+
+      canvas_assessment.scoring_policy = 'keep_latest'
+      canvas_assessment.quiz_type = 'survey'
+
+      canvas_assessment.items = []
+      moodle_feedback.items.each do |item|
+        if canvas_question = convert_feedback_question(item)
+          canvas_assessment.items << canvas_question
+        end
+      end
+
+      canvas_assessment
+    end
+
+    QUESTION_TYPE_MAP = {
+      'label' => 'text_only_question',
+      'textarea' => 'essay_question',
+      'multichoice' => 'multiple_choice_question',
+      'multichoicerated' => 'multiple_choice_question',
+      'numeric' => 'numerical_question',
+      'textfield' => 'short_answer_question'
+    }
+
+    def convert_feedback_question(moodle_question)
+      return unless canvas_type = QUESTION_TYPE_MAP[moodle_question.type]
+
+      canvas_question = Moodle2CC::CanvasCC::Models::Question.create(canvas_type)
+      canvas_question.identifier = generate_unique_identifier_for(moodle_question.id, "_feedback_question")
+      if moodle_question.type == 'label'
+        canvas_question.title = moodle_question.name
+        canvas_question.material = moodle_question.presentation
+      else
+        canvas_question.title = moodle_question.label
+        canvas_question.material = moodle_question.name
+      end
+
+      if ['multichoice', 'multichoicerated'].include?(moodle_question.type)
+        choices = moodle_question.presentation.to_s.sub('r>>>>>', '').split("\\n").map do |c|
+          c = c.strip
+          c = c.sub('|', '') if c.start_with?('|')
+          if moodle_question.type == 'multichoicerated' && c =~ /(\d+)\#\#\#\#(.*)/
+            c = "[#{$1}] #{$2}"
+          end
+          c
+        end
+
+        choices.each_with_index do |choice, num|
+          answer = Moodle2CC::CanvasCC::Models::Answer.new
+          answer.id = generate_unique_identifier_for(moodle_question.id, "_answer#{num + 1}")
+          answer.answer_text = choice
+          canvas_question.answers << answer
+        end
+      end
+      canvas_question
+    end
+  end
+end

data/lib/moodle2cc/moodle2converter/folder_converter.rb

@@ -24,7 +24,8 @@ module Moodle2CC::Moodle2Converter
 
     def generate_body(moodle_folder)
       files = sort_files(parse_files_from_course(moodle_folder))
-      html = "<ul>\n"
+      html = moodle_folder.intro.to_s
+      html += "<ul>\n"
       files.each do |f|
         #create a moodle style link that will be replaced in the html converter
         link = "<a href=\"@@PLUGINFILE@@#{f.file_path}#{f.file_name}\">#{f.file_path[1..-1]}#{f.file_name}</a>"

data/lib/moodle2cc/moodle2converter/glossary_converter.rb

@@ -25,9 +25,9 @@ module Moodle2CC::Moodle2Converter
 
     def generate_body(moodle_glossary)
       html = "<h2>#{moodle_glossary.name}</h2>"
-      html += '<table><tr><th>Concept</th><th>Definition</th></tr>'
-      moodle_glossary.entries.each { |entry| html += "<tr><td style='padding-right:10px'>#{entry.concept}</td><td>#{entry.definition}</td></tr>" }
-      html += '</table>'
+      html += '<dl>'
+      moodle_glossary.entries.each { |entry| html += "<dt>#{entry.concept}</dt><dd>#{entry.definition}</dd>" }
+      html += '</dl>'
       html
     end
 

data/lib/moodle2cc/moodle2converter/label_converter.rb

@@ -0,0 +1,39 @@
+module Moodle2CC
+  class Moodle2Converter::LabelConverter
+    include Moodle2Converter::ConverterHelper
+
+    def convert_to_module_items(moodle_label)
+      return [] unless moodle_label.convert_to_page? || moodle_label.convert_to_header?
+      module_item = CanvasCC::Models::ModuleItem.new
+      module_item.identifier = generate_unique_identifier
+      module_item.workflow_state = workflow_state(moodle_label.visible)
+      module_item.title = moodle_label.converted_title
+      module_item.indent = '0'
+
+      if moodle_label.convert_to_page?
+        module_item.identifierref = generate_unique_identifier_for_activity(moodle_label)
+        module_item.content_type = CanvasCC::Models::ModuleItem::CONTENT_TYPE_WIKI_PAGE
+      elsif moodle_label.convert_to_header?
+        module_item.content_type = CanvasCC::Models::ModuleItem::CONTENT_TYPE_CONTEXT_MODULE_SUB_HEADER
+      end
+
+      [module_item]
+    end
+
+    def convert_to_pages(moodle_label)
+      pages = []
+      if moodle_label.convert_to_page?
+        canvas_page = CanvasCC::Models::Page.new
+        canvas_page.identifier = generate_unique_identifier_for_activity(moodle_label)
+        canvas_page.title = moodle_label.converted_title
+        canvas_page.workflow_state = workflow_state(moodle_label.visible)
+        canvas_page.editing_roles = CanvasCC::Models::Page::EDITING_ROLE_TEACHER
+        canvas_page.body = moodle_label.intro
+        canvas_page.href = generate_unique_resource_path(CanvasCC::Models::Page::WIKI_CONTENT,
+           Moodle2CC::CanvasCC::Models::Page.convert_name_to_url(canvas_page.title))
+        pages << canvas_page
+      end
+      pages
+    end
+  end
+end