Qti export

Gemfile

@@ -12,6 +12,10 @@ end
 
 gem 'jquery-rails', '~> 2.0.2'
 
+gem 'nokogiri'
+
+gem 'htmlentities'
+
 # Deploy with Capistrano
 gem 'capistrano', '~> 2.12.0'
 

Gemfile.lock

@@ -32,7 +32,6 @@ GEM
       rails (~> 3.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-x86-mingw32)
     blankslate (2.1.2.4)
     builder (3.0.0)
     bullring (0.8.2)
@@ -81,6 +80,7 @@ GEM
       i18n (~> 0.4)
     highline (1.6.13)
     hike (1.2.1)
+    htmlentities (4.3.1)
     i18n (0.6.0)
     journey (1.0.4)
     jquery-rails (2.0.2)
@@ -100,14 +100,14 @@ GEM
     mime-types (1.19)
     multi_json (1.3.6)
     mysql2 (0.3.11)
-    mysql2 (0.3.11-x86-mingw32)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
     net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
+    nokogiri (1.5.4)
     orm_adapter (0.3.0)
     paperclip (3.0.4)
       activemodel (>= 3.0.0)
@@ -181,22 +181,16 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-<<<<<<< HEAD
     uglifier (1.2.6)
-=======
-    uglifier (1.2.5)
->>>>>>> Trying to run tests
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
     warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.3)
     yajl-ruby (1.1.0)
-    yajl-ruby (1.1.0-x86-mingw32)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   acts-as-taggable-on (~> 2.3.1)
@@ -208,11 +202,13 @@ DEPENDENCIES
   execjs (~> 1.4.0)
   factory_girl_rails (~> 3.4.0)
   faker (~> 1.0.1)
+  htmlentities
   jquery-rails (~> 2.0.2)
   jsonify (~> 0.3.1)
   jsonify-rails (~> 0.3.2)
   mime-types (~> 1.18)
   mysql2 (~> 0.3.11)
+  nokogiri
   paperclip (~> 3.0.4)
   parslet (~> 1.4.0)
   quiet_assets (~> 1.0.1)

Rakefile

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 

app/assets/javascripts/jquery_extensions.js

@@ -2,3 +2,10 @@
 // License version 3 or later.  See the COPYRIGHT file for details.
 
 jQuery.fn.exists = function(){return jQuery(this).length>0;}
+
+jQuery.fn.closeOnClickOutside = function(){
+  var dialogx = this;
+  $('.ui-widget-overlay').live("click",function(){
+    dialogx.dialog("close");
+  });
+}

app/controllers/import_controller.rb

@@ -0,0 +1,5 @@
+class ImportController < ApplicationController
+	def index
+		@qt_import = QtImport.new
+	end
+end

app/controllers/qt_import_controller.rb

@@ -0,0 +1,26 @@
+#encoding: utf-8
+
+# Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details.
+
+class QtImportController < ApplicationController
+	def new
+		@content_types = QTImport.content_types
+	end
+
+	def create
+		begin
+			f = params[:file]
+			document = QTImport.openfile(f.path)
+			project = QTImport.createproject(current_user)
+			parser, transformer = QTImport.choose_import(params[:content_type])
+			content = QTImport.iterate_items(document)
+			QTImport.get_questions(project,content,parser,transformer,current_user)
+
+		rescue			
+			flash[:alert] = 'Unfortunately we could not import all of your questions.  This may be due to formatting errors in your questions, such as HTML.
+However, we were most likely able to import some of your questions.  They are listed under a new project called Import, and are now unpublished questions.'
+			redirect_to :action => :new		
+		end
+    end
+end

app/controllers/questions_controller.rb

@@ -22,6 +22,7 @@ def index
 
   def show
     @question = Question.from_param(params[:id])
+    @unfinished_solutions = [email protected]{(is_visible == false) & (creator_id == my{present_user.id})}.first.nil?
     raise SecurityTransgression unless present_user.can_read?(@question)
 
     start_time = Time.now if logger.info?

app/helpers/qt_import_helper.rb

