Multiple free responses; image free responses

.gitignore

@@ -7,6 +7,7 @@ config/developer_settings.yml
 config/secret_settings.yml
 config/deploy_settings.yml
 public/system/**
+public/uploads/**
 db/data.yml
 *~
 .vagrant

Gemfile

@@ -50,6 +50,12 @@ gem 'sqlite3', '~> 1.3.6'
 gem 'rack-mini-profiler'
 gem 'newrelic_rpm'
 
+gem 'mini_magick'
+gem 'carrierwave'
+gem "fog", "~> 1.3.1"
+
+gem 'remotipart', '~> 1.0'
+
 group :development, :test do
   gem 'debugger', '~> 1.1.4'
   gem 'faker', '~> 1.0.1'

Gemfile.lock

@@ -73,6 +73,9 @@ GEM
     capybara-webkit (0.12.1)
       capybara (>= 1.0.0, < 1.2)
       json
+    carrierwave (0.7.1)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
     cheat (1.3.0)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
@@ -115,6 +118,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     eventmachine (0.12.10)
+    excon (0.13.4)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.1.0)
@@ -128,6 +132,17 @@ GEM
     faye-websocket (0.4.6)
       eventmachine (>= 0.12.0)
     ffi (1.1.5)
+    fog (1.3.1)
+      builder
+      excon (~> 0.13.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.4)
     gherkin (2.11.2)
       json (>= 1.4.6)
     haml (3.1.7)
@@ -151,6 +166,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
     multi_json (1.3.6)
     mysql2 (0.3.11)
     net-scp (1.0.4)
@@ -204,6 +221,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     recaptcha (0.3.4)
+    remotipart (1.0.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -219,6 +237,7 @@ GEM
       rspec (~> 2.11.0)
     rspec-rerun (0.1.1)
       rspec (>= 2.11.0)
+    ruby-hmac (0.4.0)
     ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
@@ -251,6 +270,7 @@ GEM
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
+    subexec (0.2.2)
     terminal-table (1.4.5)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
@@ -291,6 +311,7 @@ DEPENDENCIES
   capistrano (~> 2.12.0)
   capybara-screenshot
   capybara-webkit
+  carrierwave
   cheat
   chronic
   coffee-rails (~> 3.2.1)
@@ -303,9 +324,11 @@ DEPENDENCIES
   factory_girl_rails (~> 4.0)
   faker (~> 1.0.1)
   fastercsv
+  fog (~> 1.3.1)
   jquery-rails (~> 2.0.2)
   launchy
   mime-types
+  mini_magick
   mysql2 (~> 0.3.11)
   newrelic_rpm
   poltergeist
@@ -315,6 +338,7 @@ DEPENDENCIES
   railroady
   rails (= 3.2.8)
   recaptcha (~> 0.3.4)
+  remotipart (~> 1.0)
   rspec-rails
   rspec-rerun
   rvm-capistrano

app/assets/javascripts/application.js

@@ -15,6 +15,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery.remotipart
 //= require jquery-ui
 //= require jquery.purr
 //= require best_in_place

app/assets/javascripts/jquery_extensions.js

@@ -53,3 +53,10 @@ jQuery.fn.pageTimeout = function(options) {
        $(document).bind('click', resetTimeouts);
     });
  }
+
+jQuery.fn.closeOnClickOutside = function(){
+  var dialogx = this;
+  $('.ui-widget-overlay').live("click",function(){
+    dialogx.dialog("close");
+  });
+}

app/assets/stylesheets/main.css.scss

@@ -544,6 +544,12 @@ table.list td.assignment_grade {
 	text-align: right
 }
 
+table.list td.outlined_cell {
+  border-left: 1px solid #ddd; 
+  border-right:1px solid #ddd; 
+  padding: 8px;
+}
+
 table.list.assignment {
 	width: 95%;
 
@@ -856,3 +862,43 @@ span.antispam {display:none;}
 input.ui-widget {
   font-size: 11px;
 }
+
+///////// FREE RESPONSES ///////////
+
+.free_response {
+  margin-bottom:14px;
+  clear:both;
+}
+
+.free_response_form {
+  background-color: #eee;
+}
+
+.free_response_form input[type="file"],textarea {
+  background-color: #fff;
+}
+
+@mixin content-box {
+  visibility: visible; 
+  overflow: hidden; 
+  position: relative; 
+  z-index: 2; 
+  border: 1px solid #ccc; 
+  padding: 15px; 
+  width: 560px;
+  margin-top:10px;
+}
+
+.question-box {
+  @include content-box;
+}
+
+.free-response-box {
+  @include content-box;
+}
+
+.section-exercise-responses {
+  .free-response-box {
+    width: 420px;
+  }
+}

app/controllers/application_controller.rb

@@ -21,6 +21,7 @@ class ApplicationController < ActionController::Base
                 :user_is_admin?,
                 :present_user,
                 :view_dir,
+                :view_dir_from_string,
                 :enable_clock
 
   unless Ost::Application.config.consider_all_requests_local
@@ -151,7 +152,8 @@ def redirect_maintenance
   end
 
   def enable_timeout
-    @enable_timeout = true
+    # only enable in production
+    @enable_timeout = Rails.env.production?
   end
 
   def is_id?(value)
@@ -187,7 +189,11 @@ def set_user_time_zone
   end
 
   def view_dir(object)
-    object.type.underscore.pluralize
+    view_dir_from_string(object.type)
+  end
+
+  def view_dir_from_string(string) 
+    string.underscore.pluralize
   end
 
   def enable_clock
@@ -222,4 +228,9 @@ def sort(params_name, model_class, parent = nil, parent_method = nil)
     # render :template => 'shared/sort'
   end
 
+  def read_errors(object)
+    @errors = object.errors
+    @errors_object = object
+  end
+
 end

app/controllers/file_free_responses_controller.rb

@@ -0,0 +1,7 @@
+class FileFreeResponsesController < ApplicationController
+
+  def view
+    @free_response = FreeResponse.find(params[:id])
+    raise SecurityTransgression unless present_user.can_read?(@free_response)
+  end
+end

app/controllers/free_responses_controller.rb

@@ -0,0 +1,62 @@
+class FreeResponsesController < ApplicationController
+
+  before_filter :get_student_exercise, :only => [:new, :create, :sort]
+  before_filter :make_free_response, :only => [:new, :create]
+  before_filter :grab_view_helper_variables, :only => [:create, :update]
+
+  def new
+  end
+
+  def edit
+    @free_response = FreeResponse.find(params[:id])
+    raise SecurityTransgression unless present_user.can_update?(@free_response)
+  end
+
+  def create
+    raise SecurityTransgression unless present_user.can_create?(@free_response)
+    @free_response.save
+    render :template => 'free_responses/create_or_update'
+  end
+
+  def update
+    @free_response = FreeResponse.find(params[:id])
+    raise SecurityTransgression unless present_user.can_update?(@free_response)
+    @free_response.update_attributes(params[:free_response])
+    render :template => 'free_responses/create_or_update'
+  end
+
+  def destroy
+    @free_response = FreeResponse.find(params[:id])
+    raise SecurityTransgression unless present_user.can_destroy?(@free_response)
+    @free_response.destroy
+  end
+
+  def sort
+    super('free_response', FreeResponse, @student_exercise, :student_exercise)
+  end
+
+protected
+
+  def get_student_exercise
+    @student_exercise = StudentExercise.find(params[:student_exercise_id])
+  end
+
+  def make_free_response
+    type = params[:type]
+    @free_response = 
+      case type
+      when 'TextFreeResponse' 
+        TextFreeResponse.new(params[:free_response])
+      when 'FileFreeResponse'
+        FileFreeResponse.new(params[:free_response])
+      else
+        raise AbstractController::ActionNotFound
+      end
+    @free_response.student_exercise = @student_exercise
+  end
+
+  def grab_view_helper_variables
+    @free_response_form_id = params[:free_response_form_id]
+  end
+
+end

app/controllers/student_exercises_controller.rb

@@ -45,15 +45,6 @@ def make_correct
     end
   end
 
-  def preview_free_response
-    @text = params[:student_exercise][:free_response]    
-    @student_exercise = StudentExercise.find(params[:student_exercise_id])
-    ResponseTime.create(:response_timeable => @student_exercise,
-                        :event => "ACTIVITY",
-                        :note => "preview",
-                        :page => "work")
-  end
-
   def feedback
     @student_exercise = StudentExercise.find(params[:student_exercise_id])
     raise SecurityTransgression unless present_user.can_read?(@student_exercise) && 

app/controllers/text_free_responses_controller.rb

@@ -0,0 +1,6 @@
+class TextFreeResponsesController < ApplicationController
+
+  def preview
+    @text = params[:free_response][:content]    
+  end
+end