From 8b0bfbbc8b05c12e29199feb99ff6042a3461b67 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Mon, 9 Apr 2018 13:00:41 +0000 Subject: Gantt bars with start date and end date on the same day don't become red by overdue (#13521). Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17294 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/helpers/gantt.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index c0b1f3148..294303209 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -595,11 +595,11 @@ module Redmine coords[:bar_progress_end] = self.date_to - self.date_from + 1 end end - if progress_date < User.current.today - late_date = [User.current.today, end_date].min + if progress_date <= User.current.today + late_date = [User.current.today, end_date].min + 1 if late_date > self.date_from && late_date > start_date if late_date < self.date_to - coords[:bar_late_end] = late_date - self.date_from + 1 + coords[:bar_late_end] = late_date - self.date_from else coords[:bar_late_end] = self.date_to - self.date_from + 1 end -- cgit v1.2.3