fe 0.0.4 → 2.0.0

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
@@ -22,7 +22,7 @@ module Fe::AnswerSheetsControllerConcern
     @question_sheet = Fe::QuestionSheet.find(params[:question_sheet_id])
     @answer_sheet = @question_sheet.answer_sheets.create
 
-    redirect_to edit_answer_sheet_path(@answer_sheet)
+    redirect_to edit_fe_answer_sheet_path(@answer_sheet)
   end
 
   # display answer sheet for data capture (page 1)
@@ -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,13 +4,14 @@ module Fe::ApplicationControllerConcern
   begin
     included do
       helper_method :fe_user
+      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
@@ -18,10 +19,22 @@ module Fe::ApplicationControllerConcern
     @fe_user
   end
 
+  def extract_locale_from_accept_language_header
+    request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first if request.env['HTTP_ACCEPT_LANGUAGE'].present?
+  end
+
+  def set_locale
+    session[:locale] = params[:locale] if params[:locale]
+    session[:locale] ||= extract_locale_from_accept_language_header || I18n.default_locale
+    if @answer_sheet
+      session[:locale] = I18n.default_locale unless @answer_sheet.languages.include?(session[:locale])
+    end
+  end
+
   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

data/app/controllers/fe/admin/elements_controller.rb

@@ -1,52 +1,52 @@
 class Fe::Admin::ElementsController < ApplicationController
-  before_filter :check_valid_user
-  layout 'fe/fe.admin'
-  
-  before_filter :get_page
-  
-  # GET /elements/1
-  def show
-    @element = Fe::Element.find(params[:id])
+  before_action :check_valid_user
+  layout 'fe/fe_admin'
 
-    respond_to do |format|
-      format.js
-    end
-  end
+  before_action :get_page
 
   # GET /element/1/edit
   def edit
-    @element = Fe::Element.find(params[:id])
-    
+    @element = @page.all_elements.find(params[:id])
+
     # for dependencies
     if @element.question?
       (3 - @element.conditions.length).times { @element.conditions.build }
-      @questions_before_this = @page.questions_before_position(@element.position(@page)) 
+      @questions_before_this = @page.questions_before_position(@element.position(@page))
     end
-    
+
     respond_to do |format|
       format.js
     end
   end
-  
+
   def new
-    @questions = params[:element_type].constantize.active.order('label')
+    @questions = params[:element_type].constantize.active.shared.order('label')
 
     @style = element_params[:style]
     if @style
-      @questions = @questions.where(:style => @style).uniq
+      @questions = @questions.where(style: @style).to_a.uniq
     end
   end
-  
+
   def use_existing
-    @element = Fe::Element.find(params[:id])
+    @element = Fe::Element.find(params[:id]) # NOTE the enclosing app might want to override this method and check that they have access to the questionnaire that the existing element is used on
     # Don't put the same question on a questionnaire twice
     unless @page.question_sheet.elements.include?(@element)
-      @page_element = Fe::PageElement.create(:element => @element, :page => @page)
+      @page_element = Fe::PageElement.create(element: @element, page: @page)
     end
     @question_sheet = @page.question_sheet
     render :create
   end
 
+  def copy_existing
+    @element = Fe::Element.find(params[:id]) # NOTE the enclosing app might want to override this method and check that they have access to the questionnaire that the existing element is used on
+    # duplicate the elements
+    @element = @element.duplicate(@page)
+    @element.update_attribute(:share, false)
+    @page_element = Fe::PageElement.where(element: @element, page: @page).first_or_create
+    render :create
+  end
+
   # POST /elements
   def create
     @element = params[:element_type].constantize.new(element_params)
@@ -54,24 +54,24 @@ class Fe::Admin::ElementsController < ApplicationController
     @question_sheet = @page.question_sheet
 
     respond_to do |format|
-      if @element.save!
-        @page_element = Fe::PageElement.create(:element => @element, :page => @page)
+      if @element.save
+        @page_element = Fe::PageElement.create(element: @element, page: @page)
         format.js
       else
-        format.js { render :action => 'error.rjs' }
+        format.js { render action: 'error.js.erb' }
       end
     end
   end
 
   # PUT /elements/1
   def update
-    @element = Fe::Element.find(params[:id])
+    @element = @page.all_elements.find(params[:id])
 
     respond_to do |format|
-      if @element.update_attributes(element_params)
+      if @element.update(element_params)
         format.js
       else
-        format.js { render :action => 'error.rjs' }
+        format.js { render action: 'error.js.erb' }
       end
     end
   end
@@ -79,14 +79,14 @@ class Fe::Admin::ElementsController < ApplicationController
   # DELETE /elements/1
   # DELETE /elements/1.xml
   def destroy
-    @element = Fe::Element.find(params[:id])
+    @element = @page.all_elements.find(params[:id])
     # Start by removing the element from the page
-    page_element = Fe::PageElement.where(:element_id => @element.id, :page_id => @page.id).first
+    page_element = Fe::PageElement.where(element_id: @element.id, page_id: @page.id).first
     page_element.destroy if page_element
