composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restored the behavior of itop-sla-computation (if present, then it becomes the default working hour computer)

Browse Source 
SVN:trunk[2828]
This commit is contained in:
Romain Quetiez
2013-08-21 08:07:31 +00:00
parent 2dbcb6d416
commit 2893d16d58
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/ormstopwatch.class.inc.php
View File

@@ -213,6 +213,10 @@ class ormStopWatch
protected function ComputeDeadline($oObject, $oAttDef, $iStartTime, $iDurationSec)
{
$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
if ($sWorkingTimeComputer == '')
{
$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
}
$aCallSpec = array($sWorkingTimeComputer, '__construct');
if (!is_callable($aCallSpec))
{
@@ -234,6 +238,10 @@ class ormStopWatch
protected function ComputeDuration($oObject, $oAttDef, $iStartTime, $iEndTime)
{
$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
if ($sWorkingTimeComputer == '')
{
$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
}
$oComputer = new $sWorkingTimeComputer();
$aCallSpec = array($oComputer, 'GetOpenDuration');
if (!is_callable($aCallSpec))

31
datamodels/2.x/itop-sla-computation/main.itop-sla-computation.php
View File

@@ -25,10 +25,10 @@
*/
/**
* Static class that implements the public interface for utilities
* Implements the public interface for utilities
* related to the SLA computation
*/
class SLAComputation
class SLAComputation implements iWorkingTimeComputer
{
protected static $m_oAddOn;
@@ -41,7 +41,7 @@ class SLAComputation
{
if (!class_exists($sClassName))
{
throw new CoreException("Could not select this module, '$sModuleName' in not a valid class name");
throw new CoreException("Could not select this module, '$sClassName' in not a valid class name");
return;
}
if (($sClassName != 'SLAComputationAddOnAPI') && !is_subclass_of($sClassName, 'SLAComputationAddOnAPI'))
@@ -62,33 +62,34 @@ class SLAComputation
return self::$m_oAddOn;
}
public static function GetDescription()
{
return "SLA computation (depends on the installed module)";
}
/**
* Get the date/time corresponding to a given delay in the future from the present
* considering only the valid (open) hours for a specified ticket
* @param $oTicket Ticket The ticket for which to compute the deadline
* considering only the valid (open) hours for a specified object
* @param $oObject DBObject The object for which to compute the deadline
* @param $iDuration integer The duration (in seconds) in the future
* @param $oStartDate DateTime The starting point for the computation (default = now)
* @param $oStartDate DateTime The starting point for the computation
* @return DateTime The date/time for the deadline
*/
public static function GetDeadline($oTicket, $iDuration, $oStartDate = null)
public function GetDeadline($oObject, $iDuration, DateTime $oStartDate)
{
if ($oStartDate == null)
{
$oStartDate = new DateTime();
}
return self::$m_oAddOn->GetDeadline($oTicket, $iDuration, $oStartDate);
return self::$m_oAddOn->GetDeadline($oObject, $iDuration, $oStartDate);
}
/**
* Get duration (considering only open hours) elapsed bewteen two given DateTimes
* @param $oTicket Ticket The ticket for which to compute the deadline
* @param $oObject DBObject The object for which to compute the duration
* @param $oStartDate DateTime The starting point for the computation (default = now)
* @param $oEndDate DateTime The ending point for the computation (default = now)
* @return integer The duration (number of seconds) of open hours elapsed between the two dates
*/
public static function GetOpenDuration($oTicket, DateTime $oStartDate, DateTime $oEndDate)
public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
{
return self::$m_oAddOn->GetOpenDuration($oTicket, $oStartDate, $oEndDate);
return self::$m_oAddOn->GetOpenDuration($oObject, $oStartDate, $oEndDate);
}
}

2
setup/compiler.class.inc.php
View File

@@ -756,7 +756,7 @@ EOF;
$aParameters['states'] = 'array('.implode(', ', $aStates).')';
$aParameters['goal_computing'] = $this->GetPropString($oField, 'goal', 'DefaultMetricComputer'); // Optional, no deadline by default
$aParameters['working_time_computing'] = $this->GetPropString($oField, 'working_time', 'DefaultWorkingTimeComputer'); // Optional, defaults to 24x7
$aParameters['working_time_computing'] = $this->GetPropString($oField, 'working_time', ''); // Blank (different than DefaultWorkingTimeComputer)
$oThresholds = $oField->GetUniqueElement('thresholds');
$oThresholdNodes = $oThresholds->getElementsByTagName('threshold');