diff --git a/app/models/scheme.rb b/app/models/scheme.rb index d4a35e776..d4cb97e4f 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -166,7 +166,9 @@ class Scheme < ApplicationRecord end def appended_text - "#{locations.count { |location| location.startdate.blank? || location.startdate <= Time.zone.today }} locations" + active_count = locations.count { |location| %i[active deactivating_soon].include?(location.status) } + inactive_count = locations.count { |location| !%i[active deactivating_soon].include?(location.status) } + "#{active_count} active #{'location'.pluralize(active_count)}, #{inactive_count} inactive #{'location'.pluralize(inactive_count)}" end def hint