From 60ea36a601b258a231dd3311ca840df26b78c6f2 Mon Sep 17 00:00:00 2001 From: Dante Date: Thu, 25 Jun 2015 18:08:10 -0400 Subject: [PATCH] calendar calculate correction --- workflow/engine/classes/class.calendar.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow/engine/classes/class.calendar.php b/workflow/engine/classes/class.calendar.php index 31ddf7e50..41397aaf0 100755 --- a/workflow/engine/classes/class.calendar.php +++ b/workflow/engine/classes/class.calendar.php @@ -839,6 +839,7 @@ class calendar extends CalendarDefinition $finDate = date('Y-m-d H:i:s'); } + if ((strtotime($finDate)) <= (strtotime($iniDate))) { return 0.00; } @@ -847,6 +848,10 @@ class calendar extends CalendarDefinition $finDate = $this->dashGetIniDate($finDate, $calendarData); $newDate = $iniDate; + + $timeIniDate = strtotime($iniDate); + $timeFinDate = strtotime($finDate); + while ($timeIniDate < $timeFinDate) { $newDate = $this->dashGetIniDate($newDate, $calendarData);