fe 1.0.0 → 2.0.0

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

@@ -1,8 +1,8 @@
 class Fe::Admin::ElementsController < ApplicationController
-  before_filter :check_valid_user
-  layout 'fe/fe.admin'
+  before_action :check_valid_user
+  layout 'fe/fe_admin'
 
-  before_filter :get_page
+  before_action :get_page
 
   # GET /element/1/edit
   def edit
@@ -20,11 +20,11 @@ class Fe::Admin::ElementsController < ApplicationController
   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).to_a.uniq
+      @questions = @questions.where(style: @style).to_a.uniq
     end
   end
 
@@ -32,12 +32,21 @@ class Fe::Admin::ElementsController < ApplicationController
     @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)
@@ -46,10 +55,10 @@ class Fe::Admin::ElementsController < ApplicationController
 
     respond_to do |format|
       if @element.save
-        @page_element = Fe::PageElement.create(:element => @element, :page => @page)
+        @page_element = Fe::PageElement.create(element: @element, page: @page)
         format.js
       else
-        format.js { render :action => 'error.js.erb' }
+        format.js { render action: 'error.js.erb' }
       end
     end
   end
@@ -59,10 +68,10 @@ class Fe::Admin::ElementsController < ApplicationController
     @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.js.erb' }
+        format.js { render action: 'error.js.erb' }
       end
     end
   end
@@ -72,12 +81,12 @@ class Fe::Admin::ElementsController < ApplicationController
   def destroy
     @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
@@ -89,7 +98,7 @@ class Fe::Admin::ElementsController < ApplicationController
 
   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
@@ -97,14 +106,14 @@ class Fe::Admin::ElementsController < ApplicationController
           @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.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.save(validate: false)
               @element = page_element.element
             end
           end
@@ -135,7 +144,7 @@ class Fe::Admin::ElementsController < ApplicationController
       end
 
       # remove question grid / choice_field ref since it's directly on the page now
-      element.update_attributes(question_grid_id: nil, choice_field_id: nil)
+      element.update(question_grid_id: nil, choice_field_id: nil)
       return
     end
 
@@ -143,7 +152,7 @@ class Fe::Admin::ElementsController < ApplicationController
     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!
@@ -151,19 +160,19 @@ class Fe::Admin::ElementsController < ApplicationController
     when 'Fe::ChoiceField'
       # abort if the element is already in this box
       if element.choice_field_id == params[:id].to_i
-        render :nothing => true
+        render nothing: true
       else
         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 = @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
+    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.question_grid_id = nil
@@ -172,7 +181,7 @@ class Fe::Admin::ElementsController < ApplicationController
       element.choice_field_id = nil
     end
     element.save!
-    render :action => :drop
+    render action: :drop
   end
 
   def duplicate
@@ -183,19 +192,32 @@ class Fe::Admin::ElementsController < ApplicationController
     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({label_translations: Fe::LANGUAGES.keys}, {tip_translations: Fe::LANGUAGES.keys}, {content_translations: Fe::LANGUAGES.keys},
+    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)
+                                      :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')
@@ -33,7 +33,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
       if @email_template.save
         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

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

data/app/controllers/fe/reference_pages_controller.rb

@@ -1,12 +1,12 @@
 # gather reference information from Applicant
 module Fe
   class ReferencePagesController < ApplicationController
-    skip_before_filter :cas_filter
-    skip_before_filter :authentication_filter
-    
+    skip_before_action :cas_filter, raise: false
+    skip_before_action :authentication_filter, raise: false
+
     layout nil
-    
-    before_filter :setup
+
+    before_action :setup
 
     MONTHS_KNOWN_OPTIONS = [
       ["3 months", 3],
@@ -15,27 +15,27 @@ module Fe
       ["2 years", 24],
       ["3 or more years", 36]
     ]
-    
+
     # Allow applicant to edit reference
     # /applications/1/reference_page/edit
     # js: provide a partial to replace the answer_sheets page area
     # html?: return a full page for editing reference independantly (after submission)
     def edit
       @references = @application.reference_sheets
-      
+
       # NEXT: skipping all the fancy answer sheets stuff since all custom pages come after those
       @next_page = next_custom_page(@application, 'reference_page')
     end
-    
+
     def update
       #update_references
       head :ok
     end
-    
+
     private
     def setup
       @application = Application.find(params[:application_id])
-    end  
-    
+    end
+
   end
 end

data/app/controllers/fe/reference_sheets_controller.rb

@@ -1,7 +1,7 @@
 # TODO determine how this relates to Fe::ReferencesController and if we can delete one of the two
 class Fe::ReferenceSheetsController < Fe::AnswerSheetsController
