fe 1.0.0 → 2.0.0

data/app/assets/javascripts/fe/jquery.html5_upload.js

@@ -0,0 +1,258 @@
+/* Taken from https://github.com/mihaild/jquery-html5-upload */
+
+(function($) {
+    $.fn.html5_upload = function(options) {
+
+        function get_file_name(file) {
+            return file.name || file.fileName;
+        }
+        function get_file_size(file) {
+            return file.size || file.fileSize;
+        }
+        var available_events = ['onStart', 'onStartOne', 'onProgress', 'onFinishOne', 'onFinish', 'onError'];
+        var options = $.extend({
+            onStart: function(event, total) {
+                return true;
+            },
+            onStartOne: function(event, name, number, total) {
+                return true;
+            },
+            onProgress: function(event, progress, name, number, total) {
+            },
+            onFinishOne: function(event, response, name, number, total) {
+            },
+            onFinish: function(event, total) {
+            },
+            onError: function(event, name, error) {
+            },
+            onBrowserIncompatible: function() {
+                alert("Sorry, but your browser is incompatible with uploading files using HTML5 (at least, with current preferences.\n Please install the latest version of Firefox, Safari or Chrome");
+            },
+            autostart: true,
+            autoclear: true,
+            stopOnFirstError: false,
+            sendBoundary: false,
+            fieldName: 'user_file[]',//ignore if sendBoundary is false
+            extraFields: {}, // extra fields to send with file upload request (HTML5 only)
+            method: 'post',
+
+            STATUSES: {
+                'STARTED'   : 'Started',
+                'PROGRESS'  : 'Progress',
+                'LOADED'    : 'Loaded',
+                'FINISHED'  : 'Finished'
+            },
+            headers: {
+                "Cache-Control":"no-cache",
+                "X-Requested-With":"XMLHttpRequest",
+                "X-File-Name": function(file){return encodeURIComponent(get_file_name(file))},
+                "X-File-Size": function(file){return get_file_size(file)},
+                "X-CSRF-Token": $('meta[name="csrf-token"]').attr("content"),
+                "Content-Type": function(file){
+                    if (!options.sendBoundary) return 'multipart/form-data';
+                    return false;
+                }
+            },
+
+
+            setName: function(text) {},
+            setStatus: function(text) {},
+            setProgress: function(value) {},
+
+            genName: function(file, number, total) {
+                return file + "(" + (number+1) + " of " + total + ")";
+            },
+            genStatus: function(progress, finished) {
+                if (finished) {
+                    return options.STATUSES['FINISHED'];
+                }
+                if (progress == 0) {
+                    return options.STATUSES['STARTED'];
+                }
+                else if (progress == 1) {
+                    return options.STATUSES['LOADED'];
+                }
+                else {
+                    return options.STATUSES['PROGRESS'];
+                }
+            },
+            genProgress: function(loaded, total) {
+                return loaded / total;
+            }
+        }, options);
+
+        function upload( files ) {
+            var total = files.length;
+            var $this = $(this);
+            if (!$this.triggerHandler('html5_upload.onStart', [total])) {
+                return false;
+            }
+            this.disabled = true;
+            var uploaded = 0;
+            var xhr = this.html5_upload['xhr'];
+            this.html5_upload['continue_after_abort'] = true;
+            function upload_file(number) {
+                if (number == total) {
+                    $this.triggerHandler('html5_upload.onFinish', [total]);
+                    options.setStatus(options.genStatus(1, true));
+                    $this.attr("disabled", false);
+                    if (options.autoclear) {
+                        $this.val("");
+                    }
+                    return;
+                }
+                var file = files[number];
+                if (!$this.triggerHandler('html5_upload.onStartOne', [get_file_name(file), number, total])) {
+                    return upload_file(number+1);
+                }
+                options.setStatus(options.genStatus(0));
+                options.setName(options.genName(get_file_name(file), number, total));
+                options.setProgress(options.genProgress(0, get_file_size(file)));
+                xhr.upload['onprogress'] = function(rpe) {
+                    $this.triggerHandler('html5_upload.onProgress', [rpe.loaded / rpe.total, get_file_name(file), number, total]);
+                    options.setStatus(options.genStatus(rpe.loaded / rpe.total));
+                    options.setProgress(options.genProgress(rpe.loaded, rpe.total));
+                };
+                xhr.onload = function(load) {
+                    if (xhr.status >= 205 || xhr.status < 200) {
+                        $this.triggerHandler('html5_upload.onError', [get_file_name(file), load]);
+                        if (!options.stopOnFirstError) {
+                            upload_file(number+1);
+                        }
+                    }
+                    else {
+                        $this.triggerHandler('html5_upload.onFinishOne', [xhr.responseText, get_file_name(file), number, total]);
+                        options.setStatus(options.genStatus(1, true));
+                        options.setProgress(options.genProgress(get_file_size(file), get_file_size(file)));
+                        upload_file(number+1);
+                    }
+                };
+                xhr.onabort = function() {
+                    if ($this[0].html5_upload['continue_after_abort']) {
+                        upload_file(number+1);
+                    }
+                    else {
+                        $this.attr("disabled", false);
+                        if (options.autoclear) {
+                            $this.val("");
+                        }
+                    }
+                };
+                xhr.onerror = function(e) {
+                    $this.triggerHandler('html5_upload.onError', [get_file_name(file), e]);
+                    if (!options.stopOnFirstError) {
+                        upload_file(number+1);
+                    }
+                };
+                xhr.open(options.method, typeof(options.url) == "function" ? options.url(number) : options.url, true);
+                $.each(options.headers,function(key,val){
+                    val = typeof(val) == "function" ? val(file) : encodeURIComponent(val); // resolve value
+                    if (val === false) return true; // if resolved value is boolean false, do not send this header
+                    xhr.setRequestHeader(key, val);
+                });
+
+                if (!options.sendBoundary) {
+                    xhr.send(file);
+                }
+                else {
+                    if (window.FormData) {//Many thanks to scottt.tw
+                        var f = new FormData();
+                        f.append(typeof(options.fieldName) == "function" ? options.fieldName() : options.fieldName, file);
+                        options.extraFields = typeof(options.extraFields) == "function" ? options.extraFields() : options.extraFields;
+                        $.each(options.extraFields, function(key, val){
+                            f.append(key, val);
+                        });
+                        xhr.send(f);
+                    }
+                    else if (file.getAsBinary) {//Thanks to jm.schelcher
+                        var boundary = '------multipartformboundary' + (new Date).getTime();
+                        var dashdash = '--';
+                        var crlf     = '\r\n';
+
+                        /* Build RFC2388 string. */
+                        var builder = '';
+
+                        builder += dashdash;
+                        builder += boundary;
+                        builder += crlf;
+
+                        builder += 'Content-Disposition: form-data; name="'+(typeof(options.fieldName) == "function" ? options.fieldName() : options.fieldName)+'"';
+
+                        //thanks to oyejo...@gmail.com for this fix
+                        fileName = unescape(encodeURIComponent(get_file_name(file))); //encode_utf8
+
+                        builder += '; filename="' + fileName + '"';
+                        builder += crlf;
+
+                        builder += 'Content-Type: ' + file.type;
+                        builder += crlf;
+                        builder += crlf;
+
+                        /* Append binary data. */
+                        builder += file.getAsBinary();
+                        builder += crlf;
+
+                        /* Write boundary. */
+                        builder += dashdash;
+                        builder += boundary;
+                        builder += dashdash;
+                        builder += crlf;
+
+                        xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' + boundary);
+                        xhr.sendAsBinary(builder);
+                    }
+                    else {
+                        options.onBrowserIncompatible();
+                    }
+                }
+            }
+            upload_file(0);
+            return true;
+        }
+
+        try {
+            return this.each(function() {
+                var file_input = this;
+                this.html5_upload = {
+                    xhr:                    new XMLHttpRequest(),
+                    continue_after_abort:    true
+                };
+                if (options.autostart) {
+                    $(this).bind('change', function(e){
+                        upload.call( e.target, this.files );
+                    });
+                }
+                var self = this;
+                $.each(available_events, function(event) {
+                    if (options[available_events[event]]) {
+                        $(self).bind("html5_upload."+available_events[event], options[available_events[event]]);
+                    }
+                });
+                $(this)
+                    .bind('html5_upload.startFromDrop', function( e, dropEvent ){
+                        if ( dropEvent.dataTransfer && dropEvent.dataTransfer.files.length ){
+                            upload.call( file_input, dropEvent.dataTransfer.files );
+                        }
+                    })
+                    .bind('html5_upload.start', upload)
+                    .bind('html5_upload.cancelOne', function() {
+                        this.html5_upload['xhr'].abort();
+                    })
+                    .bind('html5_upload.cancelAll', function() {
+                        this.html5_upload['continue_after_abort'] = false;
+                        this.html5_upload['xhr'].abort();
+                    })
+                    .bind('html5_upload.destroy', function() {
+                        this.html5_upload['continue_after_abort'] = false;
+                        this.xhr.abort();
+                        delete this.html5_upload;
+                        $(this).unbind('html5_upload.*').unbind('change', upload);
+                    });
+            });
+        }
+        catch (ex) {
+            options.onBrowserIncompatible();
+            return false;
+        }
+    };
+})(jQuery);

