fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'pm/master'

Browse Source
This commit is contained in:
Ronald Quenta
2015-04-27 09:47:48 -04:00
parent 956a10e792 5e7e4961e0
commit d732c1eef5
23 changed files with 1510 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
View File

@@ -33,7 +33,7 @@ class ReportingIndicators
$retval = array(
"id" => $indicatorUid,
"efficiencyIndex" => $peiValue,
"efficiencyIndexCompare" => $peiCompare,
"efficiencyIndexToCompare" => $peiCompare,
"efficiencyVariation" => ($peiValue-$peiCompare),
"inefficiencyCost" => $peiCost,
"data"=>$processes);
@@ -68,6 +68,7 @@ class ReportingIndicators
"efficiencyIndex" => $ueiValue,
"efficiencyVariation" => ($ueiValue-$ueiCompare),
"inefficiencyCost" => $ueiCost,
"efficiencyIndexToCompare" => $ueiCompare,
"data"=>$groups);
return $retval;
}

2
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -363,7 +363,7 @@ class User
/*----------------------------------********---------------------------------*/
$this->getFieldNameByFormatFieldName("USR_COST_BY_HOUR") => $record["USR_COST_BY_HOUR"],
$this->getFieldNameByFormatFieldName("USR_UNIT_COST") => $record["USR_UNIT_COST"],
/*---------------------------------********---------------------------------*/
/*----------------------------------********---------------------------------*/
$this->getFieldNameByFormatFieldName("USR_TOTAL_INBOX") => $record["USR_TOTAL_INBOX"],
$this->getFieldNameByFormatFieldName("USR_TOTAL_DRAFT") => $record["USR_TOTAL_DRAFT"],
$this->getFieldNameByFormatFieldName("USR_TOTAL_CANCELLED") => $record["USR_TOTAL_CANCELLED"],