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

Merged in bugfix/HOR-2433 (pull request #5361)

Browse Source 
HOR-2433
This commit is contained in:
Julio Cesar Laura Avendaño
2017-01-31 12:58:25 +00:00
parent 929d4837a6 46cd8405ef
commit df52cd015e
4 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/methods/cases/caseHistory_Ajax.php
View File

@@ -26,32 +26,38 @@ $actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
if ($actionAjax == 'historyGridList_JXP') { if ($actionAjax == 'historyGridList_JXP') {
G::LoadClass( 'case' ); G::LoadClass('case');
G::LoadClass( "BasePeer" ); G::LoadClass("BasePeer");
global $G_PUBLISH; global $G_PUBLISH;
$c = Cases::getTransferHistoryCriteria( $_SESSION['APPLICATION'] ); $criteria = Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']);
$rs = GulliverBasePeer::doSelectRs($criteria);
$totalCount = $rs->getRecordCount();
$start = $_REQUEST["start"];
$limit = $_REQUEST["limit"];
$criteria->setLimit($limit);
$criteria->setOffset($start);
$rs = GulliverBasePeer::doSelectRs($criteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result = new stdClass(); $result = new stdClass();
$aProcesses = Array (); $aProcesses = Array();
while ($rs->next()) {
$rs = GulliverBasePeer::doSelectRs( $c );
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rs->next();
for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
$result = $rs->getRow(); $result = $rs->getRow();
$result["ID_HISTORY"] = $result["PRO_UID"] . '_' . $result["APP_UID"] . '_' . $result["TAS_UID"]; $result["ID_HISTORY"] = $result["PRO_UID"] . '_' . $result["APP_UID"] . '_' . $result["TAS_UID"];
$aProcesses[] = $result; $aProcesses[] = $result;
$rs->next();
} }
$newDir = '/tmp/test/directory'; $newDir = '/tmp/test/directory';
G::verifyPath( $newDir ); G::verifyPath($newDir);
$r = new stdclass(); $r = new stdclass();
$r->data = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aProcesses); $r->data = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aProcesses);
$r->totalCount = 2; $r->totalCount = $totalCount;
echo G::json_encode( $r ); echo G::json_encode($r);
} }
if ($actionAjax == 'historyGridListChangeLogPanelBody_JXP') { if ($actionAjax == 'historyGridListChangeLogPanelBody_JXP') {

39
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -548,8 +548,8 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
break; break;
case 'uploadDocumentGrid_Ajax': case 'uploadDocumentGrid_Ajax':
G::LoadClass( 'case' ); G::LoadClass('case');
G::LoadClass( "BasePeer" ); G::LoadClass("BasePeer");
global $G_PUBLISH; global $G_PUBLISH;
$arrayToTranslation = array( $arrayToTranslation = array(
@@ -559,35 +559,38 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
); );
$oCase = new Cases(); $oCase = new Cases();
$aProcesses = Array (); $aProcesses = Array();
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$c = $oCase->getAllUploadedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $criteria = $oCase->getAllUploadedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['CURRENT_TASK'], $_SESSION['USER_LOGGED'], $_SESSION['INDEX']);
$_SESSION['CURRENT_TASK'], $_SESSION['USER_LOGGED'], $_SESSION['INDEX']); if ($criteria->getDbName() == 'dbarray') {
$rs = ArrayBasePeer::doSelectRs($criteria);
if ($c->getDbName() == 'dbarray') {
$rs = ArrayBasePeer::doSelectRs( $c );
} else { } else {
$rs = GulliverBasePeer::doSelectRs( $c ); $rs = GulliverBasePeer::doSelectRs($criteria);
} }
$totalCount = $rs->getRecordCount();
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $start = $_REQUEST["start"];
$rs->next(); $limit = $_REQUEST["limit"];
$totalCount = 0; $criteria->setLimit($limit);
$criteria->setOffset($start);
for ($j = 0; $j < $rs->getRecordCount(); $j ++) { if ($criteria->getDbName() == 'dbarray') {
$rs = ArrayBasePeer::doSelectRs($criteria);
} else {
$rs = GulliverBasePeer::doSelectRs($criteria);
}
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rs->next()) {
$result = $rs->getRow(); $result = $rs->getRow();
$result["TYPE"] = (array_key_exists($result["TYPE"], $arrayToTranslation))? $arrayToTranslation[$result["TYPE"]] : $result["TYPE"]; $result["TYPE"] = (array_key_exists($result["TYPE"], $arrayToTranslation)) ? $arrayToTranslation[$result["TYPE"]] : $result["TYPE"];
$aProcesses[] = $result; $aProcesses[] = $result;
$rs->next();
$totalCount ++;
} }
$r = new stdclass(); $r = new stdclass();
$r->data = $aProcesses; $r->data = $aProcesses;
$r->totalCount = $totalCount; $r->totalCount = $totalCount;
echo Bootstrap::json_encode( $r ); echo Bootstrap::json_encode($r);
break; break;
case 'generateDocumentGrid_Ajax': case 'generateDocumentGrid_Ajax':

6
workflow/engine/templates/cases/caseHistory.js
View File

@@ -241,7 +241,7 @@
return actionTranslate; return actionTranslate;
}; };
var pageSize = 15;
processesGrid = new Ext.grid.GridPanel({ processesGrid = new Ext.grid.GridPanel({
region: 'center', region: 'center',
layout: 'fit', layout: 'fit',
@@ -293,7 +293,7 @@
} }
], ],
bbar: new Ext.PagingToolbar({ bbar: new Ext.PagingToolbar({
pageSize: 15, pageSize: pageSize,
store: store, store: store,
displayInfo: true, displayInfo: true,
displayMsg: _('ID_DISPLAY_PROCESSES'), displayMsg: _('ID_DISPLAY_PROCESSES'),
@@ -312,7 +312,7 @@
} }
}); });
processesGrid.store.load({params: {"function":"languagesList"}}); processesGrid.store.load({params: {"function":"languagesList", "start": 0, "limit": pageSize}});
processesGrid.store.on( processesGrid.store.on(
'load', 'load',

5
workflow/engine/templates/cases/casesUploadedDocumentsPage.js
View File

@@ -373,6 +373,7 @@
} }
return actionTranslate; return actionTranslate;
}; };
var pageSize = 25;
var processesGrid = new Ext.grid.GridPanel({ var processesGrid = new Ext.grid.GridPanel({
region: 'center', region: 'center',
layout: 'fit', layout: 'fit',
@@ -487,7 +488,7 @@
} }
], ],
bbar: new Ext.PagingToolbar({ bbar: new Ext.PagingToolbar({
pageSize: 10, pageSize: pageSize,
store: store, store: store,
displayInfo: true, displayInfo: true,
displayMsg: _('ID_DISPLAY_PROCESSES'), displayMsg: _('ID_DISPLAY_PROCESSES'),
@@ -515,7 +516,7 @@
} }
} }
}); });
processesGrid.store.load({params: {"function":"languagesList"}}); processesGrid.store.load({params: {"function": "languagesList", "start": 0, "limit": pageSize}});
processesGrid.store.on( processesGrid.store.on(
'load', 'load',