-  skip_before_filter :ssm_login_required, :login
-  before_filter :edit_only, :except => [:edit]
+  skip_before_action :ssm_login_required, :login, raise: false
+  before_action :edit_only, except: [:edit]
 
   def edit
     @reference_sheet = @answer_sheet
@@ -18,13 +18,13 @@ class Fe::ReferenceSheetsController < Fe::AnswerSheetsController
     @page = @presenter.pages.first
     render 'fe/answer_sheets/edit', layout: 'fe/application'
   end
-  
+
   protected
     def get_answer_sheet
       @answer_sheet ||= Fe::ReferenceSheet.find_by_id_and_access_key(params[:id], params[:a])
       return false unless @answer_sheet
     end
-    
+
     def edit_only
       return false
     end

data/app/controllers/fe/references_controller.rb

@@ -2,49 +2,49 @@
 # TODO determine how this relates to Fe::ReferenceSheetsController and if we can delete one of the two
 module Fe
   class ReferencesController < ApplicationController
-    skip_before_filter :cas_filter
-    skip_before_filter :authentication_filter
-    
-    before_filter :setup
-    
+    skip_before_action :cas_filter, raise: false
+    skip_before_action :authentication_filter, raise: false
+
+    before_action :setup
+
     layout 'public'
 
     # AnswerSheet for reference to fill in
     # /applications/1/references/{token}
     def edit
       ref = Fe::ReferenceSheet.find_by_access_key(params[:id])
-      redirect_to edit_fe_reference_sheet_path(ref, :a => params[:id])
+      redirect_to edit_fe_reference_sheet_path(ref, a: params[:id])
     end
 
     # final submission
     def submit
       @reference = @application.references.find(params[:id])
       @reference.submit!
