-
+
<%= link_to row.person.decorate.full_name_with_display_name, edit_event_registration_path(row.registration), target: "_blank", rel: "noopener", class: "font-medium text-gray-800 hover:underline hover:text-blue-700" %> —
<% if row.affiliation %>
<%= link_to edit_person_path(row.person, anchor: dom_id(row.affiliation)), target: "_blank", rel: "noopener", title: "Edit affiliation", class: "hover:underline hover:text-blue-700" do %>
@@ -167,7 +122,10 @@
<% else %>
<%= row.organization.name %>
<% end %>
-
+ <% if row.shows_jobs? %>
+ <%= render "job_note", jobs: row.jobs %>
+ <% end %>
+
<% if reason == AffiliationServices::ReconcilePerson::ATTENDANCE_NOT_RECORDED && ticked.add?(row.registration&.id) %>
<%= render "attendance_day_ticks", registration: row.registration, event: @event %>
<% end %>
diff --git a/db/seeds/features/2026-10-23-reconcile-cancelled-registrants-right-away.yml b/db/seeds/features/2026-10-23-reconcile-cancelled-registrants-right-away.yml
new file mode 100644
index 0000000000..3f75e1896e
--- /dev/null
+++ b/db/seeds/features/2026-10-23-reconcile-cancelled-registrants-right-away.yml
@@ -0,0 +1,14 @@
+name: "Reconcile cancelled registrants before the training"
+area: events
+display_status: admin_facing
+released_on: 2026-10-23
+action_path: "/events/1/reconcile_affiliations"
+pr_number: 2803
+summary: >-
+ Reconcile affiliations now lists cancelled registrants in their own section, so
+ the facilitator affiliation their registration created can be deleted right away
+ instead of after the training ends.
+pro_tips:
+ - "Someone who cancelled and never trained should have the affiliation deleted, not deactivated — there's no facilitation history to keep."
+ - "Registrants still marked Registered are listed under Not reconciled for reference until the training ends."
+ - "Rows for cancelled, no-show, and transferred registrants — and any row offering Delete — note whether the person still has a job affiliation with that organization."
diff --git a/spec/requests/events/reconcile_affiliations_spec.rb b/spec/requests/events/reconcile_affiliations_spec.rb
index 6afa653173..30d20a4253 100644
--- a/spec/requests/events/reconcile_affiliations_spec.rb
+++ b/spec/requests/events/reconcile_affiliations_spec.rb
@@ -53,6 +53,116 @@ def registrant_with_affiliation(status:)
expect(response.body).to include("Create new")
end
+ it "gives cancelled registrants their own section before the event, with the deletion preselected" do
+ upcoming = create(:event, facilitator_training: true, start_date: 3.days.from_now, end_date: 5.days.from_now)
+ cancelled = create(:event_registration, event: upcoming, status: "cancelled")
+ registered = create(:event_registration, event: upcoming, status: "registered")
+ [ cancelled, registered ].each do |reg|
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+ end
+ minted = create(:affiliation, person: cancelled.registrant, organization: organization, title: "Facilitator",
+ start_date: upcoming.starts_on, event_registration: cancelled)
+ create(:affiliation, person: registered.registrant, organization: organization, title: "Facilitator",
+ start_date: upcoming.starts_on, event_registration: registered)
+
+ get reconcile_affiliations_event_path(upcoming)
+
+ page = Nokogiri::HTML(response.body)
+ section = page.at_css("#reconcile_cancelled")
+ expect(section.text).to include(cancelled.registrant.name)
+ expect(section.text).not_to include(registered.registrant.name)
+ expect(section.at_css("#outcome_aff\\:#{minted.id}_delete")["checked"]).to be_present
+ expect(page.text).to include("Training hasn't ended yet")
+ end
+
+ it "notes on each cancelled row whether the person keeps a job affiliation with that organization" do
+ upcoming = create(:event, facilitator_training: true, start_date: 3.days.from_now, end_date: 5.days.from_now)
+ with_job, without_job = Array.new(2) do
+ reg = create(:event_registration, event: upcoming, status: "cancelled")
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+ create(:affiliation, person: reg.registrant, organization: organization, title: "Facilitator",
+ start_date: upcoming.starts_on, event_registration: reg)
+ reg
+ end
+ create(:affiliation, person: with_job.registrant, organization: organization, title: "Counselor",
+ start_date: 1.year.ago.to_date)
+
+ get reconcile_affiliations_event_path(upcoming)
+
+ cards = Nokogiri::HTML(response.body).css("#reconcile_cancelled section")
+ card_for = ->(reg) { cards.find { |card| card.text.include?(reg.registrant.name) }.text.squish }
+ expect(card_for.call(with_job)).to include("Job affiliation: Counselor · Since #{1.year.ago.strftime('%b %Y')}")
+ expect(card_for.call(without_job)).to include("No job affiliation")
+ end
+
+ it "shows each job affiliation's date range in the note" do
+ reg = create(:event_registration, event: event, status: "cancelled")
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+ create(:affiliation, person: reg.registrant, organization: organization, title: "Counselor",
+ start_date: Date.new(2024, 1, 15), end_date: 2.years.from_now.to_date)
+
+ get reconcile_affiliations_event_path(event)
+
+ expect(response.body).to include("Counselor · Jan 2024 – #{2.years.from_now.strftime('%b %Y')}")
+ end
+
+ it "keeps the cancelled section and its job note after the event" do
+ reg = create(:event_registration, event: event, status: "cancelled")
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+ create(:affiliation, person: reg.registrant, organization: organization, title: "Facilitator",
+ start_date: event.starts_on, event_registration: reg)
+
+ get reconcile_affiliations_event_path(event)
+
+ section = Nokogiri::HTML(response.body).at_css("#reconcile_cancelled")
+ expect(section.text).to include(reg.registrant.name)
+ expect(section.text).to include("No job affiliation")
+ end
+
+ it "notes job affiliations on any row offering a delete, and only there" do
+ no_show, _affiliation = registrant_with_affiliation(status: "no_show")
+ create(:affiliation, person: no_show, organization: organization, title: "Counselor",
+ start_date: 1.year.ago.to_date)
+ upcoming = create(:event, facilitator_training: true, start_date: 3.days.from_now, end_date: 5.days.from_now)
+ reg = create(:event_registration, event: upcoming, status: "registered")
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+
+ get reconcile_affiliations_event_path(event)
+ expect(response.body).to include("Job affiliation: Counselor")
+
+ get reconcile_affiliations_event_path(upcoming)
+ expect(response.body).to include("Create new")
+ expect(response.body).not_to include("job affiliation")
+ end
+
+ it "notes job affiliations for a transferred-out registrant" do
+ person, _affiliation = registrant_with_affiliation(status: "registered")
+ source = person.event_registrations.find_by(event: event)
+ destination_event = create(:event, facilitator_training: true, start_date: 3.months.from_now,
+ end_date: 3.months.from_now + 1.day, registration_close_date: 2.months.from_now)
+ destination = create(:event_registration, registrant: person, event: destination_event, status: "registered")
+ create(:event_registration_organization, event_registration: destination, organization: organization)
+ destination.update!(transferred_from_registration: source)
+ source.update!(status: "transferred_out")
+ create(:affiliation, person: person, organization: organization, title: "Counselor", start_date: 1.year.ago.to_date)
+
+ get reconcile_affiliations_event_path(event)
+
+ expect(response.body).to include("Move to the new event")
+ expect(response.body).to include("Job affiliation: Counselor")
+ end
+
+ it "notes job affiliations on a no-show listed under Not reconciled" do
+ person = create(:person)
+ reg = create(:event_registration, event: event, registrant: person, status: "no_show")
+ create(:event_registration_organization, event_registration: reg, organization: organization)
+
+ get reconcile_affiliations_event_path(event)
+
+ expect(response.body).to include("Didn't attend — no affiliation created")
+ expect(response.body).to include("No job affiliation")
+ end
+
it "previews a facilitator affiliation on a non-training event as a deletion" do
non_training = create(:event, :ended, facilitator_training: false)
person = create(:person)
diff --git a/spec/services/affiliation_services/reconcile_person_spec.rb b/spec/services/affiliation_services/reconcile_person_spec.rb
index 6de512cb8a..431b12bb03 100644
--- a/spec/services/affiliation_services/reconcile_person_spec.rb
+++ b/spec/services/affiliation_services/reconcile_person_spec.rb
@@ -47,6 +47,27 @@ def reconcile(registration, **options)
expect(Affiliation.exists?(affiliation.id)).to be(false)
end
+ it "deletes the minted row as soon as the person cancels, without waiting for the training to end" do
+ reg = training_registration(status: "cancelled", ended: false)
+ affiliation = owned_facilitator(registration: reg, start_date: Date.current)
+
+ reconcile(reg)
+
+ expect(Affiliation.exists?(affiliation.id)).to be(false)
+ end
+
+ it "waits on another upcoming training's row even when this registration is cancelled" do
+ reg = training_registration(status: "cancelled", ended: false)
+ other = training_registration(status: "registered", ended: false)
+ affiliation = owned_facilitator(registration: other, start_date: Date.current)
+
+ plan = described_class.new(person: person, organization: organization, event: reg.event,
+ registration: reg, include_unowned: true).plan
+
+ expect(plan.map(&:reason)).to eq([ described_class::TRAINING_PENDING ])
+ expect(affiliation.reload).to be_active
+ end
+
# They were here for part of it. Deleting the row would erase that; ending it
# records a facilitator term that was brief rather than one that never began.
it "ends the minted row rather than deleting it for a partial attendance" do
@@ -86,6 +107,25 @@ def reconcile(registration, **options)
expect(plan.first.reason).to eq(described_class::TRAINING_PENDING)
end
+ it "files a row starting on an upcoming training's date as pending, not as already ended" do
+ reg = training_registration(status: "registered", ended: false)
+ owned_facilitator(registration: reg)
+
+ plan = described_class.new(person: person, organization: organization,
+ event: reg.event, registration: reg).plan
+
+ expect(plan.map(&:reason)).to eq([ described_class::TRAINING_PENDING ])
+ end
+
+ it "deletes an upcoming training's row once the person cancels" do
+ reg = training_registration(status: "cancelled", ended: false)
+ affiliation = owned_facilitator(registration: reg)
+
+ reconcile(reg)
+
+ expect(Affiliation.exists?(affiliation.id)).to be(false)
+ end
+
it "deletes it on the day a one-day training ends, with no reliance on the inactive flag" do
event = create(:event, facilitator_training: true, start_date: 3.hours.ago,
end_date: 1.hour.ago, registration_close_date: 4.hours.ago)
@@ -459,6 +499,16 @@ def transferred_out(destination_event:, link_org: organization)
.to change { person.affiliations.facilitators.where(organization: organization).count }.by(1)
end
+ it "proposes no affiliation for a registrant who cancelled before the training" do
+ reg = training_registration(status: "cancelled", ended: false)
+
+ plan = described_class.new(person: person, organization: organization, event: reg.event,
+ registration: reg).plan
+
+ expect(plan.map(&:action)).to eq([ :noop ])
+ expect(plan.first.reason).to eq(described_class::CANCELLED)
+ end
+
it "proposes nothing when the caller passes no registration to own the new row" do
reg = training_registration(status: "attended")