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

Merged in bugfix/PMC-1291 (pull request #7092)

Browse Source 
PMC-1291

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-10-11 16:41:35 +00:00
committed by Julio Cesar Laura Avendaño
parent ade83f3866 b34b064f18
commit f74ee6a600
2 changed files with 7 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -1,5 +1,12 @@
<?php <?php
/**
* casesStartPage_Ajax.php
*
* This page define some functions used in the start new case
*
* @link https://wiki.processmaker.com/3.1/Cases#New_Case
*/
use ProcessMaker\Plugins\PluginRegistry; use ProcessMaker\Plugins\PluginRegistry;
$filter = new InputFilter(); $filter = new InputFilter();
@@ -230,82 +237,6 @@ function startCase ()
} }
} }
function getSimpleDashboardData ()
{
$sUIDUserLogged = $_SESSION['USER_LOGGED'];
$Criteria = new Criteria( 'workflow' );
$Criteria->clearSelectColumns();
$Criteria->addSelectColumn( AppCacheViewPeer::PRO_UID );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_UID );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_NUMBER );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_STATUS );
$Criteria->addSelectColumn( AppCacheViewPeer::DEL_INDEX );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_TITLE );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_PRO_TITLE );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_TAS_TITLE );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_DEL_PREVIOUS_USER );
$Criteria->addSelectColumn( AppCacheViewPeer::DEL_TASK_DUE_DATE );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_UPDATE_DATE );
$Criteria->addSelectColumn( AppCacheViewPeer::DEL_PRIORITY );
$Criteria->addSelectColumn( AppCacheViewPeer::DEL_DELAYED );
$Criteria->addSelectColumn( AppCacheViewPeer::USR_UID );
$Criteria->addSelectColumn( AppCacheViewPeer::APP_THREAD_STATUS );
$Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT"), CRITERIA::IN );
$Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,""), CRITERIA::IN );
$Criteria->add( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
//$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' );
$Criteria->add( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' );
//execute the query
$oDataset = AppCacheViewPeer::doSelectRS( $Criteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
$oProcess = new Process();
$rows = array ();
$processNames = array ();
while ($aRow = $oDataset->getRow()) {
// G::pr($aRow);
if (! isset( $processNames[$aRow['PRO_UID']] )) {
$aProcess = $oProcess->load( $aRow['PRO_UID'] );
$processNames[$aRow['PRO_UID']] = $aProcess['PRO_TITLE'];
}
if ($aRow['USR_UID'] == "") {
$aRow['APP_STATUS'] = "UNASSIGNED";
}
if (((in_array( $aRow['APP_STATUS'], array ("TO_DO","UNASSIGNED"
) )) && ($aRow['APP_THREAD_STATUS'] == "OPEN")) || ($aRow['APP_STATUS'] == "DRAFT")) {
$rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']][$aRow['DEL_DELAYED']][] = $aRow['APP_UID'];
if (! isset( $rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] )) {
$rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] = 0;
}
$rows[$processNames[$aRow['PRO_UID']]][$aRow['APP_STATUS']]['count'] ++;
}
$oDataset->next();
}
//Generate different groups of data for graphs
$rowsResponse = array ();
$i = 0;
foreach ($rows as $processID => $processInfo) {
$i ++;
if ($i <= 10) {
$rowsResponse['caseStatusByProcess'][] = array ('process' => $processID,'inbox' => isset( $processInfo['TO_DO']['count'] ) ? $processInfo['TO_DO']['count'] : 0,'draft' => isset( $processInfo['DRAFT']['count'] ) ? $processInfo['DRAFT']['count'] : 0,'unassigned' => isset( $processInfo['UNASSIGNED']['count'] ) ? $processInfo['UNASSIGNED']['count'] : 0);
}
}
$rowsResponse['caseDelayed'][] = array ('delayed' => 'On Time','total' => 100);
$rowsResponse['caseDelayed'][] = array ('delayed' => 'Delayed','total' => 50
);
print_r( G::json_encode( $rowsResponse ) );
}
function getRegisteredDashboards () function getRegisteredDashboards ()
{ {
$oPluginRegistry = PluginRegistry::loadSingleton(); $oPluginRegistry = PluginRegistry::loadSingleton();

1
workflow/engine/methods/cases/cases_generatePMTable.php
View File

@@ -61,7 +61,6 @@ $Criteria = new Criteria( 'workflow' );
$Criteria->addSelectColumn( ApplicationPeer::APP_UID ); $Criteria->addSelectColumn( ApplicationPeer::APP_UID );
$Criteria->addSelectColumn( ApplicationPeer::APP_DATA ); $Criteria->addSelectColumn( ApplicationPeer::APP_DATA );
// $Criteria->add (AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
$oDataset = ApplicationPeer::doSelectRS( $Criteria ); $oDataset = ApplicationPeer::doSelectRS( $Criteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next(); $oDataset->next();