@@ -0,0 +1,5 @@
+# Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details.
+
+module QtImportHelper
+end

app/models/file_upload.rb

@@ -0,0 +1,3 @@
+class FileUpload < ActiveRecord::Base
+	mount_uploader :importfile, QuestionUploader
+end

app/models/logic_library_version.rb

@@ -16,6 +16,7 @@ class LogicLibraryVersion < ActiveRecord::Base
   after_save :send_to_bullring
 
   scope :ordered, order{version.asc}
+  attr_accessible :code, :deprecated
 
   def name
     logic_library.name + " v." + version.to_s

app/uploaders/question_uploader.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+class QuestionUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    %w(xml)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

app/views/attachable_assets/_form.html.erb

@@ -63,7 +63,11 @@
       sizeLimit     : <%= max_size %>,    
       multi         : <%= allow_multiple_files %>,
       onComplete    : function(event, queueID, fileObj, response, data) {  
-        eval(response);
+         $.ajax({
+          url: '/attachable_assets/' + response + '/finish_create',
+          dataType: 'script'
+        });
+        return true;
       },
       onAllComplete : function(event, data){
         $('#uploadify_file_cancel').hide('blind');

app/views/dev/toolbox.js.erb

@@ -6,4 +6,4 @@ $("#dev_toolbox_dialog").html("<%= ej(render :partial => 'toolbox' )%>");
 refresh_buttons();
 refresh_datetime_pickers();
 
-$("#dev_toolbox_dialog").dialog('open');
+$("#dev_toolbox_dialog").dialog('open').closeOnClickOutside();

app/views/help/topic.js.erb

@@ -17,5 +17,5 @@ $("#help_dialog").dialog({
 
 <%= reload_mathjax("help_dialog") if @options[:include_mathjax] %>
 
-$("#help_dialog").dialog('open');
-$("#help_dialog").scrollTop(0);
+$("#help_dialog").dialog('open').closeOnClickOutside();  
+$("#help_dialog").scrollTop(0);

app/views/project_questions/attribution.js.erb

@@ -5,4 +5,4 @@ $("#attribution_dialog").html("<%= escape_javascript(
   render :partial => 'project_questions/attribution',
          :locals => {:question_ids => @question_ids}) %>");
 
-$("#attribution_dialog").dialog('open');
+$("#attribution_dialog").dialog('open').closeOnClickOutside();

app/views/qt_import/_form.html.erb

@@ -0,0 +1,16 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<%= form_tag("/import/qti", :multipart => true) do %>
+  <%= label_tag("File") %>
+  <br>
+  <%= file_field_tag(:file) %>
+  <br>
+  <br>
+  <%= label_tag("Content Type") %>
+  <br>
+  <%= select_tag(:content_type, options_for_select(@content_types).html_safe ) %>
+  <br>
+  <br>
+  <%= submit_tag("Import") %>
+<% end %>

app/views/qt_import/create.html.erb

@@ -0,0 +1,6 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<p>Your questions were successfully imported!
+<br>
+They have been added to a new project named "Import", and are now unpublished questions.</p>

app/views/qt_import/error.html.erb

@@ -0,0 +1,3 @@
+<p>Unfortunately we could not import all of your questions.  This may be due to formatting errors in your questions, such as HTML.
+However, we were most likely able to import <i>some</i> of your questions.  They are listed under a new project called Import, and 
+are now unpublished questions.</p>

app/views/qt_import/index.html.erb

@@ -0,0 +1,4 @@
+<h1>Import Questions</h1>
+<p> Note: All files uploaded MUST be XML files. </p>
+
+<%= render 'form' %>

app/views/qt_import/new.html.erb

@@ -0,0 +1,7 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<h1>Import Questions</h1>
+<p> Note: All files uploaded MUST be XML files. </p>
+
+<%= render 'form' %>

app/views/questions/new.html.erb

@@ -73,3 +73,10 @@ Use this type for simple free-form questions that may or may not have a multiple
 
 
 </table>
+
+<br>
+<big>
+<b>
+<%= link_to "Or click this link to import a file of questions.", import_qti_new_path %>
+</b>
+</big>

app/views/questions/preview.js.erb

@@ -6,7 +6,7 @@
                                                    :locals => {:question => @question}) %>");
    <%= reload_mathjax("preview_dialog") %>
 
-   $("#preview_dialog").dialog('open');
+   $("#preview_dialog").dialog('open').closeOnClickOutside();   
 <% else %>
    // Submit the form so that the error messages display nicely with formatting
    // around the offending entries (use the trigger approach so we don't get

app/views/questions/quickview.js.erb

@@ -5,5 +5,4 @@ $("#quickview_dialog").html("<%= escape_javascript(render :partial => 'show',
                                                    :locals => {:question => @question}) %>");
 <%= reload_mathjax("quickview_dialog") %>
 
-$("#quickview_dialog").dialog('open');
-
+$("#quickview_dialog").dialog('open').closeOnClickOutside();  

app/views/questions/show.html.erb

@@ -17,6 +17,9 @@
 <div class="quad-question">
 
   <% if @question.errors.none? %>
+    <% if @unfinished_solutions %>
+      <div id="notice" class="notice" style="font-size:14px">This question has unfinished solutions</div>
+    <% end %>
     <%= render :partial => "show", 
                :locals => {:question => @question} %>
   <% else %>

app/views/simple_questions/show.1p2.qti.builder

@@ -1,20 +1,39 @@
-xml.instruct!
+require 'builder'
+xml = Builder::XmlMarkup.new
 
-xml.kml(:xmlns => "http://earth.google.com/kml/2.2") {
-xml.Document {
-  xml.name("Test")
-  xml.open(1)
-  xml.visible(1)
-  xml.NetworkLink {
-    xml.name("My rails app  being passed parameters")
-    xml.open(1)
-    xml.visibility(0)
-    xml.Link {
-      xml.href("hi")
-      xml.viewRefreshMode("onStop")
-      xml.viewRefreshTime(0.5)
-      xml.viewFormat("BBOX=[bboxWest],[bboxSouth],[bboxEast],[bboxNorth]&CENTRE=[lookatLon],[lookatLat]")
+xml.instruct!
+xml.Document{
+  xml.item{
+    xml.presentation{
+      xml.material{
+        xml.mattext("texttype" => "text/html") {
+          xml.cdata!(@question.content_html.html_safe)
+        }
       }
+      xml.response_lid{
+        xml.render_choice{
+          @question.answer_choices.each_index do |ac|
+            xml.response_label("ident" => "A" + ac.to_s){
+              xml.material{
+                xml.mattext("texttype" => "text/html"){
+                  xml.cdata!(@question.answer_choices[ac].content_html.html_safe)
+                }
+              }
+            }
+          end
+        }
+      }
+    }
+    xml.resprocessing{
+      @question.answer_choices.each_index do |ac|
+        xml.respcondition{
+          xml.conditionvar{
+            xml.varequal "A" + ac.to_s
+          }
+          xml.setvar(@question.answer_choices[ac].credit,"varname" => "que_score", "action" => "Add"
+          )
+        }
+      end
     }
   }
-}
+}

app/views/solutions/_single_solution.html.erb

@@ -78,6 +78,9 @@
 
  <div class="solution_div" style="float:left; width:85%">
    <% if !solution.explanation.blank? %>
+     <% if !solution.is_visible %>
+       <div id="notice" class="notice">This solution is not ready to be viewed.</div>
+     <% end %>
      <div class="solutionPartHeading" style="margin-top:0px">High-Level Explanation</div>
      <div id="solution_explanation_<%= solution.id.to_s %>" style="margin-left:20px">
        <%= simple_format solution.explanation %>

app/views/users/action_new.js.erb

@@ -11,4 +11,4 @@ $("#user_action_dialog").dialog({
  width:600, 
  buttons: { "Close": function() { $(this).dialog("close"); }},  
             open: function(event, ui) { $("#text_query").val(''); $("#selected_type").val(''); }
-});
+}).closeOnClickOutside();

config/application.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.