-    
+
     # If this element is not on any other pages, is not a question or has no answers, Destroy it
-    if @element.reuseable? && (Fe::PageElement.where(:element_id => params[:id]).present? || @element.has_response?)
-      @element.update_attributes(:question_grid_id => nil, :conditional_id => nil)
+    if @element.reuseable? && (Fe::PageElement.where(element_id: params[:id]).present? || @element.has_response?)
+      @element.update(question_grid_id: nil, conditional_id: nil)
     else
       @element.destroy
     end
@@ -95,91 +95,129 @@ class Fe::Admin::ElementsController < ApplicationController
       format.js
     end
   end
-  
-  def reorder 
+
+  def reorder
     # since we don't know the name of the list, just find the first param that is an array
-    params.each_key do |key| 
+    params.permit!.to_h.each_key do |key|
       if key.include?('questions_list')
         grid_id = key.sub('questions_list_', '').to_i
         # See if we're ordering inside of a grid
         if grid_id > 0
-          Fe::Element.find(grid_id).elements.each do |element|
+          @page.all_elements.find(grid_id).elements.each do |element|
             if index = params[key].index(element.id.to_s)
-              element.position = index + 1 
-              element.save(:validate => false)
+              element.position = index + 1
+              element.save(validate: false)
             end
           end
         else
           @page.page_elements.each do |page_element|
             if index = params[key].index(page_element.element_id.to_s)
-              page_element.position = index + 1 
-              page_element.save(:validate => false)
+              page_element.position = index + 1
+              page_element.save(validate: false)
               @element = page_element.element
             end
           end
         end
       end
     end
-    
+
     respond_to do |format|
       format.js
     end
   end
-  
+
   def drop
-    element = Fe::Element.find(params[:draggable_element].split('_')[1])  # element being dropped
-    target = Fe::Element.find(params[:id])
+    element = @page.all_elements.find(params[:draggable_element].split('_')[1])  # element being dropped
+    target = @page.all_elements.find(params[:id])
+
+    if [params[:before], params[:after]].include?('true')
+      # move the element out of its parent and back onto the page directly, placing it before the target
+      page_element = Fe::PageElement.where(page_id: @page.id, element_id: element.id).first_or_create
+      @page.page_elements << page_element
+
+      parent_element = element.question_grid || element.choice_field
+      parent_page_element = @page.page_elements.find_by(element_id: parent_element.id)
+      if params[:before]
+        page_element.insert_at(parent_page_element.position)
+      else
+        page_element.insert_at(parent_page_element.position + 1)
+      end
+
+      # remove question grid / choice_field ref since it's directly on the page now
+      element.update(question_grid_id: nil, choice_field_id: nil)
+      return
+    end
+
     case target.class.to_s
-    when 'QuestionGrid', 'QuestionGridWithTotal'
+    when 'Fe::QuestionGrid', 'Fe::QuestionGridWithTotal'
       # abort if the element is already in this box
       if element.question_grid_id == params[:id].to_i
-        render :nothing => true
+        render nothing: true
       else
         element.question_grid_id = params[:id]
         element.save!
       end
-    when 'ChoiceField'
+    when 'Fe::ChoiceField'
       # abort if the element is already in this box
-      if element.conditional_id == params[:id].to_i
-        render :nothing => true
+      if element.choice_field_id == params[:id].to_i
+        render nothing: true
       else
-        element.conditional_id = params[:id]
+        element.choice_field_id = params[:id]
         element.save!
       end
     end
     # Remove page element for this page since it's now in a grid
-    Fe::PageElement.where(:page_id => @page.id, :element_id => element.id).first.try(:destroy)
+    Fe::PageElement.where(page_id: @page.id, element_id: element.id).first.try(:destroy)
   end
-  
+
   def remove_from_grid
-    element = Fe::Element.find(params[:id])
-    Fe::PageElement.create(:element_id => element.id, :page_id => @page.id) unless Fe::PageElement.where(:element_id => element.id, :page_id => @page.id).first
+    element = @page.all_elements.find(params[:id])
+    Fe::PageElement.create(element_id: element.id, page_id: @page.id) unless Fe::PageElement.where(element_id: element.id, page_id: @page.id).first
     if element.question_grid_id
-      element.set_position(element.question_grid.position(@page), @page) 
+      element.set_position(element.question_grid.position(@page), @page)
       element.question_grid_id = nil
     elsif element.choice_field_id
-      element.set_position(element.choice_field.position(@page), @page) 
+      element.set_position(element.choice_field.position(@page), @page)
       element.choice_field_id = nil
     end
     element.save!
-    render :action => :drop
+    render action: :drop
   end
-  
+
   def duplicate
-    element = Fe::Element.find(params[:id])
-    @element = element.duplicate(@page, element.question_grid || element.choice_field)
+    element = @page.all_elements.find(params[:id])
+    @element = element.duplicate(@page, element.question_grid || element.question_grid_with_total || element.choice_field)
     respond_to do |format|
