diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-09-24 11:06:04 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-09-24 11:06:04 +0100 |
| commit | 79080b03e56648cccf534c1e6596c65fe68ac07a (patch) | |
| tree | 53e90e96d379734e1ac7ebd497c30f3b281ce506 /spec/models/customstates.rb | |
| parent | 034e373ad87ec347ae64c0aa5fc42ca204055b2e (diff) | |
| parent | 4cd4eacd7f43536f2b0f4bc9b8eb0fc2445031c5 (diff) | |
Merge remote-tracking branch 'openaustralia_github/calendar_days' into develop
Diffstat (limited to 'spec/models/customstates.rb')
| -rw-r--r-- | spec/models/customstates.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/customstates.rb b/spec/models/customstates.rb index 3488e6730..bffbe86fb 100644 --- a/spec/models/customstates.rb +++ b/spec/models/customstates.rb @@ -13,7 +13,7 @@ module InfoRequestCustomStates return 'deadline_extended' if Time.now.strftime("%Y-%m-%d") < self.date_deadline_extended.strftime("%Y-%m-%d") return 'waiting_response_very_overdue' if - Time.now.strftime("%Y-%m-%d") > Holiday.due_date_from(self.date_deadline_extended, 15).strftime("%Y-%m-%d") + Time.now.strftime("%Y-%m-%d") > Holiday.due_date_from_working_days(self.date_deadline_extended, 15).strftime("%Y-%m-%d") return 'waiting_response_overdue' end return 'waiting_response_very_overdue' if @@ -27,7 +27,7 @@ module InfoRequestCustomStates # XXX shouldn't this be 15 days after the date the status was # changed to "deadline extended"? Or perhaps 15 days ater the # initial request due date? - return Holiday.due_date_from(self.date_response_required_by, 15) + return Holiday.due_date_from_working_days(self.date_response_required_by, 15) end module ClassMethods |