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

Add fields endPoint status indicator

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-04-15 14:46:54 -04:00
parent 8a8373684c
commit 34098810f8
2 changed files with 71 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -468,29 +468,56 @@ class indicatorsCalculator
return $retval; return $retval;
} }
public function statusIndicator($usrUid) public function statusIndicatorGeneral ($usrUid)
{ {
$params[':usrUid'] = $usrUid; $params[':usrUid'] = $usrUid;
$response = array(); $sqlString = "SELECT
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS OVERDUE,
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS ONTIME,
COALESCE( SUM( DATEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS ATRISK
FROM LIST_INBOX
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO'
AND DEL_DUE_DATE IS NOT NULL ";
return $this->pdoExecutor($sqlString, $params);
}
public function statusIndicatorDetail ($usrUid)
{
$params[':usrUid'] = $usrUid;
$sqlString = "SELECT $sqlString = "SELECT
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS OVERDUE, TAS_UID as tasUid,
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS ONTIME, PRO_UID as proUid,
COALESCE( SUM( DATEDIFF( DEL_RICK_DATE , NOW( ) ) < 0 ) , 0 ) AS ATRISK APP_TAS_TITLE AS taskTitle,
FROM LIST_INBOX APP_PRO_TITLE AS proTitle,
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO' COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS overdue,
AND DEL_DUE_DATE IS NOT NULL "; COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS onTime,
$result = $this->pdoExecutor($sqlString, $params); COALESCE( SUM( DATEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS atRisk
FROM LIST_INBOX
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO'
AND DEL_DUE_DATE IS NOT NULL
GROUP BY TAS_UID";
return $this->pdoExecutor($sqlString, $params);
}
public function statusIndicator($usrUid)
{
$response = array();
$result = $this->statusIndicatorGeneral($usrUid);
$response['overdue'] = 0; $response['overdue'] = 0;
$response['atRisk'] = 0; $response['atRisk'] = 0;
$response['onTime'] = 0; $response['onTime'] = 0;
$response['porcentageOverdue'] = 0; $response['percentageOverdue'] = 0;
$response['porcentageAtRisk'] = 0; $response['percentageAtRisk'] = 0;
$response['procentageOnTime'] = 0; $response['percentageOnTime'] = 0;
$response['DATALIST'] = array(); $response['dataList'] = array();
if (is_array($result) && isset($result[0])) { if (is_array($result) && isset($result[0])) {
$response['overdue'] = $result[0]['OVERDUE']; $response['overdue'] = $result[0]['OVERDUE'];
@@ -499,28 +526,13 @@ class indicatorsCalculator
$total = $response['overdue'] + $response['atRisk'] + $response['onTime']; $total = $response['overdue'] + $response['atRisk'] + $response['onTime'];
if ($total != 0) { if ($total != 0) {
$response['porcentageOverdue'] = ($response['overdue']*100)/$total; $response['percentageOverdue'] = ($response['overdue']*100)/$total;
$response['porcentageAtRisk'] = ($response['atRisk']*100)/$total; $response['percentageAtRisk'] = ($response['atRisk']*100)/$total;
$response['procentageOnTime'] = ($response['onTime']*100)/$total; $response['percentageOnTime'] = ($response['onTime']*100)/$total;
} }
} }
$result = $this->statusIndicatorDetail($usrUid);
$sqlString = "SELECT
TAS_UID,
PRO_UID,
APP_TAS_TITLE AS taskTitle,
APP_PRO_TITLE AS proTitle,
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS overdue,
COALESCE( SUM( DATEDIFF( DEL_DUE_DATE , NOW( ) ) > 0 ) , 0 ) AS onTime,
COALESCE( SUM( DATEDIFF( DEL_RICK_DATE , NOW( ) ) < 0 ) , 0 ) AS atRisk
FROM LIST_INBOX
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO'
AND DEL_DUE_DATE IS NOT NULL
GROUP BY TAS_UID";
$result = $this->pdoExecutor($sqlString, $params);
foreach ($result as $key => $value) { foreach ($result as $key => $value) {
$result[$key]['overdue'] = $value['overdue']; $result[$key]['overdue'] = $value['overdue'];
@@ -528,13 +540,12 @@ class indicatorsCalculator
$result[$key]['onTime'] = $value['onTime']; $result[$key]['onTime'] = $value['onTime'];
$total = $value['overdue'] + $value['onTime'] + $value['atRisk']; $total = $value['overdue'] + $value['onTime'] + $value['atRisk'];
if ($total != 0) { if ($total != 0) {
$result[$key]['porcentageOverdue'] = ($value['overdue']*100)/$total; $result[$key]['percentageOverdue'] = ($value['overdue']*100)/$total;
$result[$key]['porcentageAtRisk'] = ($value['atRisk']*100)/$total; $result[$key]['percentageAtRisk'] = ($value['atRisk']*100)/$total;
$result[$key]['procentageOnTime'] = ($value['onTime']*100)/$total; $result[$key]['percentageOnTime'] = ($value['onTime']*100)/$total;
} }
} }
$response['dataList'] = $result;
$response['DATALIST'] = $result;
return $response; return $response;
} }

22
workflow/engine/classes/model/DashboardIndicator.php
View File

@@ -70,6 +70,28 @@ class DashboardIndicator extends BaseDashboardIndicator
$oldValue = current(reset($calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE))); $oldValue = current(reset($calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
$row['DAS_IND_VARIATION'] = $value - $oldValue; $row['DAS_IND_VARIATION'] = $value - $oldValue;
break; break;
case '1050':
$value = $calculator->statusIndicatorGeneral($userUid);
$row['OVERDUE'] = 0;
$row['ON_TIME'] = 0;
$row['AT_RISK'] = 0;
$row['PERCENTAGE_OVERDUE'] = 0;
$row['PERCENTAGE_AT_RISK'] = 0;
$row['PERCENTAGE_ON_TIME'] = 0;
if (is_array($value) && isset($value[0])) {
$row['OVERDUE'] = $value[0]['OVERDUE'];
$row['ON_TIME'] = $value[0]['ONTIME'];
$row['AT_RISK'] = $value[0]['ATRISK'];
$total = $row['OVERDUE'] + $row['AT_RISK'] + $row['ON_TIME'];
if ($total != 0) {
$row['PERCENTAGE_OVERDUE'] = ($row['OVERDUE']*100)/$total;
$row['PERCENTAGE_AT_RISK'] = ($row['AT_RISK']*100)/$total;
$row['PERCENTAGE_ON_TIME'] = ($row['ON_TIME']*100)/$total;
}
}
break;
default: default:
$arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE); $arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
$value = $arrResult[0]['value']; $value = $arrResult[0]['value'];