#387 hiding from student landing screen the not active phases which w…

…ere not completed

app/controllers/student_enrollment_controller.rb

@@ -22,7 +22,7 @@ def show
                         enrollment: @enrollment, thesis_defense_committee_professors: @enrollment.thesis_defense_committee_professors)
     existing_partial('student_enrollment/show_class_enrollments', :class_enrollments, @enrollment.class_enrollments)
     existing_partial('student_enrollment/show_advisements', :advisements, @enrollment.advisements)
-    existing_partial('student_enrollment/show_phases', :phase_completions, @enrollment.phase_completions)
+    existing_partial('student_enrollment/show_phases', :phase_completions, @enrollment.completed_or_active_phase_completions)
     existing_partial('student_enrollment/show_deferrals', :deferrals, @enrollment.deferrals)
     existing_partial('student_enrollment/show_holds', :holds, @enrollment.enrollment_holds)
     existing_partial('student_enrollment/show_scholarships', :scholarship_durations, @enrollment.scholarship_durations)

app/helpers/enrollments_helper.rb

@@ -288,13 +288,9 @@ def enrollment_thesis_defense_committee_participations_show_column(record, colum
 
 
   def enrollment_phase_due_dates_show_column(record, column)
-    completed_or_active_phases = record.phase_completions.joins(:phase)
-                                .where.not(:completion_date => nil)
-                             .or(record.phase_completions.joins(:phase)
-                                .where('phases.active' => true) )
-    return '-' if completed_or_active_phases.empty?
+    return '-' if record.completed_or_active_phase_completions.empty?
     render(partial: 'enrollments/show_phases_table', 
-           locals: { phase_completions: completed_or_active_phases,
+           locals: { phase_completions: record.completed_or_active_phase_completions,
                      dateformat: :monthyear,
                      show_obs: true })
   end

app/models/enrollment.rb

@@ -195,4 +195,11 @@ def create_user!
     true
   end
 
+  def completed_or_active_phase_completions
+    phase_completions.joins(:phase)
+        .where.not(:completion_date => nil)
+      .or(phase_completions.joins(:phase)
+        .where('phases.active' => true) )
+  end
+
 end