upgrade_surveyor_gui 0.1.2

data/app/controllers/surveyor_controller.rb

@@ -0,0 +1,89 @@
+module SurveyorControllerCustomMethods
+  def self.included(base)
+    base.send :layout, 'surveyor_gui/surveyor_modified'
+  end
+
+  def edit
+    root = File.expand_path('../../', __FILE__)
+    #place the surveyor_gui views ahead of the default surveyor view in order of preference
+    #so we can load customized partials.
+    prepend_view_path(root+'/views')
+    super
+  end
+  def update
+    question_ids_for_dependencies = (params[:r] || []).map{|k,v| v["question_id"] }.compact.uniq
+    saved = load_and_update_response_set_with_retries
+
+    if saved && params[:finish] && !@response_set.mandatory_questions_complete?
+      #did not complete mandatory fields
+      ids, remove, question_ids, flashmsg = {}, {}, [], []
+      flashmsg << "You must complete all required fields before submitting the survey.  Please fill in the following:"
+
+      triggered_mandatory_missing = @response_set.triggered_mandatory_missing
+
+      survey_section = ''
+      question_number = {}
+      last_question_of_previous_section = 0
+      last_question_number = 0
+      @response_set.survey.survey_sections.each do |ss|
+        index = 0
+        ss.questions.where('display_type!=?','label').each do |q|
+          if q.triggered?(@response_set)
+            question_number[q.id.to_s] = last_question_number = last_question_of_previous_section + index + 1
+            index = index + 1
+          end
+        end
+        last_question_of_previous_section = last_question_number
+      end
+
+      triggered_mandatory_missing.each do |m|
+        if m.survey_section_id != survey_section
+          survey_section = m.survey_section_id
+          flashmsg << ""
+          flashmsg << "&nbsp;&nbsp;" + m.survey_section.title
+        end
+
+        flashmsg << "&nbsp;&nbsp;&nbsp;&nbsp;question&nbsp;" + question_number[m.id.to_s].to_s + ') '+ m.text
+      end
+      respond_to do |format|
+        format.js do
+
+          render :json=>{"flashmsg"=>flashmsg}
+        end
+        format.html do
+          flash[:notice] = flashmsg.join('<br />')
+          redirect_to surveyor.edit_my_survey_path(:anchor => anchor_from(params[:section]), :section => section_id_from(params))
+        end
+      end
+      return
+#    elsif @response_set.survey.id.to_s == evaluation_institution.institution.vendor_value_analysis_questionnaire_id && saved && params[:finish]
+    elsif saved && params[:finish]
+      return redirect_with_message(surveyor_finish, :notice, t('surveyor.completed_survey'))
+    end
+
+
+    respond_to do |format|
+      format.html do
+        if @response_set.nil?
+          return redirect_with_message(surveyor.available_surveys_path, :notice, t('surveyor.unable_to_find_your_responses'))
+        else
+          flash[:notice] = t('surveyor.unable_to_update_survey') unless saved
+          redirect_to surveyor.edit_my_survey_path(:anchor => anchor_from(params[:section]), :section => section_id_from(params))
+        end
+      end
+      format.js do
+        if @response_set
+          render :json => @response_set.reload.all_dependencies(question_ids_for_dependencies)
+        else
+          render :text => "No response set #{params[:response_set_code]}",
+            :status => 404
+        end
+      end
+    end
+
+  end
+end
+class SurveyorController < ApplicationController
+  include Surveyor::SurveyorControllerMethods
+  include SurveyorControllerCustomMethods
+end

data/app/controllers/surveyor_gui/answers_controller.rb

@@ -0,0 +1,3 @@
+class SurveyorGui::AnswersController < ApplicationController
+  layout 'surveyor_gui/surveyor_gui_blank'
+end

data/app/controllers/surveyor_gui/application_controller.rb

@@ -0,0 +1,3 @@
+class SurveyorGui::ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/app/controllers/surveyor_gui/dependencys_controller.rb

