HOR-4527
This commit is contained in:
Marco Antonio Nina Mena
committed by
Julio Cesar Laura Avendaño
Julio Cesar Laura Avendaño
parent
abe71a6ffe
commit
0d533e19d9
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseDashboardIndicator.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'DASHBOARD_INDICATOR' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -16,68 +16,75 @@ require_once 'classes/model/om/BaseDashboardIndicator.php';
|
||||
*/
|
||||
class DashboardIndicator extends BaseDashboardIndicator
|
||||
{
|
||||
public function load ($dasIndUid)
|
||||
public function load($dasIndUid)
|
||||
{
|
||||
try {
|
||||
$dashboardIndicator = DashboardIndicatorPeer::retrieveByPK($dasIndUid);
|
||||
$fields = $dashboardIndicator->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
$dashboardIndicator->fromArray( $fields, BasePeer::TYPE_FIELDNAME );
|
||||
$dashboardIndicator->fromArray($fields, BasePeer::TYPE_FIELDNAME);
|
||||
return $fields;
|
||||
} catch (Exception $error) {
|
||||
throw $error;
|
||||
}
|
||||
}
|
||||
function loadbyDasUid ($dasUid, $vcompareDate, $vmeasureDate, $userUid)
|
||||
{
|
||||
|
||||
public function loadbyDasUid($dasUid, $vcompareDate, $vmeasureDate, $userUid)
|
||||
{
|
||||
$calculator = new \IndicatorsCalculator();
|
||||
|
||||
try {
|
||||
$connection = Propel::getConnection('workflow');
|
||||
$qryString = "select * from CONFIGURATION where CFG_UID = 'DASHBOARDS_SETTINGS' and USR_UID = '$userUid'";
|
||||
$qry = $connection->PrepareStatement($qryString);
|
||||
$dataSet = $qry->executeQuery();
|
||||
$dashConfig = array();
|
||||
while ($dataSet->next()) {
|
||||
$row = $dataSet->getRow();
|
||||
$dashConfig = unserialize($row['CFG_VALUE']);
|
||||
}
|
||||
|
||||
$connection = Propel::getConnection('workflow');
|
||||
$qryString = "select * from CONFIGURATION where CFG_UID = 'DASHBOARDS_SETTINGS' and USR_UID = '$userUid'";
|
||||
$qry = $connection->PrepareStatement($qryString);
|
||||
$dataSet = $qry->executeQuery();
|
||||
$dashConfig = array();
|
||||
while ($dataSet->next()){
|
||||
$row = $dataSet->getRow();
|
||||
$dashConfig = unserialize($row['CFG_VALUE']);
|
||||
}
|
||||
|
||||
$criteria = new Criteria( 'workflow' );
|
||||
$criteria = new Criteria('workflow');
|
||||
$criteria->clearSelectColumns()->clearOrderByColumns();
|
||||
|
||||
$criteria->add( DashboardIndicatorPeer::DAS_UID, $dasUid, criteria::EQUAL );
|
||||
$criteria->add(DashboardIndicatorPeer::DAS_UID, $dasUid, criteria::EQUAL);
|
||||
|
||||
$rs = DashboardIndicatorPeer::doSelectRS( $criteria );
|
||||
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
|
||||
$rs = DashboardIndicatorPeer::doSelectRS($criteria);
|
||||
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$dashboardIndicator = array();
|
||||
|
||||
while ($rs->next()) {
|
||||
$row = $rs->getRow();
|
||||
|
||||
//$currentDate = new DateTime (date("Y-m-d"));
|
||||
$measureDate = new DateTime ($vmeasureDate);
|
||||
$compareDate = new DateTime ($vcompareDate);
|
||||
$uid = ($row['DAS_UID_PROCESS'] == '0' ? null: $row['DAS_UID_PROCESS']) ;
|
||||
switch ($row['DAS_IND_TYPE']) {
|
||||
case '1010':
|
||||
$value = current(reset($calculator->peiHistoric($uid, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
|
||||
$oldValue = current(reset($calculator->peiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
|
||||
$row['DAS_IND_VARIATION'] = $value - $oldValue;
|
||||
$row['DAS_IND_OLD_VALUE'] = $oldValue;
|
||||
$row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
|
||||
? round(($value - $oldValue) * 100 / $oldValue)
|
||||
: "--";
|
||||
break;
|
||||
case '1030':
|
||||
$value = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
|
||||
$oldValue = current(reset($calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
|
||||
$row['DAS_IND_VARIATION'] = $value - $oldValue;
|
||||
$row['DAS_IND_OLD_VALUE'] = $oldValue;
|
||||
$row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
|
||||
? round(($value - $oldValue) * 100 / $oldValue)
|
||||
: "--";
|
||||
break;
|
||||
$measureDate = new DateTime($vmeasureDate);
|
||||
$compareDate = new DateTime($vcompareDate);
|
||||
$uid = ($row['DAS_UID_PROCESS'] == '0' ? null : $row['DAS_UID_PROCESS']);
|
||||
switch ($row['DAS_IND_TYPE']) {
|
||||
case '1010':
|
||||
$value = $calculator->peiHistoric($uid, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
|
||||
$value = reset($value);
|
||||
$value = current($value);
|
||||
$oldValue = $calculator->peiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
|
||||
$oldValue = reset($oldValue);
|
||||
$oldValue = current($oldValue);
|
||||
$row['DAS_IND_VARIATION'] = $value - $oldValue;
|
||||
$row['DAS_IND_OLD_VALUE'] = $oldValue;
|
||||
$row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
|
||||
? round(($value - $oldValue) * 100 / $oldValue)
|
||||
: "--";
|
||||
break;
|
||||
case '1030':
|
||||
$value = $calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
|
||||
$value = reset($value);
|
||||
$value = current($value);
|
||||
$oldValue = $calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
|
||||
$oldValue = reset($oldValue);
|
||||
$oldValue = current($oldValue);
|
||||
$row['DAS_IND_VARIATION'] = $value - $oldValue;
|
||||
$row['DAS_IND_OLD_VALUE'] = $oldValue;
|
||||
$row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
|
||||
? round(($value - $oldValue) * 100 / $oldValue)
|
||||
: "--";
|
||||
break;
|
||||
case '1050':
|
||||
$value = $calculator->statusIndicatorGeneral($userUid);
|
||||
$row['OVERDUE'] = 0;
|
||||
@@ -94,41 +101,41 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
|
||||
$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;
|
||||
$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:
|
||||
$arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
|
||||
$value = $arrResult[0]['value'];
|
||||
$row['DAS_IND_VARIATION'] = $row['DAS_IND_GOAL'];
|
||||
break;
|
||||
}
|
||||
$row['DAS_IND_VALUE'] = $value;
|
||||
default:
|
||||
$arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
|
||||
$value = $arrResult[0]['value'];
|
||||
$row['DAS_IND_VARIATION'] = $row['DAS_IND_GOAL'];
|
||||
break;
|
||||
}
|
||||
$row['DAS_IND_VALUE'] = $value;
|
||||
|
||||
$indId = $row['DAS_IND_UID'];
|
||||
$row['DAS_IND_X'] = 0;
|
||||
$row['DAS_IND_Y'] = 0;
|
||||
$row['DAS_IND_WIDTH'] = 0;
|
||||
$row['DAS_IND_HEIGHT'] = 0;
|
||||
$row['DAS_IND_FAVORITE'] = 0;
|
||||
|
||||
foreach ($dashConfig as $dashId=>$oneDash) {
|
||||
if($dashId == $dasUid && is_array($oneDash['dashData'])) {
|
||||
foreach($oneDash['dashData'] as $graphConfig) {
|
||||
if ($graphConfig['indicatorId'] == $indId) {
|
||||
$row['DAS_IND_X'] = $graphConfig['x'];
|
||||
$row['DAS_IND_Y'] = $graphConfig['y'];
|
||||
$row['DAS_IND_WIDTH'] = $graphConfig['width'];
|
||||
$row['DAS_IND_HEIGHT'] = $graphConfig['height'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
$indId = $row['DAS_IND_UID'];
|
||||
$row['DAS_IND_X'] = 0;
|
||||
$row['DAS_IND_Y'] = 0;
|
||||
$row['DAS_IND_WIDTH'] = 0;
|
||||
$row['DAS_IND_HEIGHT'] = 0;
|
||||
$row['DAS_IND_FAVORITE'] = 0;
|
||||
|
||||
$dashboardIndicator[] = $row;
|
||||
foreach ($dashConfig as $dashId => $oneDash) {
|
||||
if ($dashId == $dasUid && is_array($oneDash['dashData'])) {
|
||||
foreach ($oneDash['dashData'] as $graphConfig) {
|
||||
if ($graphConfig['indicatorId'] == $indId) {
|
||||
$row['DAS_IND_X'] = $graphConfig['x'];
|
||||
$row['DAS_IND_Y'] = $graphConfig['y'];
|
||||
$row['DAS_IND_WIDTH'] = $graphConfig['width'];
|
||||
$row['DAS_IND_HEIGHT'] = $graphConfig['height'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$dashboardIndicator[] = $row;
|
||||
}
|
||||
return $dashboardIndicator;
|
||||
} catch (Exception $error) {
|
||||
@@ -137,7 +144,6 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function createOrUpdate($data)
|
||||
{
|
||||
$connection = Propel::getConnection(DashboardIndicatorPeer::DATABASE_NAME);
|
||||
@@ -158,10 +164,10 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
$result = $dashboardIndicator->save();
|
||||
$connection->commit();
|
||||
|
||||
if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && isset($data['USR_UID']) && $data['USR_UID'] != '') {
|
||||
if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && isset($data['USR_UID']) && $data['USR_UID'] != '') {
|
||||
$this->setUser($data['USR_UID']);
|
||||
}
|
||||
G::auditLog($msg, "Dashboard Indicator Name: ".$dashboardIndicator->getDasIndTitle()." Dashboard indicator ID: (".$dashboardIndicator->getDasIndUid() .") ");
|
||||
G::auditLog($msg, "Dashboard Indicator Name: " . $dashboardIndicator->getDasIndTitle() . " Dashboard indicator ID: (" . $dashboardIndicator->getDasIndUid() . ") ");
|
||||
return $dashboardIndicator->getDasIndUid();
|
||||
} else {
|
||||
$message = '';
|
||||
@@ -177,7 +183,7 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
}
|
||||
}
|
||||
|
||||
public function remove($dasIndUid, $userLogged ='')
|
||||
public function remove($dasIndUid, $userLogged = '')
|
||||
{
|
||||
$connection = Propel::getConnection(DashboardIndicatorPeer::DATABASE_NAME);
|
||||
try {
|
||||
@@ -191,10 +197,10 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && $userLogged != '') {
|
||||
$this->setUser($userLogged);
|
||||
}
|
||||
G::auditLog("Delete", "Dashboard Indicator Name: ". $dashboardIndicatorData['DAS_IND_TITLE']." Dashboard Instance ID: (".$dasIndUid.") ");
|
||||
G::auditLog("Delete", "Dashboard Indicator Name: " . $dashboardIndicatorData['DAS_IND_TITLE'] . " Dashboard Instance ID: (" . $dasIndUid . ") ");
|
||||
return $result;
|
||||
} else {
|
||||
throw new Exception('Error trying to delete: The row "' . $dasIndUid. '" does not exist.');
|
||||
throw new Exception('Error trying to delete: The row "' . $dasIndUid . '" does not exist.');
|
||||
}
|
||||
} catch (Exception $error) {
|
||||
$connection->rollback();
|
||||
@@ -202,11 +208,11 @@ class DashboardIndicator extends BaseDashboardIndicator
|
||||
}
|
||||
}
|
||||
|
||||
public function setUser($usrId) {
|
||||
$user = new Users ();
|
||||
public function setUser($usrId)
|
||||
{
|
||||
$user = new Users();
|
||||
$user = $user->loadDetails($usrId);
|
||||
$_SESSION['USER_LOGGED'] = $user['USR_UID'];
|
||||
$_SESSION['USR_FULLNAME'] = $user['USR_FULLNAME'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user