composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1522 - Dashlet group by on stopwatch

Browse Source 
SVN:trunk[5904]
This commit is contained in:
Eric Espié
2018-06-25 09:59:36 +00:00
parent a848cb28f1
commit 21a5a2d4ef
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/dashboard.class.inc.php
View File

@@ -256,9 +256,11 @@ abstract class Dashboard
{
$sDashletClass = $aDashletParams['dashlet_class'];
$sId = $aDashletParams['dashlet_id'];
$sType = $aDashletParams['dashlet_type'];
$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
$oNewDashlet->SetDashletType($sType);
if (isset($aDashletParams['dashlet_type']))
{
$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
}
$oForm = $oNewDashlet->GetForm();
$oForm->SetParamsContainer($sId);
$oForm->SetPrefix('');

18
application/dashlet.class.inc.php
View File

@@ -827,14 +827,17 @@ abstract class DashletGroupBy extends Dashlet
if (empty($this->aProperties['order_direction']))
{
$aAttributeTypes = $this->oModelReflection->ListAttributes($this->sClass);
$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime')
if (isset($aAttributeTypes[$this->sGroupByAttCode]))
{
$this->sOrderDirection = 'asc';
}
else
{
$this->sOrderDirection = 'desc';
$sAttributeType = $aAttributeTypes[$this->sGroupByAttCode];
if (is_subclass_of($sAttributeType, 'AttributeDateTime') || $sAttributeType == 'AttributeDateTime')
{
$this->sOrderDirection = 'asc';
}
else
{
$this->sOrderDirection = 'desc';
}
}
}
else
@@ -1199,6 +1202,7 @@ abstract class DashletGroupBy extends Dashlet
case 'AttributeDuration':
case 'AttributeInteger':
case 'AttributePercentage':
case 'AttributeSubItem': // TODO: Known limitation: no unit displayed (values in sec)
$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
$aFunctionAttributes[$sAttCode] = $sLabel;
break;