Merge branch '5300-allow-chas-to-view-participants-in-region' into qa

app/controllers/ambassador/participants_controller.rb

@@ -1,17 +1,31 @@
 module Ambassador
   class ParticipantsController < AmbassadorController
     def show
-      @account = Account
-        .joins(:chapterable_assignments)
-        .where(
-          chapterable_assignments: {
-            chapterable_type: current_ambassador.chapterable_type.capitalize,
-            chapterable_id: current_ambassador.current_chapterable.id
-          }
-        )
-        .find(params[:id])
+      if params[:search_in_region].present?
+        @account = Account
+          .in_region(current_ambassador)
+          .find(params[:id])
+
+        @teams = Team
+          .current
+          .in_region(current_ambassador)
+      else
+        @account = Account
+          .by_chapterable(
+            current_ambassador.chapterable_type,
+            current_ambassador.current_chapterable.id
+          )
+          .find(params[:id])
+
+        @teams = Team
+          .current
+          .by_chapterable(
+            current_ambassador.chapterable_type,
+            current_ambassador.current_chapterable.id
+          )
+          .distinct
+      end
 
-      @teams = Team.current.in_region(current_ambassador)
       @season_flag = SeasonFlag.new(@account)
     end
   end

app/data_grids/judges_grid.rb

@@ -12,7 +12,9 @@ def self.current_judging_round
   end
 
   scope do
-    Account.includes(judge_profile: :events)
+    Account
+      .includes(judge_profile: :events)
+      .includes(:mentor_profile)
       .references(:judge_profiles, :regional_pitch_events)
       .where("judge_profiles.id IS NOT NULL")
   end
@@ -136,7 +138,7 @@ def self.current_judging_round
   column :actions, mandatory: true, html: true do |account|
     link_to(
       "view",
-      send("#{current_scope}_participant_path", account),
+      send(:"#{current_scope}_participant_path", account, search_in_region: 1),
       data: {turbolinks: false}
     )
   end
@@ -148,24 +150,24 @@ def self.current_judging_round
       ["No, still onboarding", "onboarding"]
     ],
     filter_group: "common" do |value, scope, grid|
-      scope.where(
-        "judge_profiles.onboarded = ?",
-        value == "onboarded"
-      )
+    scope.where(
+      "judge_profiles.onboarded = ?",
+      value == "onboarded"
+    )
   end
 
   filter :judge_types,
-         :enum,
-         header: "Judge Type",
-         select: proc { JudgeType.all.map { |j| [j.name, j.id] } },
-         filter_group: "more-specific",
-         html: {
-           class: "and-or-field"
-         },
-         multiple: true do |values, scope|
+    :enum,
+    header: "Judge Type",
+    select: proc { JudgeType.all.map { |j| [j.name, j.id] } },
+    filter_group: "more-specific",
+    html: {
+      class: "and-or-field"
+    },
+    multiple: true do |values, scope|
     scope.includes(judge_profile: :judge_types)
-         .references(:judge_profile, :judge_profile_judge_types)
-         .where(judge_profile_judge_types: {judge_type_id: values})
+      .references(:judge_profile, :judge_profile_judge_types)
+      .where(judge_profile_judge_types: {judge_type_id: values})
   end
 
   filter :has_mentor_profile,

app/models/account.rb

@@ -508,6 +508,16 @@ def chapter_ambassador
       .where("background_checks.status = ?", BackgroundCheck.statuses[:suspended])
   }
 
+  scope :by_chapterable, ->(chapterable_type, chapterable_id) do
+    left_outer_joins(:chapterable_assignments)
+      .where(
+        chapterable_assignments: {
+          chapterable_type: chapterable_type.capitalize,
+          chapterable_id: chapterable_id
+        }
+      )
+  end
+
   scope :by_chapter, ->(chapter_id) {
     left_outer_joins(:chapterable_assignments)
       .where("chapterable_account_assignments.chapterable_type = 'Chapter'")

app/models/chapter.rb

@@ -96,4 +96,8 @@ def required_onboarding_tasks
       "Program Info" => program_info_complete?
     }
   end
+
+  def secondary_regions
+    []
+  end
 end

app/models/club.rb

@@ -42,4 +42,8 @@ def club_info_complete?
       primary_contact
     ].all?(&:present?)
   end
+
+  def secondary_regions
+    []
+  end
 end