fe 2.1.1 → 2.1.2

data/app/controllers/concerns/fe/admin/question_sheets_controller_concern.rb

@@ -24,17 +24,17 @@ module Fe::Admin::QuestionSheetsControllerConcern
 
   def archive
     @question_sheet.update_attribute(:archived, true)
-    redirect_back(fallback_location: '/')
+    redirect_back fallback_location: fe_admin_question_sheets_path
   end
 
   def unarchive
     @question_sheet.update_attribute(:archived, false)
-    redirect_back(fallback_location: '/')
+    redirect_back fallback_location: fe_admin_question_sheets_path
   end
 
   def duplicate
     @question_sheet.duplicate
-    redirect_back(fallback_location: '/')
+    redirect_back fallback_location: fe_admin_question_sheets_path
   end
 
   # entry point: display form designer with page 1 and panels loaded

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

@@ -36,8 +36,22 @@ module Fe::AnswerSheetsControllerConcern
         render html: "", layout: true
       end
     else
-      @elements = @presenter.questions_for_page(:first).elements
-      @page = @presenter.pages.first
+      if get_filter.present?
+        # filter presenter entire page list
+        all_question_set = @presenter.questions_for_all_pages
+        all_question_set.set_filter(get_filter)
+        @presenter.filter_pages_from_elements(all_question_set.elements)
+
+        # get first page elements
+        question_set = @presenter.questions_for_page(:first)
+        question_set.set_filter(get_filter)
+        @elements = question_set.elements
+        @page = @presenter.pages.first
+      else
+        # save some processing by not doing any filtering code
+        @elements = @presenter.questions_for_page(:first).elements
+        @page = @presenter.pages.first
+      end
     end
   end
 

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

@@ -1,6 +1,5 @@
 class Fe::Admin::ElementsController < ApplicationController
   before_action :check_valid_user
-  layout 'fe/fe_admin'
 
   before_action :get_page
 

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

@@ -1,34 +1,34 @@
 class Fe::Admin::EmailTemplatesController < ApplicationController
   before_action :check_valid_user
-  layout 'fe/fe_admin'
-  
+  layout 'fe/fe.admin'
+
   def index 
     @email_templates = Fe::EmailTemplate.order('name')
-  
+
     respond_to do |format|
       format.html
     end
   end
-  
-  def new 
+
+  def new
     @email_template = Fe::EmailTemplate.new
-  
+
     respond_to do |format|
       format.html
     end
   end
-  
+
   def edit
     @email_template = Fe::EmailTemplate.find(params[:id])
-    
+
     respond_to do |format|
       format.html
     end
   end
-  
+
   def create
     @email_template = Fe::EmailTemplate.new(email_template_params)
-    
+
     respond_to do |format|
       if @email_template.save
         format.html { redirect_to fe_admin_email_templates_path }
@@ -37,10 +37,10 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
       end
     end
   end
-  
-  def update 
+
+  def update
     @email_template = Fe::EmailTemplate.find(params[:id])
-    
+
     respond_to do |format|
       if @email_template.update(email_template_params)
         format.html { redirect_to fe_admin_email_templates_path }
@@ -49,7 +49,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
       end
     end
   end
-  
+
   def destroy
     @email_template = Fe::EmailTemplate.find(params[:id])
     @email_template.destroy
@@ -60,7 +60,7 @@ class Fe::Admin::EmailTemplatesController < ApplicationController
   end
 
   protected
-  
+
     def email_template_params
       params.require(:email_template).permit(:name, :subject, :content)
     end

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

@@ -1,6 +1,5 @@
 class Fe::Admin::QuestionPagesController < ApplicationController
   before_action :check_valid_user
-  layout 'fe/fe_admin'
 
   before_action :get_sheet
 

data/app/models/concerns/fe/answer_pages_presenter_concern.rb

@@ -36,6 +36,10 @@ module Fe
       Fe::QuestionSet.new(@active_page ? @active_page.all_elements : [], @active_answer_sheet)
     end
 
