fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/3.0.1.7' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
jennydmz
2015-12-18 18:04:37 -04:00
parent 9956974498 216e7a4c0d
commit f255c4a4aa
6 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/bin/cron_single.php
View File

@@ -84,6 +84,7 @@ try {
G::LoadSystem('dvEditor');
G::LoadSystem('table');
G::LoadSystem('pagedTable');
G::LoadSystem('httpProxyController');
G::LoadClass('system');
require_once('propel/Propel.php');
@@ -150,6 +151,7 @@ try {
G::LoadClass('processes');
G::LoadClass('derivation');
G::LoadClass('dates'); //Load Criteria
G::LoadClass('spool');
//Set variables
/*----------------------------------********---------------------------------*/

6
workflow/engine/classes/class.wsBase.php
View File

@@ -2391,7 +2391,11 @@ class wsBase
if (isset($val['NEXT_TASK']['USER_ASSIGNED'])) {
$usrasgdUid = $val['NEXT_TASK']['USER_ASSIGNED']['USR_UID'];
$usrasgdUserName = '(' . $val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'] . ')';
if(isset($val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'])){
$usrasgdUserName = '(' . $val['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'] . ')';
}else{
$usrasgdUserName = '';
}
}
$nodeNext['TAS_UID'] = $val['NEXT_TASK']['TAS_UID'];

3
workflow/engine/classes/model/AppCacheView.php
View File

@@ -79,6 +79,9 @@ class AppCacheView extends BaseAppCacheView
default:
return $type;
}
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
$criteria->addJoin(AppCacheViewPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
return AppCacheViewPeer::doCount($criteria, $distinct);
}

15
workflow/engine/classes/model/Process.php
View File

@@ -1033,5 +1033,20 @@ class Process extends BaseProcess
return 1;
}
}
public function getAllConfiguredCurrencies()
{
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UNIT_COST);
$oCriteria->setDistinct();
$oDataSet = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
$oDataSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$aProc = Array ();
while ($oDataSet->next()) {
$row = $oDataSet->getRow();
$aProc[$row['PRO_UNIT_COST']] = $row['PRO_UNIT_COST'];
}
return $aProc;
}
}

28
workflow/engine/controllers/strategicDashboard.php
View File

@@ -30,11 +30,7 @@ class StrategicDashboard extends Controller
$this->usrId = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
$user = new Users();
$user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
$this->usrUnitCost = '$';
if (isset($user['USR_UNIT_COST'])) {
$this->usrUnitCost = $user['USR_UNIT_COST'];
}
$this->usrUnitCost = $this->currencySymbolToShow($user);
$this->urlProxy = '/api/1.0/' . SYS_SYS . '/';
//change
$clientId = 'x-pm-local-client';
@@ -67,6 +63,28 @@ class StrategicDashboard extends Controller
$this->clientToken["client_secret"] = $client['CLIENT_SECRET'];
}
private function currencySymbolToShow($user)
{
$result = '$';
if (isset($user['USR_UNIT_COST']) && !empty($user['USR_UNIT_COST'])) {
$result = $user['USR_UNIT_COST'];
}
else {
$processModel = new Process();
$processList = $processModel->getAllConfiguredCurrencies();
$defaultProcessCurrency = '';
foreach ($processList as $key => $value) {
if (!empty($value)) {
$defaultProcessCurrency = $value;
}
}
if (!empty($defaultProcessCurrency)) {
$result = $defaultProcessCurrency;
}
}
return $result;
}
private function getClientCredentials($clientId)
{
$oauthQuery = new ProcessMaker\Services\OAuth2\PmPdo($this->getDsn());

3
workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php
View File

@@ -76,6 +76,9 @@ class XmlExporter extends Exporter
$recordData = array_change_key_case($recordData, CASE_LOWER);
foreach ($recordData as $key => $value) {
if(is_object($value)){
$value = serialize($value);
}
$columnNode = $this->dom->createElement($key);
$columnNode->appendChild($this->getTextNode($value));
$recordNode->appendChild($columnNode);