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

Correcion de parametros en cambio de pos en STEPS

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-02-24 10:26:01 -04:00
parent b25b4b8ac8
commit 3d16b45bcb
2 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/src/BusinessModel/Task.php
View File

@@ -1859,15 +1859,14 @@ class Task
* @var string $pro_uid. Uid for Process * @var string $pro_uid. Uid for Process
* @var string $tas_uid. Uid for Task * @var string $tas_uid. Uid for Task
* @var string $step_uid. Uid for Step * @var string $step_uid. Uid for Step
* @var string $step_uid_rel. Uid Step for relation * @var string $step_pos. Position for Step
* @var string $type. Type relation
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia * @copyright Colosa - Bolivia
* *
* @return void * @return void
*/ */
public function moveSteps($pro_uid, $tas_uid, $step_uid, $step_uid_rel, $type) { public function moveSteps($pro_uid, $tas_uid, $step_uid, $step_pos) {
$pro_uid = $this->validateProUid($pro_uid); $pro_uid = $this->validateProUid($pro_uid);
$tas_uid = $this->validateActUid($tas_uid); $tas_uid = $this->validateActUid($tas_uid);
@@ -1878,34 +1877,21 @@ class Task
foreach ($aSteps as $dataStep) { foreach ($aSteps as $dataStep) {
if ($dataStep['step_uid'] == $step_uid) { if ($dataStep['step_uid'] == $step_uid) {
$prStepPos = (int)$dataStep['step_position']; $prStepPos = (int)$dataStep['step_position'];
} elseif ($dataStep['step_uid'] == $step_uid_rel) {
$seStepPos = (int)$dataStep['step_position'];
} }
} }
$seStepPos = $step_pos;
//Principal Step is up //Principal Step is up
if ($prStepPos < $seStepPos) { if ($prStepPos < $seStepPos) {
$modPos = 'UP'; $modPos = 'UP';
if ($type == 'DOWN') { $newPos = $seStepPos;
$newPos = $seStepPos; $iniPos = $prStepPos+1;
$iniPos = $prStepPos+1; $finPos = $seStepPos;
$finPos = $seStepPos;
} else {
$newPos = $seStepPos-1;
$iniPos = $prStepPos+1;
$finPos = $seStepPos-1;
}
} else { } else {
$modPos = 'DOWN'; $modPos = 'DOWN';
if ($type == 'UP') { $newPos = $seStepPos;
$newPos = $seStepPos; $iniPos = $seStepPos;
$iniPos = $seStepPos; $finPos = $prStepPos-1;
$finPos = $prStepPos-1;
} else {
$newPos = $seStepPos-1;
$iniPos = $seStepPos-1;
$finPos = $prStepPos-1;
}
} }
$range = range($iniPos, $finPos); $range = range($iniPos, $finPos);

9
workflow/engine/src/Services/Api/ProcessMaker/Project/Activity.php
View File

@@ -151,8 +151,7 @@ class Activity extends Api
* @param string $prj_uid {@min 1} {@max 32} * @param string $prj_uid {@min 1} {@max 32}
* @param string $act_uid {@min 1} {@max 32} * @param string $act_uid {@min 1} {@max 32}
* @param string $step_uid {@min 1} {@max 32} * @param string $step_uid {@min 1} {@max 32}
* @param string $step_uid_rel {@min 1} {@max 32} * @param string $step_pos
* @param string $type_change {@choice UP,DOWN}
* *
* @access public * @access public
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -160,13 +159,13 @@ class Activity extends Api
* *
* @return void * @return void
* *
* @url PUT /:prj_uid/activity/:act_uid/step-move/:step_uid/:step_uid_rel/:type_change * @url PUT /:prj_uid/activity/:act_uid/step-move/:step_uid/:step_pos
*/ */
public function doPutStepsMoves ($prj_uid, $act_uid, $step_uid, $step_uid_rel, $type_change) public function doPutStepsMoves ($prj_uid, $act_uid, $step_uid, $step_pos)
{ {
try { try {
$task = new \BusinessModel\Task(); $task = new \BusinessModel\Task();
$task->moveSteps($prj_uid, $act_uid, $step_uid, $step_uid_rel, $type_change); $task->moveSteps($prj_uid, $act_uid, $step_uid, $step_pos);
} catch (\Exception $e) { } catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
} }