From d7962637a8df1bf0c13820cf894479e9d39b92e5 Mon Sep 17 00:00:00 2001 From: ralph Date: Thu, 22 Nov 2012 16:33:58 -0400 Subject: [PATCH] Commenting DB interface requiere files from processMap class, already in Autoloader. --- workflow/engine/classes/class.processMap.php | 99 +++++++++---------- .../engine/classes/model/CaseScheduler.php | 6 +- workflow/engine/classes/model/Event.php | 10 +- workflow/engine/classes/model/Gateway.php | 2 +- .../classes/model/LogCasesScheduler.php | 2 +- workflow/engine/classes/model/SubProcess.php | 2 +- .../classes/model/SwimlanesElements.php | 4 +- .../classes/model/SwimlanesElementsPeer.php | 4 +- .../methods/processes/processes_Ajax.php | 3 +- .../xmlform/dynaforms/fields_Options.xml | 1 + 10 files changed, 67 insertions(+), 66 deletions(-) diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 9e0b12506..35dd9ba6d 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -28,41 +28,41 @@ * * @package workflow.engine.ProcessMaker */ -G::LoadThirdParty( 'pear/json', 'class.json' ); -G::LoadClass( 'groups' ); -G::LoadClass( 'tasks' ); +//G::LoadThirdParty( 'pear/json', 'class.json' ); +//G::LoadClass( 'groups' ); +//G::LoadClass( 'tasks' ); G::LoadClass( 'xmlfield_InputPM' ); -G::LoadClass( 'calendar' ); +//G::LoadClass( 'calendar' ); -require_once 'classes/model/AppDelegation.php'; -require_once 'classes/model/CaseTracker.php'; -require_once 'classes/model/CaseTrackerObject.php'; -require_once 'classes/model/Configuration.php'; -require_once 'classes/model/Content.php'; -require_once 'classes/model/DbSource.php'; -require_once 'classes/model/Dynaform.php'; -require_once 'classes/model/Event.php'; -require_once 'classes/model/Groupwf.php'; -require_once 'classes/model/InputDocument.php'; -require_once 'classes/model/ObjectPermission.php'; -require_once 'classes/model/OutputDocument.php'; -require_once 'classes/model/Process.php'; -require_once 'classes/model/ProcessUser.php'; -require_once 'classes/model/ReportTable.php'; -require_once 'classes/model/Route.php'; -require_once 'classes/model/CaseScheduler.php'; -require_once 'classes/model/LogCasesScheduler.php'; -require_once 'classes/model/Step.php'; -require_once 'classes/model/StepSupervisor.php'; -require_once 'classes/model/StepTrigger.php'; -require_once 'classes/model/SubProcess.php'; -require_once 'classes/model/SwimlanesElements.php'; -require_once 'classes/model/Task.php'; -require_once 'classes/model/TaskUser.php'; -require_once 'classes/model/Triggers.php'; -require_once 'classes/model/Users.php'; -require_once 'classes/model/Gateway.php'; -require_once 'classes/model/om/BaseUsers.php'; +//require_once 'classes/model/AppDelegation.php'; +//require_once 'classes/model/CaseTracker.php'; +//require_once 'classes/model/CaseTrackerObject.php'; +//require_once 'classes/model/Configuration.php'; +//require_once 'classes/model/Content.php'; +//require_once 'classes/model/DbSource.php'; +//require_once 'classes/model/Dynaform.php'; +//require_once 'classes/model/Event.php'; +//require_once 'classes/model/Groupwf.php'; +//require_once 'classes/model/InputDocument.php'; +//require_once 'classes/model/ObjectPermission.php'; +//require_once 'classes/model/OutputDocument.php'; +//require_once 'classes/model/Process.php'; +//require_once 'classes/model/ProcessUser.php'; +//require_once 'classes/model/ReportTable.php'; +//require_once 'classes/model/Route.php'; +//require_once 'classes/model/CaseScheduler.php'; +//require_once 'classes/model/LogCasesScheduler.php'; +//require_once 'classes/model/Step.php'; +//require_once 'classes/model/StepSupervisor.php'; +//require_once 'classes/model/StepTrigger.php'; +//require_once 'classes/model/SubProcess.php'; +//require_once 'classes/model/SwimlanesElements.php'; +//require_once 'classes/model/Task.php'; +//require_once 'classes/model/TaskUser.php'; +//require_once 'classes/model/Triggers.php'; +//require_once 'classes/model/Users.php'; +//require_once 'classes/model/Gateway.php'; +//require_once 'classes/model/om/BaseUsers.php'; /** * processMap - Process Map class @@ -418,8 +418,8 @@ class processMap $oPM->taskOptions[] = $taskOption; } - $oJSON = new Services_JSON(); - return $oJSON->encode( $oPM ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oPM);//$oJSON->encode( $oPM ); } catch (Exception $oError) { throw ($oError); } @@ -1426,9 +1426,8 @@ class processMap $oNewTask->statusIcons = array (); $oNewTask->statusIcons[] = array ('label' => '','icon' => '/images/alert.gif','message' => '','url' => '' ); - $oJSON = new Services_JSON(); - - return $oJSON->encode( $oNewTask ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oNewTask);//$oJSON->encode( $oNewTask ); } catch (Exception $oError) { throw ($oError); } @@ -1669,8 +1668,8 @@ class processMap $oGateway->update( $aData ); } $oEncode->uid = $sGat_uid; - $oJSON = new Services_JSON(); - return $oJSON->encode( $oEncode ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oEncode);//$oJSON->encode( $oEncode ); } catch (Exception $oError) { throw ($oError); } @@ -1700,8 +1699,8 @@ class processMap ) ); break; } - $oJSON = new Services_JSON(); - return $oJSON->encode( $oNewGuide ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oNewGuide);//$oJSON->encode( $oNewGuide ); } catch (Exception $oError) { throw ($oError); } @@ -1791,8 +1790,8 @@ class processMap $oSL = new SwimlanesElements(); $oNewText->uid = $oSL->create( array ('PRO_UID' => $sProcessUID,'SWI_TYPE' => 'TEXT','SWI_TEXT' => $sLabel,'SWI_X' => $iX,'SWI_Y' => $iY,'SWI_NEXT_UID' => $sNext_uid ) ); - $oJSON = new Services_JSON(); - return $oJSON->encode( $oNewText ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oNewText);//$oJSON->encode( $oNewText ); } catch (Exception $oError) { throw ($oError); } @@ -4660,14 +4659,14 @@ class processMap $oNewTask->label = 'Sub-Process'; //G::LoadTranslation('ID_TASK'); $oNewTask->uid = $oTask->create( array ('PRO_UID' => $sProcessUID,'TAS_TITLE' => $oNewTask->label,'TAS_POSX' => $iX,'TAS_POSY' => $iY,'TAS_TYPE' => 'SUBPROCESS' ) ); - $oJSON = new Services_JSON(); + //$oJSON = new Services_JSON(); $oOP = new SubProcess(); $aData = array ('SP_UID' => G::generateUniqueID(),'PRO_UID' => 0,'TAS_UID' => 0,'PRO_PARENT' => $sProcessUID,'TAS_PARENT' => $oNewTask->uid,'SP_TYPE' => 'SIMPLE','SP_SYNCHRONOUS' => 0,'SP_SYNCHRONOUS_TYPE' => 'ALL','SP_SYNCHRONOUS_WAIT' => 0,'SP_VARIABLES_OUT' => '','SP_VARIABLES_IN' => '','SP_GRID_IN' => '' ); $oOP->create( $aData ); - return $oJSON->encode( $oNewTask ); + return Bootstrap::json_endoce($oNewTask);//$oJSON->encode( $oNewTask ); } catch (Exception $oError) { throw ($oError); } @@ -5081,8 +5080,8 @@ class processMap ); $oDataset->next(); } - $oJSON = new Services_JSON(); - return $oJSON->encode( $aProcesses ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($aProcesses);//$oJSON->encode( $aProcesses ); } /* @@ -7396,8 +7395,8 @@ class processMap $oEvent->update( $aData ); } $oEncode->uid = $sEvn_uid; - $oJSON = new Services_JSON(); - return $oJSON->encode( $oEncode ); + //$oJSON = new Services_JSON(); + return Bootstrap::json_encode($oEncode);//$oJSON->encode( $oEncode ); } public function saveExtEvents ($oData) diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index 5f60e661d..1e0e09bf0 100755 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -5,10 +5,10 @@ * @package workflow.engine.classes.model */ -require_once 'classes/model/om/BaseCaseScheduler.php'; +//require_once 'classes/model/om/BaseCaseScheduler.php'; -require_once 'classes/model/Process.php'; -require_once 'classes/model/Task.php'; +//require_once 'classes/model/Process.php'; +//require_once 'classes/model/Task.php'; /** * Skeleton subclass for representing a row from the 'CASE_SCHEDULER' table. diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index 6336c1a7b..5538a72a9 100755 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -5,8 +5,8 @@ * @package workflow.engine.classes.model */ -require_once 'classes/model/Content.php'; -require_once 'classes/model/om/BaseEvent.php'; +//require_once 'classes/model/Content.php'; +//require_once 'classes/model/om/BaseEvent.php'; /** * Skeleton subclass for representing a row from the 'EVENT' table. @@ -18,9 +18,9 @@ require_once 'classes/model/om/BaseEvent.php'; * long as it does not already exist in the output directory. */ -require_once 'classes/model/AppDelegation.php'; -require_once 'classes/model/AppEvent.php'; -require_once 'classes/model/Triggers.php'; +//require_once 'classes/model/AppDelegation.php'; +//require_once 'classes/model/AppEvent.php'; +//require_once 'classes/model/Triggers.php'; /** * diff --git a/workflow/engine/classes/model/Gateway.php b/workflow/engine/classes/model/Gateway.php index 9de80617a..9715e6f5a 100755 --- a/workflow/engine/classes/model/Gateway.php +++ b/workflow/engine/classes/model/Gateway.php @@ -5,7 +5,7 @@ * @package workflow.engine.classes.model */ -require_once 'classes/model/om/BaseGateway.php'; +//require_once 'classes/model/om/BaseGateway.php'; /** * Skeleton subclass for representing a row from the 'GATEWAY' table. diff --git a/workflow/engine/classes/model/LogCasesScheduler.php b/workflow/engine/classes/model/LogCasesScheduler.php index a4a8c9cfd..1960b3084 100755 --- a/workflow/engine/classes/model/LogCasesScheduler.php +++ b/workflow/engine/classes/model/LogCasesScheduler.php @@ -4,7 +4,7 @@ * @package workflow.engine.classes.model */ -require_once 'classes/model/om/BaseLogCasesScheduler.php'; +//require_once 'classes/model/om/BaseLogCasesScheduler.php'; /** diff --git a/workflow/engine/classes/model/SubProcess.php b/workflow/engine/classes/model/SubProcess.php index 1115d1c7f..2e7361d9c 100755 --- a/workflow/engine/classes/model/SubProcess.php +++ b/workflow/engine/classes/model/SubProcess.php @@ -5,7 +5,7 @@ * @package workflow.engine.classes.model */ -require_once 'classes/model/om/BaseSubProcess.php'; +//require_once 'classes/model/om/BaseSubProcess.php'; /** * Skeleton subclass for representing a row from the 'SUB_PROCESS' table. diff --git a/workflow/engine/classes/model/SwimlanesElements.php b/workflow/engine/classes/model/SwimlanesElements.php index 10afdedc7..3da57aaa5 100755 --- a/workflow/engine/classes/model/SwimlanesElements.php +++ b/workflow/engine/classes/model/SwimlanesElements.php @@ -25,8 +25,8 @@ * */ -require_once 'classes/model/om/BaseSwimlanesElements.php'; -require_once 'classes/model/Content.php'; +//require_once 'classes/model/om/BaseSwimlanesElements.php'; +//require_once 'classes/model/Content.php'; /** * Skeleton subclass for representing a row from the 'SWIMLANES_ELEMENTS' table. diff --git a/workflow/engine/classes/model/SwimlanesElementsPeer.php b/workflow/engine/classes/model/SwimlanesElementsPeer.php index f49d23f8d..fa40adcae 100755 --- a/workflow/engine/classes/model/SwimlanesElementsPeer.php +++ b/workflow/engine/classes/model/SwimlanesElementsPeer.php @@ -25,10 +25,10 @@ */ // include base peer class - require_once 'classes/model/om/BaseSwimlanesElementsPeer.php'; + //require_once 'classes/model/om/BaseSwimlanesElementsPeer.php'; // include object class - include_once 'classes/model/SwimlanesElements.php'; + //include_once 'classes/model/SwimlanesElements.php'; /** diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index ea29acac2..1eb3a52e7 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -42,9 +42,10 @@ try { $oData = G::json_decode( stripslashes( $_REQUEST['data'] ) ); //$oData = $oJSON->decode( stripslashes( $_REQUEST['data'] ) ); $sOutput = ''; + $sTask = ''; } - G::LoadClass( 'processMap' ); + //G::LoadClass( 'processMap' ); $oProcessMap = new processMap( new DBConnection() ); switch ($_REQUEST['action']) { diff --git a/workflow/engine/xmlform/dynaforms/fields_Options.xml b/workflow/engine/xmlform/dynaforms/fields_Options.xml index 0e97b4c5f..d0486418e 100755 --- a/workflow/engine/xmlform/dynaforms/fields_Options.xml +++ b/workflow/engine/xmlform/dynaforms/fields_Options.xml @@ -18,6 +18,7 @@ popupWindow('@G::LoadTranslation(ID_EDIT_FIELD)', '@G::encryptlink(@#fields_Edit)?A=@%URL&XMLNODE_NAME='+ uid , 500, 650, null,false,true); } function fieldsSave( form ) { + alert("save"); if (pme_validating) { validatingForm=form; setTimeout('fieldsSave(validatingForm);',100);