composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the configurable date & time format for displaying the history of StopWatches.

Browse Source 
SVN:trunk[4284]
This commit is contained in:
Denis Flaven
2016-07-05 11:57:16 +00:00
parent daccb122ae
commit a0965c2a52
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/attributedef.class.inc.php
View File

@@ -5474,7 +5474,7 @@ class AttributeStopWatch extends AttributeDefinition
case 'started':
case 'laststart':
case 'stopped':
$sHtml = (int)$sValue ? date(self::GetDateFormat(), (int)$sValue) : null;
$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
break;
default:
@@ -5488,7 +5488,7 @@ class AttributeStopWatch extends AttributeDefinition
switch($sThresholdCode)
{
case 'deadline':
$sHtml = (int)$sValue ? date(self::GetDateFormat(true /*full*/), (int)$sValue) : null;
$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
break;
case 'passed':
$sHtml = $this->GetBooleanLabel((int)$sValue);
@@ -5505,18 +5505,6 @@ class AttributeStopWatch extends AttributeDefinition
return $sHtml;
}
static protected function GetDateFormat($bFull = false)
{
if ($bFull)
{
return "Y-m-d H:i:s";
}
else
{
return "Y-m-d H:i";
}
}
public function GetSubItemAsPlainText($sItemCode, $value)
{
$sRet = $value;
@@ -5555,7 +5543,7 @@ class AttributeStopWatch extends AttributeDefinition
case 'deadline':
if ($value)
{
$sDate = date(self::GetDateFormat(true /* full */), $value);
$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
$sRet = AttributeDeadline::FormatDeadline($sDate);
}
else
@@ -5615,7 +5603,7 @@ class AttributeStopWatch extends AttributeDefinition
case 'deadline':
if ($value)
{
$sDate = date(self::GetDateFormat(true /* full */), $value);
$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
}
else
@@ -5756,7 +5744,7 @@ class AttributeStopWatch extends AttributeDefinition
}
else
{
$sRet = date(self::GetDateFormat(), $value);
$sRet = date((string)AttributeDateTime::GetFormat(), $value);
}
break;
@@ -5773,7 +5761,7 @@ class AttributeStopWatch extends AttributeDefinition
case 'deadline':
if ($value)
{
$sRet = date(self::GetDateFormat(true /*full*/), $value);
$sRet = date((string)AttributeDateTime::GetFormat(), $value);
}
else
{