diff --git a/workflow/engine/classes/model/StepSupervisor.php b/workflow/engine/classes/model/StepSupervisor.php index faa3ec31c..77eb769b3 100755 --- a/workflow/engine/classes/model/StepSupervisor.php +++ b/workflow/engine/classes/model/StepSupervisor.php @@ -187,14 +187,12 @@ class StepSupervisor extends BaseStepSupervisor $oCriteria->add( StepSupervisorPeer::STEP_POSITION, $iPosition, '>' ); $oDataset = StepSupervisorPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDataset->next(); - var_dump( StepSupervisorPeer::doCount( $oCriteria ) ); - while ($aRow = $oDataset->getRow()) { - var_dump( $aRow ); - echo "\n"; + + while ($oDataset->next()) { + $aRow = $oDataset->getRow(); + $this->update( array ('STEP_UID' => $aRow['STEP_UID'],'PRO_UID' => $aRow['PRO_UID'],'STEP_TYPE_OBJ' => $aRow['STEP_TYPE_OBJ'],'STEP_UID_OBJ' => $aRow['STEP_UID_OBJ'],'STEP_POSITION' => $aRow['STEP_POSITION'] - 1 ) ); - $oDataset->next(); } } catch (Exception $oException) { throw $Exception; @@ -243,7 +241,7 @@ class StepSupervisor extends BaseStepSupervisor $oCriteria->add( StepSupervisorPeer::STEP_TYPE_OBJ, 'DYNAFORM' ); $oDataset = StepSupervisorPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - while($oDataset->next()) { + while ($oDataset->next()) { $res[] = $oDataset->getRow(); } return $res; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php index 0ae4d0a06..ba20b1389 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php @@ -855,7 +855,7 @@ class ProcessSupervisor try { $oDynaformSupervidor = \StepSupervisorPeer::retrieveByPK($sPudUID); if (!is_null($oDynaformSupervidor)) { - $oProcessMap = new \processMap(new \DBConnection()); + $oProcessMap = new \processMap(); $oProcessMap->removeSupervisorStep( $oDynaformSupervidor->getStepUid(), $sProcessUID, 'DYNAFORM', $oDynaformSupervidor->getStepUidObj(), $oDynaformSupervidor->getStepPosition() ); } else { throw new \Exception(\G::LoadTranslation("ID_ROW_DOES_NOT_EXIST")); @@ -877,7 +877,7 @@ class ProcessSupervisor try { $oInputDocumentSupervidor = \StepSupervisorPeer::retrieveByPK($sPuiUID); if (!is_null($oInputDocumentSupervidor)) { - $oProcessMap = new \processMap(new \DBConnection()); + $oProcessMap = new \processMap(); $oProcessMap->removeSupervisorStep( $oInputDocumentSupervidor->getStepUid(), $sProcessUID, 'INPUT_DOCUMENT', $oInputDocumentSupervidor->getStepUidObj(), $oInputDocumentSupervidor->getStepPosition() ); } else { throw new \Exception(\G::LoadTranslation("ID_ROW_DOES_NOT_EXIST")); diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessSupervisors.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessSupervisors.php index 9c9672930..cbfa0c796 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessSupervisors.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessSupervisors.php @@ -219,7 +219,7 @@ class ProcessSupervisors extends Api * * @status 201 */ - public function doPostProcessSupervisorDynaform($prjUid, $dyn_uid, $pud_position=null) + public function doPostProcessSupervisorDynaform($prjUid, $dyn_uid, $pud_position = null) { try { $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor(); @@ -242,7 +242,7 @@ class ProcessSupervisors extends Api * * @status 201 */ - public function doPostProcessSupervisorInputDocument($prjUid, $inp_doc_uid, $pui_position=null) + public function doPostProcessSupervisorInputDocument($prjUid, $inp_doc_uid, $pui_position = null) { try { $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();