+    def questions_for_all_pages
+      Fe::QuestionSet.new(@active_answer_sheet.question_sheet.all_elements, @active_answer_sheet)
+    end
+
     # title
     def sheet_title
       @active_answer_sheet.question_sheet.label
@@ -94,6 +98,15 @@ module Fe
       Fe::PageLink.new(edit_fe_answer_sheet_page_path(answer_sheet, page, a: a), dom_page(answer_sheet, page), page) if page
     end
 
+    # filters the pages and pages_list such that only pages for which there
+    # are elements in the elements array passed in are kept
+    def filter_pages_from_elements(elements)
+      pages_from_elements = elements.collect{ |e| e.pages }.flatten.uniq
+      pages.reject! { |p| !pages_from_elements.include?(p) }
+      @page_links.reject! { |pl| !pages_from_elements.include?(pl.page) }
+      true
+    end
+
     protected
 
     # for pages_list sidebar

data/app/models/concerns/fe/choice_field_concern.rb

@@ -14,9 +14,13 @@ module Fe
     begin
       included do
         has_many :elements, class_name: "Element", foreign_key: "choice_field_id", dependent: :nullify#, order: :position
-        serialize :rating_before_label_translations, Hash
-        serialize :rating_after_label_translations, Hash
-        serialize :rating_na_label_translations, Hash
+        [:rating_before_label_translations, :rating_after_label_translations, :rating_na_label_translations].each do |column|
+          if Rails::VERSION::MAJOR < 7
+            serialize column, Hash
+          else
+            serialize column, type: Hash
+          end
+        end
       end
     rescue ActiveSupport::Concern::MultipleIncludedBlocks
     end
@@ -51,7 +55,9 @@ module Fe
           values = doc.find(value_xpath).collect { |n| n.content }
           retVal = [options, values].transpose
         rescue NameError, LibXML::XML::Error
-          doc = REXML::Document.new Net::HTTP.get_response(URI.parse(source)).body
+          url = URI.parse(source)
+          url.query = [url.query, "locale=#{locale}"].compact.join('&') if locale.present?
+          doc = REXML::Document.new Net::HTTP.get_response(url).body
           retVal = [ doc.elements.collect(text_xpath){|c|c.text}, doc.elements.collect(value_xpath){|c|c.text} ].transpose
         end
       elsif content.present?

data/app/models/fe/element.rb

@@ -6,14 +6,17 @@ module Fe
     attr_accessor :old_id
 
     belongs_to :question_grid,
-               optional: true, class_name: "Fe::QuestionGrid"
+               class_name: "Fe::QuestionGrid",
+               optional: true
 
     belongs_to :question_grid_with_total,
-               optional: true, class_name: "Fe::QuestionGridWithTotal",
-               foreign_key: "question_grid_id"
+               class_name: "Fe::QuestionGridWithTotal",
+               foreign_key: "question_grid_id",
+               optional: true
 
     belongs_to :choice_field,
-               optional: true, class_name: "Fe::ChoiceField"
+               class_name: "Fe::ChoiceField",
+               optional: true
 
     has_many :choice_field_children, foreign_key: 'choice_field_id',
       class_name: 'Fe::Element'
@@ -46,9 +49,13 @@ module Fe
     after_save :update_page_all_element_ids
     after_save :update_any_previous_conditional_elements
 
-    serialize :label_translations, Hash
-    serialize :tip_translations, Hash
-    serialize :content_translations, Hash
+    [:label_translations, :tip_translations, :content_translations].each do |column|
+      if Rails::VERSION::MAJOR < 7
+        serialize column, Hash
+      else
+        serialize column, type: Hash
+      end
+    end
 
     # HUMANIZED_ATTRIBUTES = {
     #   slug: "Variable"

data/app/models/fe/page.rb

@@ -45,7 +45,11 @@ module Fe
 
     # NOTE: You may need config.active_record.yaml_column_permitted_classes = [Hash, ActiveSupport::HashWithIndifferentAccess]
     # in config/application.rb or you may get Psych::DisallowedClass trying to use label_translations
