Merge pull request #635 from DigitalCurationCentre/issue634

Issue634

Author: briri

app/controllers/phases_controller.rb

@@ -7,12 +7,12 @@ class PhasesController < ApplicationController
     # GET /plans/:plan_id/phases/:id/edit
     def edit
 
-    @plan = Plan.eager_load2(params[:plan_id])
+    @plan = Plan.load_for_phase(params[:plan_id], params[:id])
     # authorization done on plan so found in plan_policy
     authorize @plan
 
     phase_id = params[:id].to_i
-    @phase = @plan.template.phases.select {|p| p.id == phase_id}.first
+    @phase = @plan.template.phases.first
     @readonly = !@plan.editable_by?(current_user.id)
 
     # Now we need to get all the themed guidance for the plan.
@@ -46,35 +46,35 @@ def edit
       end
     end
 
-    # create hash from question id to theme to guidance array
-    # so when we arerendering a question we can grab the guidance out of this
-    #
-    # question_guidance = {
-    #              question.id => {
-    #                      theme => [ {text: "......", org: "....."} ]
-    #              }
-    # }
+    questions = []
+    # Appends all the questions for a given phase into questions Array.
+    @phase.sections.each do |section|
+      section.questions.each do |question|
+        questions.push(question)
+      end
+    end
     @question_guidance = {}
-    @plan.questions.each do |question|
+    # Puts in question_guidance (key/value) entries where key is the question id and value is a hash.
+    # Each question id hash has (key/value) entries where key is a theme and value is an Array of {text, org} objects
+    # Example hash
+    # question_guidance = { question.id => 
+    #                         { theme => [ {text: "......", org: "....."} ] }
+    #                     } 
+    questions.each do |question|
       qg = {}
       question.themes.each do |t|
         title = t.title
         qg[title] = theme_guidance[title] if theme_guidance.has_key?(title)
       end
-      if !@question_guidance.has_key?(question.id)
-        @question_guidance[question.id] = Array.new
-      end
       @question_guidance[question.id] = qg
     end
 
     if !user_signed_in? then
       respond_to do |format|
                 format.html { redirect_to edit_user_registration_path }
-            end
-        end
-
+      end
     end
-
+  end
 
     # GET /plans/PLANID/phases/PHASEID/status.json
   def status

app/models/plan.rb

@@ -990,16 +990,15 @@ def self.eager_load(id)
       ]).find(id)
   end
 
-  def self.eager_load2(id)
+  def self.load_for_phase(id, phase_id)
     Plan.includes(
-      [{template: [
+      [template: [
                    {phases: {sections: {questions: [{answers: :notes}, :annotations, :question_format, :themes]}}},
                    {customizations: :org},
                    :org
-                  ]},
-       {plans_guidance_groups: {guidance_group: {guidances: :themes}}},
-       {questions: :themes}
-      ]).find(id)
+                  ],
+       plans_guidance_groups: {guidance_group: {guidances: :themes}}
+      ]).where(id: id, phases: { id: phase_id }).first
   end