fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolution of integration conflicts with PM Final mods

Browse Source
This commit is contained in:
Dante
2015-06-18 08:46:57 -04:00
parent f931be9a99
commit 8955b60d36
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/classes/class.calendar.php
View File

@@ -839,20 +839,11 @@ class calendar extends CalendarDefinition
$finDate = date('Y-m-d H:i:s');
}
$secondDuration = 0.00;
if ( (strtotime($iniDate)) < (strtotime($finDate)) ) {
$timeIniDate = strtotime($iniDate);
$timeFinDate = strtotime($finDate);
} elseif ( (strtotime($finDate)) < (strtotime($iniDate)) ) {
$timeIniDate = strtotime($finDate);
$timeFinDate = strtotime($iniDate);
$auxDate = $iniDate;
$iniDate = $finDate;
$finDate = $auxDate;
} else {
return $secondDuration;
}
if ((strtotime($finDate)) <= (strtotime($iniDate))) {
return 0.00;
}
$secondDuration = 0.00;
$finDate = $this->dashGetIniDate($finDate, $calendarData);
$newDate = $iniDate;
@@ -1047,4 +1038,4 @@ class calendar extends CalendarDefinition
}
}
?>
?>