-    serialize :label_translations, Hash
+    if Rails::VERSION::MAJOR < 7
+      serialize :label_translations, Hash
+    else
+      serialize :label_translations, type: Hash
+    end
 
     # a page is disabled if there is a condition, and that condition evaluates to false
     # could set multiple conditions to influence this question, in which case all must be met
@@ -89,7 +93,7 @@ module Fe
     def all_elements
       ids = all_element_ids_arr
       order = ids.collect{ |id| "id=#{id} DESC" }.join(', ')
-      ids.present? ? Element.where(id: ids).order(Arel.sql(order)) : Element.where("1 = 0")
+      ids.present? ? Element.where(id: ids).order(Arel.sql(order)) : Element.where(id: [])
     end
 
     def all_element_ids

data/app/models/fe/question.rb

@@ -27,9 +27,9 @@ module Fe
              dependent: :destroy
 
     belongs_to :related_question_sheet,
-               optional: true,
                class_name: "QuestionSheet",
-               foreign_key: "related_question_sheet_id"
+               foreign_key: "related_question_sheet_id",
+               optional: true
 
     # validates_inclusion_of :required, in: [false, true]
 

data/app/models/fe/question_set.rb

@@ -97,7 +97,7 @@ module Fe
 
     # convert posted response to a question into Array of values
     def posted_values(param)
-
+      param = param.to_h if param.is_a?(ActionController::Parameters)
       if param.kind_of?(Hash) and param.has_key?('year') and param.has_key?('month')
         year = param['year']
         month = param['month']

data/app/models/fe/question_sheet.rb

@@ -21,7 +21,11 @@ module Fe
 
     validates_presence_of :label
 
-    serialize :languages, Array
+    if Rails::VERSION::MAJOR < 7
+      serialize :languages, Array
+    else
+      serialize :languages, type: Array
+    end
 
     before_destroy :check_for_answers
 
@@ -42,7 +46,7 @@ module Fe
 
     def all_elements
       element_ids = pages.pluck(:all_element_ids).compact.join(',').split(',').find_all(&:present?)
-      element_ids.present? ? Element.where(id: element_ids).order(Arel.sql(element_ids.collect{ |id| "id=#{id} DESC" }.join(', '))) : Element.where("1 = 0")
+      element_ids.present? ? Element.where(id: element_ids).order(Arel.sql(element_ids.collect{ |id| "id=#{id} DESC" }.join(', '))) : Element.where(id: [])
     end
 
     # Pages get duplicated
@@ -68,7 +72,7 @@ module Fe
       # NOTE: yaml will break if some classes aren't loaded before YAML::load, strange
       Fe::Element.distinct.where.not(kind: 'Fe::Style').pluck(:kind).each(&:constantize)
 
-      sheet_data = YAML::load(File.read(filename))
+      sheet_data = Psych.unsafe_load_file(filename)
       sheet_data[:old_id] = sheet_data.delete("id")
       pages = sheet_data.delete(:pages)
       puts("Create import by data #{sheet_data}")

data/app/views/fe/answer_sheets/_incomplete.html.erb

@@ -7,4 +7,5 @@
         <% end %>
     <% end %>
   </ul>
+  <p style="margin-top:20px;">Note: Please make your corrections and hit submit once completed.</p>
 </div>

data/db/migrate/20181108201746_create_versions.rb

@@ -16,7 +16,7 @@ class CreateVersions < ActiveRecord::Migration[4.2]
   TEXT_BYTES = 1_073_741_823
 
   def change
-    create_table :versions, versions_table_options do |t|
+    create_table :versions, options: versions_table_options do |t|
       t.string   :item_type, item_type_options
       t.integer  :item_id,   null: false
       t.string   :event,     null: false
@@ -71,10 +71,6 @@ class CreateVersions < ActiveRecord::Migration[4.2]
   # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
   #
   def versions_table_options
-    if mysql?
-      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
-    else
-      {}
-    end
+    mysql? ? "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" : ""
   end
 end

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/dummy/app/views/layouts/fe/fe.admin.html.erb

@@ -0,0 +1 @@
+<%= yield %>