-      
+
       # Send Reference Thank You
       Fe::Notifier.notification(@reference.email,
-                                    Fe.from_email, 
-                                    "Reference Thank You", 
-                                    {'reference_full_name' => @reference.name, 
+                                    Fe.from_email,
+                                    "Reference Thank You",
+                                    {'reference_full_name' => @reference.name,
                                      'applicant_full_name' => @application.applicant.informal_full_name}).deliver
 
-      
+
       # Send Reference Completion Notice
       Fe::Notifier.notification(@application.applicant.email,
-                                    Fe.from_email, 
-                                    "Reference Complete", 
-                                    {'reference_full_name' => @reference.name, 
+                                    Fe.from_email,
+                                    "Reference Complete",
+                                    {'reference_full_name' => @reference.name,
                                      'applicant_full_name' => @application.applicant.informal_full_name,
                                      'reference_submission_date' => @reference.submitted_at.strftime("%m/%d/%Y")}).deliver
-      
+
     end
 
-    
+
     def show
       @reference = @application.references.find_by_access_key(params[:id])
 
       if @reference.nil?
-        render :action => :edit
+        render action: :edit
       else
         @answer_sheet = @reference
         @question_sheet = @answer_sheet.question_sheet
@@ -58,11 +58,11 @@ module Fe
         end
       end
     end
-    
+
     def send_invite
       # Save references on page first
       #update_references
-      
+
       @reference = Fe::ReferenceSheet.find(params[:id])
       send_reference_invite(@reference)
     end

data/app/controllers/fe/submit_pages_controller.rb

@@ -1,14 +1,14 @@
 class Fe::SubmitPagesController < ApplicationController
 
-  before_filter :setup
-  skip_before_filter :get_answer_sheet
+  before_action :setup
+  skip_before_action :get_answer_sheet, raise: false
 
   layout nil
-  
+
   def edit
     @next_page = next_custom_page(@application, 'submit_page')
   end
-  
+
   # save any changes on the submit_page (for auto-save, no server-validation)
   def update
     head :ok
@@ -18,5 +18,5 @@ class Fe::SubmitPagesController < ApplicationController
 
   def setup
     @application = @answer_sheet = Fe.answer_sheet_class.constantize.find(params[:application_id]) unless @application
-  end  
+  end
 end

data/app/helpers/fe/answer_pages_helper.rb

@@ -13,7 +13,7 @@ module Fe::AnswerPagesHelper
   def load_page_js(page_link)
     return '' if page_link.nil?
     
-    %{$.fe.pageHandler.loadPage('#{page_link.dom_id}','#{page_link.load_path}')}
+    %{fe.pageHandler.loadPage('#{page_link.dom_id}','#{page_link.load_path}')}
   end
   
 end

data/app/helpers/fe/application_helper.rb

@@ -37,12 +37,12 @@ module Fe
     end
 
     def tip(t)
-      image_tag('fe/icons/question-balloon.png', :title => t, :class => 'tip')
+      image_tag('fe/icons/question-balloon.png', title: t, class: 'tip')
     end
 
     def spinner(extra = nil)
       e = extra ? "spinner_#{extra}" : 'spinner'
-      image_tag('spinner.gif', :id => e, :style => 'display:none', :class => 'spinner')
+      image_tag('spinner.gif', id: e, style: 'display:none', class: 'spinner')
     end
 
     def link_to_function(name, *args, &block)
@@ -52,7 +52,7 @@ module Fe
        onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
        href = html_options[:href] || '#'
 
-       content_tag(:a, name, html_options.merge(:href => href, :onclick => onclick))
+       content_tag(:a, name, html_options.merge(href: href, onclick: onclick))
     end
 
     def error_messages_for(model)

data/app/jobs/fe/update_reference_sheet_visibility_job.rb

@@ -0,0 +1,11 @@
+class Fe::UpdateReferenceSheetVisibilityJob < ActiveJob::Base
+  def perform(answer_sheet, question_ids)
+    answer_sheet.question_sheets_all_reference_elements.each do |r|
+      if (r.visibility_affecting_element_ids & question_ids).any?
+        answer_sheet.all_references.where(question_id: r.id).each do |ref|
+          ref.update_visible
+        end
+      end
+    end
+  end
+end

data/app/mailers/fe/notifier.rb

@@ -9,14 +9,14 @@ module Fe
         raise "Email Template '#{template_name}' could not be found"
       else
         set_format = options.delete(:format)
-        mail({:to => p_recipients,
-             :from => p_from,
-             :subject => Liquid::Template.parse(email_template.subject).render(template_params)}.merge(options)) do |format|
+        mail({to: p_recipients,
+             from: p_from,
+             subject: Liquid::Template.parse(email_template.subject).render(template_params)}.merge(options)) do |format|
           case set_format.to_s
           when 'html'
             format.html { render html: Liquid::Template.parse(email_template.content).render(template_params) }
           else
-            format.text { render text: Liquid::Template.parse(email_template.content).render(template_params) }
+            format.text { render plain: Liquid::Template.parse(email_template.content).render(template_params) }
           end
         end
         @recipients = p_recipients

data/app/models/answer_sheet.rb

@@ -1,2 +1,2 @@
-class AnswerSheet < ActiveRecord::Base
+class AnswerSheet < ApplicationRecord
 end

data/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/app/models/{fe/concerns → concerns/fe}/answer_concern.rb

@@ -6,8 +6,8 @@ module Fe
     begin
       included do
 
-        belongs_to :answer_sheet
-        belongs_to :question, :class_name => "Element", :foreign_key => "question_id"
+        belongs_to :answer_sheet, optional: true
+        belongs_to :question, optional: true, class_name: "Element", foreign_key: "question_id"
 
         before_save :set_value_from_filename
       end

data/app/models/{fe/concerns → concerns/fe}/answer_pages_presenter_concern.rb

@@ -9,11 +9,11 @@ module Fe
     rescue ActiveSupport::Concern::MultipleIncludedBlocks
     end
 
-    def initialize(controller, answer_sheets, a = nil, custom_pages = nil)
+    def initialize(controller, answer_sheets, a = nil, custom_pages = nil, show_hidden_pages = false)
       super(controller)
       @answer_sheets = Array.wrap(answer_sheets)
       @active_answer_sheet = @answer_sheets.first
-      initialize_pages(@active_answer_sheet)
+      initialize_pages(@active_answer_sheet, show_hidden_pages)
 
       @page_links = page_list(@answer_sheets, a, custom_pages)
     end
@@ -72,10 +72,11 @@ module Fe
       end
     end
 
-    def initialize_pages(answer_sheet)
+    def initialize_pages(answer_sheet, show_hidden_pages = false)
       @pages = []
       answer_sheet.question_sheets.each do |qs|
-        qs.pages.visible.each do |page|
+        pages = show_hidden_pages ? qs.pages : qs.pages.visible
+        pages.each do |page|
           @pages << page
         end
       end
@@ -90,7 +91,7 @@ module Fe
     end
 
     def new_page_link(answer_sheet, page, a = nil)
-      Fe::PageLink.new(edit_fe_answer_sheet_page_path(answer_sheet, page, :a => a), dom_page(answer_sheet, page), page) if page
+      Fe::PageLink.new(edit_fe_answer_sheet_page_path(answer_sheet, page, a: a), dom_page(answer_sheet, page), page) if page
     end
 
     protected