@@ -0,0 +1,286 @@
+class SurveyorGui::DependencysController < ApplicationController
+  layout 'surveyor_gui/surveyor_gui_blank'
+
+  def new
+    prep_variables
+    @title = "Add Logic for "+@this_question
+    if @question.part_of_group?
+      @question.question_group.build_dependency(:rule=>'A')
+    else
+      @question.build_dependency(:rule=>'A')
+    end
+  end
+
+  def edit
+    prep_variables
+    @title = "Edit Logic for Question "+@this_question
+  end
+
+  def create
+    @question = Question.new(question_params)
+    if @question.save
+      redirect_to :back
+    else
+      render :action => 'new', :layout => 'surveyor_gui/surveyor_gui_blank'
+    end
+  end
+
+  def update
+    @title = "Update Question"
+    @question = Question.includes(:answers).find(params[:id])
+    if @question.part_of_group?
+      update_object = @question.question_group
+      update_params = question_group_params
+    else
+      update_object = @question
+      update_params = question_params
+    end
+    if update_object.update_attributes(update_params)
+      update_object.dependency.destroy if update_object.dependency.dependency_conditions.blank?
+      render :blank, :layout => 'surveyor_gui/surveyor_gui_blank'
+    else
+      prep_variables
+      render :action => 'edit', :layout => 'surveyor_gui/surveyor_gui_blank'
+    end
+  end
+
+  def destroy
+    question = Question.find(params[:id])
+    if question.part_of_group?
+      question.question_group.dependency.destroy
+    else
+      question.dependency.destroy
+    end
+    render :nothing=>true
+  end
+
+  def render_dependency_conditions_partial
+    prep_variables
+    @question_or_group = @question.part_of_group? ? @question.question_group : @question
+    @dependency = Dependency.find(params[:dependency_id]) if !params[:dependency_id].blank?
+    if @dependency.nil?
+      @question_or_group.build_dependency(:rule=>'A').dependency_conditions.build()
+    end
+    if @question_or_group.dependency.dependency_conditions.empty?
+      @question_or_group.dependency.dependency_conditions.build()
+    else
+      if params[:add_row]
+        @question_or_group = eval(@question_or_group.class.name).new
+        @question_or_group.build_dependency.dependency_conditions.build()
+      end
+    end
+    render :partial => 'dependency_condition_fields'
+  end
+
+  def get_answers    
+    options=""
+    question_id               = params[:question_id]
+    question                  = Question.find(question_id)
+    column_id                 = params[:column_id].blank? ? _default_column_id(question) : params[:column_id]
+    dependency_condition_id   = params[:dependency_condition_id]
+    dependency_condition      = dependency_condition_id.blank? ? nil : DependencyCondition.find(dependency_condition_id)
+    if question && question.answers
+      question.answers.where('column_id = ? OR column_id IS NULL',column_id.to_i).each_with_index do |a, index|
+        options += '<option ' + _get_selected_answer(index, dependency_condition, a, column_id) +
+         'value="' + a.id.to_s + '"' +
+         '>'+a.text.to_s+"</option>"
+      end
+    end
+    render :inline=>options
+  end
+  
+  def get_columns
+    options=""
+    question_id               = params[:question_id]
+    dependency_condition_id   = params[:dependency_condition_id]
+    dependency_condition      = dependency_condition_id.blank? ? nil : DependencyCondition.find(dependency_condition_id)
+    question = Question.find(question_id)
+    if question && question.question_group
+      question.question_group.columns.each_with_index do |c, index|
+        options += '<option ' +
+         _get_selected_column(index, dependency_condition, c) +
+         'value="' + c.id.to_s + '"' +
+         '>'+c.text.to_s+"</option>"
+      end
+    end
+    render :inline=>options
+  end
+
+  def get_question_type
+    question_id =  params[:question_id]
+    question = Question.find(question_id)
+    response=question.pick
+    response += ','+question.question_type_id.to_s
+    response += ','+question_id
+    render :inline=>response
+  end
+
+private
+
+  def prep_variables
+    @question = Question.includes(:dependency).find(params[:id]) unless @question
+    controlling_questions = get_controlling_question_collection(@question)
+    @controlling_questions = controlling_questions.collection
+    @this_question = @question.part_of_group? ? @question.question_group.text : @question.question_description
+    @operators = get_operators
+  end
+
+  def get_controlling_question_collection(dependent_question)
+    all_questions_in_survey = _get_all_questions_in_survey(dependent_question)
+    _get_question_collection(all_questions_in_survey, dependent_question)
+  end
+
+  def _get_all_questions_in_survey(question)
+    PossibleControllingQuestion.unscoped
+      .joins(:survey_section)
+      .where('survey_id = ?', question.survey_section.survey_id)
+      .order('survey_sections.display_order','survey_sections.id','questions.display_order')
+  end
+
+  def _get_question_collection(all_questions, dependent_question)
+    return QuestionCollection.new(dependent_question).add_questions(all_questions)
+  end
+
+  def get_operators
+    return [
+      ['equal to (=)','=='],
+      ['not equal to','!='],
+      ['less than (<)','<'],
+      ['less than or equal to (<=)','<='],
+      ['greater than or equal to (>=)','>='],
+      ['greater than','>']
+    ]
+  end
+
+  def question_params
+    ::PermittedParams.new(params[:question]).question
+  end
+
+  def question_group_params
+    ::PermittedParams.new(params[:question_group]).question_group
+  end  
+  
+  def _default_column_id(question)
+    if question.part_of_group?
+      columns = question.question_group.columns
+      columns.first ? columns.first.id.to_s : ""
+    else
+      ""
+    end
+  end
+  
+  def _get_selected_answer(index, dependency_condition, a, column_id)
+    if _matches_dependency_condition(dependency_condition, a, column_id) 
+      'selected="selected" ' 
+    else 
+      ''
+    end  
+  end
+  
+  def _get_selected_column(index, dependency_condition, column)
+    if _matches_dependency_condition_column(dependency_condition, column) 
+      'selected="selected"'
+    else
+      ''
+    end
+  end
+  
+  def _matches_dependency_condition (dependency_condition, a, column_id)
+    if dependency_condition.nil?  
+      false
+    else
+      (dependency_condition.answer_id == a.id && (column_id.blank? || dependency_condition.column_id == column_id.to_i ))
+    end
+  end
+  
+  def _matches_dependency_condition_column(dependency_condition, column)
+    if dependency_condition.nil?
+      false
+    else
+      dependency_condition.column_id == column.id
+    end
+  end
+  
+end
+
+class QuestionCollection
+  ## QuestionCollection provides a 2 dimensional array consisting of a question id
+  ## and a question description.  The collection may be used in a view's select field.
+  ##
+  ## Its membership is determined by a base question.
+  ## The base question is the one from which other questions in the collection are derived.
+  ## E.g., in a dependency, the question that is shown or hidden based on the answers to others
+  ## is the base question.  It shouldn't show up in the collection.
+  ##
+  ## Other questions may or may not show up in the collection depending on their eligibility.
+  ##
+  ## Some questions should have a question number and
+  ## some should not. The QuestionCollection numbers questions that should be numbered
+  ## and keeps track of the numbering.  If a question is numbered, the question number
+  ## is included in the description, e.g. "3) What is your name?".  Otherwise,
+  ## the description is just the question text, e.g. "Don't forget to use your middle initial".
+  ##
+  ## Incoming questions may be duck typed, but should respond to is_numbered? and is_eligible?
+  ## messages.
+
+  attr_accessor :collection, :dependency_question_description
+
+  def initialize(base_question)
+    @collection = []
+    @question_number = 1
+    @base_question = base_question
+    @dependency_question_description = nil
+  end
+
+  def collection
+    @collection
+  end
+
+  def add_questions(questions)
+    questions.each {|q| add_question(q)}
+    return self
+  end
+
+  def add_question(question)
+    _add_to_collection_if_eligible(question)
+    if question.is_numbered?
+      _increment_question_number
+    end 
+    return self
+  end
+
+  private
+
+  def _get_description(question)
+    @question_number.to_s + ') ' + (question.part_of_group? ? question.question_group.text + ": " : "") +question.text
+  end
+
+  def _add_to_collection(question)
+    description = _get_description(question)
+    @collection.push([description, question.id])
+  end
+
+  def _add_to_collection_if_eligible(question)
+    _add_to_collection(question) if question.is_eligible? && _this_is_not_the_base_question?(question)
+  end
+
+  def _this_is_not_the_base_question?(question)
+    if question.part_of_group?
+      question.question_group_id != @base_question.question_group_id
+    else
+      question.id != @base_question.id
+    end
+  end
+
+  def _increment_question_number
+    @question_number += 1
+  end
+end
+
+## This shouldn't be here but breaks saving nested attributes on question when put
+## in QuestionMethods.  Not sure why, but leave for now and revisit later.
+class PossibleControllingQuestion < Question
+  def is_eligible?
+    question_type_id!=:label && question_type_id!=:file
+  end
+end

