aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/clean_up.rb
diff options
context:
space:
mode:
authorcedricnjanga2017-07-06 17:38:16 +0200
committercedricnjanga2017-07-06 17:38:16 +0200
commitbf63449de6ac9624352af4c0319758da3c8d827e (patch)
treefe9a2b1ecffe5b25591f280885454447c4e84098 /app/models/clean_up.rb
parentbb6f9da17477dfd05313fc6b071a6ac101af5077 (diff)
downloadchouette-core-bf63449de6ac9624352af4c0319758da3c8d827e.tar.bz2
Fix test according changes in model : boundaries are exclusive for between clean up
Diffstat (limited to 'app/models/clean_up.rb')
-rw-r--r--app/models/clean_up.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index 08e84faa0..a51a98260 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -83,13 +83,14 @@ class CleanUp < ActiveRecord::Base
day if day.public_send(operator, self.begin_date)
end
else
- days_in_cleanup_periode = ((self.begin_date + 1.day)...self.end_date)
+ days_in_cleanup_periode = (self.begin_date..self.end_date)
to_exclude_days = days_in_period & days_in_cleanup_periode
end
to_exclude_days.to_a.compact.each do |day|
# we ensure day is not already an exclude date
- if !day_out.include?(day)
+ # and that day is not equal to the boundariy date of the clean up
+ if !day_out.include?(day) && day != self.begin_date && day != self.end_date
self.add_exclude_date(period.time_table, day)
end
end