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

Merge remote branch 'upstream/master' into BUG-9395

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-07-09 15:26:26 -04:00
parent abebd247e6 54af0aca9b
commit 7db4587b90
3 changed files with 123 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
workflow/engine/classes/model/Groupwf.php
View File

@@ -322,61 +322,51 @@ class Groupwf extends BaseGroupwf {
$totalCount = 0;
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX);
$criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$criteria->add(ContentPeer::CON_CATEGORY,'GRP_TITLE');
$criteria->add(ContentPeer::CON_LANG,SYS_LANG);
$criteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
if ($search) {
$criteria->add(ContentPeer::CON_VALUE,'%'.$search.'%',Criteria::LIKE);
}
$totalRows = GroupwfPeer::doCount($criteria);
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX);
$criteria->addAsColumn('GRP_TITLE',ContentPeer::CON_VALUE);
$criteria->addSelectColumn(ContentPeer::CON_VALUE, 'COCHALO');
$criteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$criteria->add(ContentPeer::CON_CATEGORY,'GRP_TITLE');
$criteria->add(ContentPeer::CON_LANG,SYS_LANG);
$criteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
if($start != '')
if ($start != '') {
$criteria->setOffset($start);
}
if($limit != '')
if ($limit != '') {
$criteria->setLimit($limit);
}
if ($search) {
$criteria->add(ContentPeer::CON_VALUE,'%'.$search.'%',Criteria::LIKE);
}
$oDataset = GroupwfPeer::doSelectRS ( $criteria );
$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$processes = Array();
$uids=array();
$groups = array();
$aGroups = array();
while( $oDataset->next() ) {
while( $oDataset->next() ) {
$groups[] = $oDataset->getRow();
$uids[] = $groups[sizeof($groups)-1]['GRP_UID'];
}
// for labels of groups
$groupDetails = Array();
$c = new Criteria('workflow');
$c->add ( ContentPeer::CON_LANG, defined('SYS_LANG')?SYS_LANG:'en', Criteria::EQUAL );
$c->add ( ContentPeer::CON_ID, $uids, Criteria::IN );
$dt = ContentPeer::doSelectRS ($c);
$dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while( $dt->next() ) {
$row = $dt->getRow();
$groupDetails[$row['CON_ID']] [$row['CON_CATEGORY']] = $row['CON_VALUE'];
}
// foreach all groups
foreach( $groups as $group ) {
$grpTitle = isset($groupDetails[$group['GRP_UID']]) && isset($groupDetails[$group['GRP_UID']]['GRP_TITLE']) ? $groupDetails[$group['GRP_UID']]['GRP_TITLE'] : '';
if ( trim($grpTitle) == '') { // if not, then load the record to generate content for current language
$grpData = $this->load($group['GRP_UID']);
$grpTitle = $grpData['GRP_TITLE'];
}
//filtering by $processName
if( isset($search) && $search != '' && stripos($grpTitle, $search) === false){
continue;
}
$totalCount++;
$group['GRP_TITLE'] = $grpTitle;
$aGroups[] = $group;
}
return array('rows' => $aGroups, 'totalCount'=>$totalCount);
return array('rows' => $groups, 'totalCount'=>$totalRows);
}
function filterGroup($filter,$start,$limit)

165
workflow/engine/methods/cases/debug_vars.php
View File