data/app/controllers/surveyor_gui/question_groups_controller.rb

@@ -0,0 +1,90 @@
+class SurveyorGui::QuestionGroupsController < ApplicationController
+  layout 'surveyor_gui/surveyor_gui_blank'
+
+  def new
+    @title = "Add Question"
+    @survey_section_id = question_params[:survey_section_id]
+    @question_group = QuestionGroup.new(
+      text: params[:text], 
+      question_type_id: params[:question_type_id])
+    original_question = Question.find(params[:question_id]) if !params[:question_id].blank?
+    if original_question
+      @question_group.questions.build(
+        display_order: params[:display_order], 
+        id: params[:question_id], 
+        question_type_id: original_question.question_type_id,
+        pick: original_question.pick,
+        display_type: original_question.display_type)
+    else      
+      @question_group.questions.build(
+        display_order: params[:display_order])
+    end
+  end
+
+
+  def edit
+    @title = "Edit Question Group"
+    @question_group = QuestionGroup.includes(:questions).find(params[:id])
+    @question_group.question_type_id = params[:question_type_id]
+    @survey_section_id = question_params[:survey_section_id]
+    p "edit survey sect id #{@survey_section_id}"
+  end
+
+  def create
+    @question_group = QuestionGroup.new(question_group_params)
+    if @question_group.save
+      #@question_group.questions.update_attributes(survey_section_id: question_group_params[])
+      original_question = Question.find(question_group_params[:question_id]) if !question_group_params[:question_id].blank?
+      original_question.destroy if original_question
+      render :inline => '<div id="cboxQuestionId">'+@question_group.questions.first.id.to_s+'</div>', :layout => 'surveyor_gui/surveyor_gui_blank'
+    else
+      @title = "Add Question"
+      survey_section_id = question_group_params[:survey_section_id]
+      redirect_to :action => 'new', :controller => 'questions', :layout => 'surveyor_gui/surveyor_gui_blank', :survey_section_id => survey_section_id
+    end
+  end
+
+  def update
+    @title = "Update Question"
+    @question_group = QuestionGroup.includes(:questions).find(params[:id])
+    if @question_group.update_attributes(question_group_params)
+      render :blank, :layout => 'surveyor_gui/surveyor_gui_blank'
+      #If a nested question is destroyed, the Question model performs a cascade delete
+      #on the parent QuestionGroup (stuck with this behaviour as it is a Surveyor default).
+      #Need to check for this and restore question group.
+      begin
+        QuestionGroup.find(params[:id])
+      rescue
+        scrubbed_params = question_group_params.to_hash
+        scrubbed_params.delete("questions_attributes")
+        QuestionGroup.create!(scrubbed_params)
+      end     
+    else
+      render :action => 'edit', :layout => 'surveyor_gui/surveyor_gui_blank'
+    end
+  end
+
+  def render_group_inline_partial
+    if params[:id].blank?
+      @question_group = QuestionGroup.new
+    else
+      @question_group = QuestionGroup.find(params[:id])
+    end
+    if params[:add_row]
+      
+      @question_group = QuestionGroup.new
+      @question_group.questions.build(display_order: params[:display_order])
+      render :partial => 'group_inline_field'
+    else
+      render :partial => 'group_inline_fields'
+    end
+  end
+  private
+  def question_group_params
+    ::PermittedParams.new(params[:question_group]).question_group
+  end
+  def question_params
+    params.permit(:survey_section_id, :id, :text, :question_id, :question_type_id, :display_order, :pick, :display_type) 
+  end
+
+end