From a7d26c09ff0caba192b2adfc75fd5212f973a903 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Mon, 11 Nov 2024 16:48:56 +0000 Subject: [PATCH] Fix status calculation for locations --- app/models/location.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/location.rb b/app/models/location.rb index 9e570889d..12c6f2fad 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -206,7 +206,7 @@ class Location < ApplicationRecord def status_at(date) return :deleted if discarded_at.present? return :incomplete unless confirmed - return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated || + return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated || scheme.owning_organisation.status_at(date) == :merged || open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date || scheme.status_at(date) == :deactivated return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date || scheme.status_at(date) == :deactivating_soon return :activating_soon if startdate.present? && date < startdate