-      format.js 
+      format.js
     end
   end
-  
+
+  # give enclosing apps a way to permit their own element attributes by overriding this method
+  def extra_element_params
+    []
+  end
+
   private
+
   def get_page
     @page = Fe::Page.find(params[:page_id])
   end
 
   def element_params
-    params.fetch(:element, {}).permit(:style, :label, :tooltip, :position, :source, :value_xpath, :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class, :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug, :required, :is_confidential, :hide_label, :object_name, :attribute_name, :max_length, :content, :conditional_type, :conditional_id, :conditional_answer)
+    params.fetch(:element, {}).permit([{label_translations: Fe::LANGUAGES.keys},
+                                      {tip_translations: Fe::LANGUAGES.keys},
+                                      {content_translations: Fe::LANGUAGES.keys},
+                                      {rating_before_label_translations: Fe::LANGUAGES.keys},
+                                      {rating_after_label_translations: Fe::LANGUAGES.keys},
+                                      {rating_na_label_translations: Fe::LANGUAGES.keys},
+                                      :rating_before_label, :rating_after_label, :rating_na_label,
+                                      :style, :label, :tooltip,
+                                      :position, :source, :value_xpath,
+                                      :text_xpath, :question_grid_id, :cols, :total_cols, :css_id, :css_class,
+                                      :related_question_sheet_id, :conditional_id, :hide_option_labels, :slug,
+                                      :required, :is_confidential, :hide_label, :object_name, :attribute_name,
+                                      :max_length, :content, :conditional_type, :conditional_id, :conditional_answer,
+                                      :share] + extra_element_params)
   end
 
 end

data/app/controllers/fe/admin/email_templates_controller.rb

@@ -1,6 +1,6 @@
 class Fe::Admin::EmailTemplatesController < ApplicationController
-  before_filter :check_valid_user
-  layout 'fe/fe.admin'
+  before_action :check_valid_user
+  layout 'fe/fe_admin'
   
   def index 
     @email_templates = Fe::EmailTemplate.order('name')
@@ -31,9 +31,9 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
     
     respond_to do |format|
       if @email_template.save
-        format.html { redirect_to admin_email_templates_path }
+        format.html { redirect_to fe_admin_email_templates_path }
       else
-        format.html { render :action => :new }
+        format.html { render action: :new }
       end
     end
   end
@@ -42,10 +42,10 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
     @email_template = Fe::EmailTemplate.find(params[:id])
     
     respond_to do |format|
-      if @email_template.update_attributes(email_template_params)
+      if @email_template.update(email_template_params)
         format.html { redirect_to fe_admin_email_templates_path }
       else
-        format.html { render :action => "edit" }
+        format.html { render action: "edit" }
       end
     end
   end
@@ -55,7 +55,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
     @email_template.destroy
 
     respond_to do |format|
-      format.html { redirect_to email_templates_path }
+      format.html { redirect_to fe_admin_email_templates_path }
     end
   end
 

data/app/controllers/fe/admin/question_pages_controller.rb

@@ -1,8 +1,8 @@
 class Fe::Admin::QuestionPagesController < ApplicationController
-  before_filter :check_valid_user
-  layout 'fe/fe.admin'
+  before_action :check_valid_user
+  layout 'fe/fe_admin'
 
-  before_filter :get_sheet
+  before_action :get_sheet
 
   # selecting a page
   # GET /pages/1
@@ -26,14 +26,14 @@ class Fe::Admin::QuestionPagesController < ApplicationController
 
   # POST /pages
   def create
-    @page = @question_sheet.pages.build(:label => next_label, :number => @question_sheet.pages.length + 1)
+    @page = @question_sheet.pages.build(label: next_label, number: @question_sheet.pages.length + 1)
     @all_pages = @question_sheet.pages
 
     respond_to do |format|
       if @page.save
         format.js
       else
-        format.js { render :action => "error.rjs"}
+        format.js { render action: "error.rjs"}
       end
     end
   end
@@ -43,11 +43,11 @@ class Fe::Admin::QuestionPagesController < ApplicationController
     @page = @question_sheet.pages.find(params[:id])
 
     respond_to do |format|
-      if @page.update_attributes(page_params)
+      if @page.update(page_params)
         @all_pages = @question_sheet.pages
         format.js { render action: :destroy }
       else
-        format.js { render :action => "error.rjs"}
+        format.js { render action: "error.rjs"}
       end
     end
   end
@@ -88,7 +88,7 @@ class Fe::Admin::QuestionPagesController < ApplicationController
         @page = page
       end
     end
-    render :nothing => true
+    render nothing: true
   end
 
   private
@@ -108,6 +108,6 @@ class Fe::Admin::QuestionPagesController < ApplicationController
   end
 
   def page_params
-    params.fetch(:fe_page, {}).permit(:label, :hidden, :no_cache)
+    params.fetch(:fe_page, {}).permit({label_translations: Fe::LANGUAGES.keys}, :label, :hidden, :no_cache)
   end
 end