data/app/assets/stylesheets/fe/fe.screen.css.scss.erb

@@ -82,6 +82,10 @@ a {
     margin: 10px 0 0 0;
 }
 
+a[disabled] {
+  pointer-events: none;
+}
+
 /* PANEL */
 
 p.instruction {
@@ -182,7 +186,7 @@ ul#nav-controls li a:hover {
 .list-elements #at a {  background-image: url("<%= asset_path('fe/icons/paper-clip.png') %>");}
 .list-elements #ref a {  background-image: url("<%= asset_path('fe/icons/book-open-list.png') %>");}
 
-.fe_textfield textarea { width: 90%; }
+.fe_textfield textarea, .q_form input[type=text] { width: 90%; }
 
 
 /* BODY SIDE */
@@ -281,6 +285,23 @@ ul.questions li {
     display: none;
 }
 
+.rating_after {
+  padding-left: 10px;
+  padding-right: 10px;
+}
+.rating_before {
+  padding-right: 10px;
+}
+.rating_na_label {
+  padding-left: 10px;
+}
+.rating_choice {
+  text-align: center;
+}
+.rating_choice, .rating_na {
+  padding: 2px;
+}
+
 div.p_content p {
     margin-bottom: 1em;
 }

data/app/assets/stylesheets/fe/validation.css

@@ -60,6 +60,10 @@ input.validation-passed, textarea.validation-passed {
     font-weight: bold;
 }
 
+.validation-advice ul li {
+  padding-left: 1em;
+}
+
 .custom-advice {
     margin: 5px 0;
     padding: 5px;
@@ -88,4 +92,4 @@ label {
 
 .field-widget {
 
-}
+}

data/app/controllers/{fe/concerns → concerns/fe}/admin/question_sheets_controller_concern.rb

@@ -3,9 +3,9 @@ module Fe::Admin::QuestionSheetsControllerConcern
 
   begin
     included do
-      before_filter :check_valid_user
-      before_filter :get_question_sheet, :only => [:show, :archive, :unarchive, :destroy, :edit, :update, :duplicate]
-      layout 'fe/fe.admin'
+      before_action :check_valid_user
+      before_action :get_question_sheet, only: [:show, :archive, :unarchive, :destroy, :edit, :update, :duplicate]
+      layout 'fe/fe_admin'
     end
   rescue ActiveSupport::Concern::MultipleIncludedBlocks
   end
@@ -18,23 +18,23 @@ module Fe::Admin::QuestionSheetsControllerConcern
 
     respond_to do |format|
       format.html # index.rhtml
-      format.xml  { render :xml => @question_sheets.to_xml }
+      format.xml  { render xml: @question_sheets.to_xml }
     end
   end
 
   def archive
     @question_sheet.update_attribute(:archived, true)
-    redirect_to :back
+    redirect_back(fallback_location: '/')
   end
 
   def unarchive
     @question_sheet.update_attribute(:archived, false)
-    redirect_to :back
+    redirect_back(fallback_location: '/')
   end
 
   def duplicate
     @question_sheet.duplicate
-    redirect_to :back
+    redirect_back(fallback_location: '/')
   end
 
   # entry point: display form designer with page 1 and panels loaded
@@ -45,7 +45,7 @@ module Fe::Admin::QuestionSheetsControllerConcern
 
     respond_to do |format|
       format.html # show.rhtml
-      format.xml  { render :xml => @question_sheet.to_xml }
+      format.xml  { render xml: @question_sheet.to_xml }
     end
   end
 
@@ -57,10 +57,10 @@ module Fe::Admin::QuestionSheetsControllerConcern
     respond_to do |format|
       if @question_sheet.save
         format.html { redirect_to fe_admin_question_sheet_path(@question_sheet) }
-        format.xml  { head :created, :location => admin_question_sheet_path(@question_sheet) }
+        format.xml  { head :created, location: admin_question_sheet_path(@question_sheet) }
       else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @question_sheet.errors.to_xml }
+        format.html { render action: "new" }
+        format.xml  { render xml: @question_sheet.errors.to_xml }
       end
     end
   end
@@ -81,14 +81,14 @@ module Fe::Admin::QuestionSheetsControllerConcern
     params.require(:fe_question_sheet).permit!
 
     respond_to do |format|
-      if @question_sheet.update_attributes(params[:fe_question_sheet])
+      if @question_sheet.update(params[:fe_question_sheet])
         format.html { redirect_to fe_admin_question_sheet_path(@question_sheet) }
         format.js
         format.xml  { head :ok }
       else
-        format.html { render :action => "edit" }
-        format.js { render :action => "error.rjs"}
-        format.xml  { render :xml => @question_sheet.errors.to_xml }
+        format.html { render action: "edit" }
+        format.js { render action: "error.rjs"}
+        format.xml  { render xml: @question_sheet.errors.to_xml }
       end
     end
   end
@@ -109,4 +109,3 @@ module Fe::Admin::QuestionSheetsControllerConcern
     @question_sheet = Fe::QuestionSheet.find(params[:id])
   end
 end
-

data/app/controllers/concerns/fe/answer_pages_controller_concern.rb

@@ -0,0 +1,131 @@
+module Fe::AnswerPagesControllerConcern
+  extend ActiveSupport::Concern
+
+  begin
+    included do
+      before_action :get_answer_sheet, only: [:show, :edit, :update, :save_file, :delete_file, :index]
+      before_action :set_quiet_reference_email_change, only: :update
+      skip_before_action :verify_authenticity_token, only: :save_file
+    end
+  rescue ActiveSupport::Concern::MultipleIncludedBlocks
+  end
+
+  def show
+    @presenter = Fe::AnswerPagesPresenter.new(self, @answer_sheet, params[:a], nil, true)
+    questions = @presenter.questions_for_page(params[:id])
+    questions.set_filter(get_filter)
+    @elements = questions.elements
+    @page = Fe::Page.find(params[:id]) || Fe::Page.find_by_number(1)
+  end
+
+  def edit
+    questions = @presenter.questions_for_page(params[:id])
+    questions.set_filter(get_filter)
+    @elements = questions.elements
+    @page = Fe::Page.find(params[:id]) || Fe::Page.find_by_number(1)
+
+    render partial: 'answer_page', locals: { show_first: nil }
+  end
+
+  # validate and save captured data for a given page
+  # PUT /answer_sheets/1/pages/1
+  def update
+    @page = Fe::Page.find(params[:id])
+    questions = @presenter.all_questions_for_page(params[:id])
+    questions.set_filter(get_filter)
+    questions.post(answer_params, @answer_sheet)
+    questions.save
+    Fe::UpdateReferenceSheetVisibilityJob.perform_later(@answer_sheet, questions.questions.collect(&:id))
+
+    @elements = questions.elements
+
+    # Save references
+
+    if params[:reference].present?
+      params[:reference].keys.each do |id|
+        reference_params = params.fetch(:reference)[id].permit(:relationship, :title, :first_name, :last_name, :phone, :email, :is_staff)
+
+        # The call to Application#reference_sheets is supposed to update the visibility cache and return the right references, but
+        # currently it does not do that right.  It needs a reload to get the right list of references.  I think this may be caused
+        # from a change in rails 5
+        @answer_sheet = answer_sheet_type.find(params[:answer_sheet_id]) # load a fresh instance of @answer_sheet
+        @answer_sheet.reference_sheets # this call seems to be necessary to build the right refs list
+        ref = @answer_sheet.reference_sheets.find(id)
+
+        # if the email address has changed, we have to trash the old reference answers
+        ref.attributes = reference_params
+        ref.save(validate: false)
+      end
+    end
+    @presenter.active_page = nil
+    @answer_sheet.update(locale: session[:locale])
+    set_saved_at_timestamp
+    respond_to do |format|
+      format.js
+      #format.html
+    end
+  end
+
+  def save_file
+    params.permit(:Filedata)
+    params.permit(:user_file) # jquery html5 uploader uses user_file; handle both as flash is fallback
+
+    if params[:Filedata] || params[:user_file]
+      @page = Fe::Page.find(params[:id])
+      @presenter.active_page = @page
+      question = Fe::Element.find(params[:question_id])
+      answer = Fe::Answer.where(answer_sheet_id: @answer_sheet.id, question_id: question.id).first
+      question.answers = [answer] if answer
+
+      @answer = question.save_file(@answer_sheet, params[:Filedata] || params[:user_file].first)
+      set_saved_at_timestamp
+
+      render action: :update
+    else
+      respond_to do |format|
+        format.js { head :ok }
+      end
+    end
+  end
+
+  def delete_file
+    @page = Fe::Page.find(params[:id])
+    @presenter.active_page = @page
+    question = Fe::Element.find(params[:question_id])
+    answer = Fe::Answer.where(answer_sheet_id: @answer_sheet.id, question_id: question.id).first
+    question.answers = [answer] if answer
+
+    @answer = question.delete_file(@answer_sheet, answer)
+    set_saved_at_timestamp
+
+    render action: :update
+  end
+
+  protected
+
+  def get_answer_sheet
+    @answer_sheet = answer_sheet_type.find(params[:answer_sheet_id])
+    @presenter = Fe::AnswerPagesPresenter.new(self, @answer_sheet, params[:a])
+  end
+
+  # extending classes can override this to set a questions filter
+  # see Fe::QuestionSet#set_filter for more details
+  def get_filter
+  end
+
+  def answer_sheet_type
+    (params[:answer_sheet_type] || Fe.answer_sheet_class || 'AnswerSheet').constantize
+  end
+
+  def answer_params
+    params.fetch(:answers, {}).permit!
+  end
+
+  def set_saved_at_timestamp
+    @saved_at_timestamp = [@answer_sheet.updated_at, @answer_sheet.answers.maximum(:updated_at)].compact.max
+  end
+
+  def set_quiet_reference_email_change
+    @answer_sheet.allow_quiet_reference_email_changes = true if @answer_sheet.is_a?(Fe::ReferenceSheet) && params[:a].present?
+  end
+end

data/app/controllers/{fe/concerns → concerns/fe}/answer_sheets_controller_concern.rb

@@ -4,7 +4,7 @@ module Fe::AnswerSheetsControllerConcern
   begin
     included do
       layout 'fe/application'
-      before_filter :get_answer_sheet, :only => [:edit, :show, :send_reference_invite, :submit]
+      before_action :get_answer_sheet, only: [:edit, :show, :send_reference_invite, :submit]
     end
   rescue ActiveSupport::Concern::MultipleIncludedBlocks
   end
@@ -31,9 +31,9 @@ module Fe::AnswerSheetsControllerConcern
     unless @presenter.active_answer_sheet.pages.present?
       flash[:error] = "Sorry, there are no questions for this form yet."
       if request.env["HTTP_REFERER"]
-        redirect_to :back
+        redirect_back(fallback_location: '/')
       else
-        render :text => "", :layout => true
+        render html: "", layout: true
       end
     else
       @elements = @presenter.questions_for_page(:first).elements
@@ -46,7 +46,9 @@ module Fe::AnswerSheetsControllerConcern
     @question_sheet = @answer_sheet.question_sheet
     pf = Fe.table_name_prefix
     @elements = @question_sheet.pages.collect {|p| p.elements.includes(:pages).order("#{pf}pages.number,#{pf}page_elements.position").all}.flatten
-    @elements = Fe::QuestionSet.new(@elements, @answer_sheet).elements.group_by{ |e| e.pages.first }
+    questions = Fe::QuestionSet.new(@elements, @answer_sheet)
+    questions.set_filter(get_filter)
+    @elements = questions.elements.group_by{ |e| e.pages.find_by(id: @question_sheet.page_ids) }
   end
 
   def send_reference_invite(reference = nil)
@@ -54,10 +56,10 @@ module Fe::AnswerSheetsControllerConcern
     if params[:reference]
       reference_params = params.fetch(:reference)[@reference.id.to_s].permit(:relationship, :title, :first_name, :last_name, :phone, :email, :is_staff)
 
-      @reference.update_attributes(reference_params)
+      @reference.update(reference_params)
     end
     if @reference.valid?
-      @reference.send_invite
+      @reference.send_invite(request.host)
     end
   end
 
@@ -68,6 +70,12 @@ module Fe::AnswerSheetsControllerConcern
   end
 
   protected
+
+  # extending classes can override this to set a questions filter
+  # see Fe::QuesitonSet#set_filter for more details
+  def get_filter
+  end
+
   def answer_sheet_type
     return Fe::ReferenceSheet if params[:controller] == "fe/reference_sheets"
     (params[:answer_sheet_type] || Fe.answer_sheet_class || 'AnswerSheet').constantize

data/app/controllers/{fe/concerns → concerns/fe}/application_controller_concern.rb

@@ -4,14 +4,14 @@ module Fe::ApplicationControllerConcern
   begin
     included do
       helper_method :fe_user
-      before_filter :set_locale
+      before_action :set_locale
     end
   rescue ActiveSupport::Concern::MultipleIncludedBlocks
   end
 
   def fe_user
     return nil unless current_user
-    @fe_user ||= Fe::User.where(:user_id => current_user.id).first
+    @fe_user ||= Fe::User.where(user_id: current_user.id).first
     if @fe_user
       @fe_user.update_attribute(:last_login, Time.now)
       session[:login_stamped] = true
@@ -34,7 +34,7 @@ module Fe::ApplicationControllerConcern
   def current_person
     #raise "no user" unless current_user
     return nil unless current_user
-    current_user.fe_person || Fe::Person.create(:user_id => current_user.id)
+    current_user.fe_person || Fe::Person.create(user_id: current_user.id)
   end
 
   def check_valid_user