@@ -1,97 +1,98 @@
<?php
$request = isset($_POST['request']) ? $_POST['request'] : '';
switch($request){
case 'getRows':
$fieldname = $_POST['fieldname'];
switch ($request) {
case 'getRows':
G::LoadClass('case');
$oApp= new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']);
$fieldname = $_POST['fieldname'];
$aVariables = Array();
for($i=0; $i<count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVariables[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
}
G::LoadClass('case');
$oApp = new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']);
$aVariables = array_merge($aFields['APP_DATA'], $aVariables);
$field = $aVariables[$fieldname];
$response->headers = Array();
$response->columns = Array();
$response->rows = Array();
$sw = true;
$j = 0;
if(is_array($field)){
foreach ($field as $row) {
if($sw){
foreach ($row as $key=>$value) {
$response->headers[] = Array('name'=>$key);
$response->columns[] = Array('header'=>$key, 'width'=>100, 'dataIndex'=>$key);
}
$sw = false;
$aVars = Array();
for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
}
$aVars = array_merge($aFields['APP_DATA'], $aVars);
$tmp = Array();
foreach ($row as $key=>$value) {
$tmp[] = $value;
$field = $aVars[$fieldname];
$response->headers = Array();
$response->columns = Array();
$response->rows = Array();
$sw = true;
$j = 0;
if (is_array($field)) {
foreach ($field as $row) {
if ($sw) {
foreach ($row as $key => $value) {
$response->headers[] = Array('name' => $key);
$response->columns[] = Array('header' => $key, 'width' => 100, 'dataIndex' => $key);
}
$sw = false;
}
$tmp = Array();
foreach ($row as $key => $value) {
$tmp[] = $value;
}
$response->rows[$j++] = $tmp;
}
} else {
if (is_object($field)) {
$response->headers = Array(Array('name' => 'name'), Array('name' => 'value'));
$response->columns = Array(Array('header' => 'Property', 'width' => 100, 'dataIndex' => 'name'),
Array('header' => 'Value', 'width' => 100, 'dataIndex' => 'value'));
foreach ($field as $key => $value) {
$response->rows[] = Array($key, $value);
}
}
}
$response->rows[$j++] = $tmp;
}
} else if( is_object($field) ) {
$response->headers = Array(Array('name'=>'name'), Array('name'=>'value'));
$response->columns = Array(Array('header'=>'Property', 'width'=>100, 'dataIndex'=>'name'), Array('header'=>'Value', 'width'=>100, 'dataIndex'=>'value'));
foreach ($field as $key => $value) {
$response->rows[] = Array($key, $value);
}
}
echo G::json_encode($response);
break;
echo G::json_encode($response);
break;
default:
G::LoadClass('case');
$oApp = new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']);
default:
G::LoadClass('case');
$oApp= new Cases();
$aFields = $oApp->loadCase($_SESSION['APPLICATION']);
$aVariables = Array();
for($i=0; $i<count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVariables[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
}
$aVariables = array_merge($aFields['APP_DATA'], $aVariables);
if( isset($_POST['filter']) && $_POST['filter'] == 'dyn' ){
$sysVars = array_keys(G::getSystemConstants());
$varNames = array_keys($aVariables);
foreach($varNames as $var){
if( in_array($var, $sysVars) ){
unset($aVariables[$var]);
$aVars = Array();
for ($i = 0; $i < count($_SESSION['TRIGGER_DEBUG']['DATA']); $i++) {
$aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value'];
}
}
}
if( isset($_POST['filter']) && $_POST['filter'] == 'sys' ){
$aVariables = G::getSystemConstants();
}
ksort($aVariables);
$return_object->totalCount=1;
foreach ($aVariables as $i=>$var) {
if( is_object($var) ){
$aVariables[$i] = '<object>';
}
if( is_array($var) ){
$aVariables[$i] = '<array>';
}
}
$aVars = array_merge($aFields['APP_DATA'], $aVars);
$return_object->data[0]=$aVariables;
echo G::json_encode($return_object);
break;
}
if (isset($_POST['filter']) && $_POST['filter'] == 'dyn') {
$sysVars = array_keys(G::getSystemConstants());
$varNames = array_keys($aVars);
foreach ($varNames as $var) {
if (in_array($var, $sysVars)) {
unset($aVars[$var]);
}
}
}
if (isset($_POST['filter']) && $_POST['filter'] == 'sys') {
$aVars = G::getSystemConstants();
}
ksort($aVars);
$return_object->totalCount = 1;
foreach ($aVars as $i => $var) {
if (is_array($var) || is_object($var)) {
$aVars[$i] = print_r($var, true);
}
}
$return_object->data[0] = $aVars;
echo G::json_encode($return_object);
break;
}