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

Endpoint: POST /project is ready

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-12-17 11:14:36 -04:00
parent 7f93ff5a43
commit 2b7b59aaf4
6 changed files with 115 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
workflow/engine/classes/model/Process.php
View File

@@ -48,7 +48,7 @@ class Process extends BaseProcess
* @var string
*/
protected $pro_title = '';
public $dir = 'ASC';
public $dir = 'ASC';
public $sort = 'PRO_TITLE';
/**
@@ -152,16 +152,20 @@ class Process extends BaseProcess
* @return void
*/
public function create ($aData)
public function create ($aData, $generateUid = true)
{
if (! isset( $aData['USR_UID'] )) {
throw (new PropelException( 'The process cannot be created. The USR_UID is empty.' ));
}
$con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
try {
do {
$sNewProUid = G::generateUniqueID();
} while ($this->processExists( $sNewProUid ));
if ($generateUid) {
do {
$sNewProUid = G::generateUniqueID();
} while ($this->processExists( $sNewProUid ));
} else {
$sNewProUid = $aData['PRO_UID'];
}
$this->setProUid( $sNewProUid );
$this->setProParent( $sNewProUid );
@@ -389,10 +393,10 @@ class Process extends BaseProcess
}
}
if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") );
} else {
usort( $processes, array($this, "ordProcessDesc") );
if ($this->dir=='ASC') {
usort( $processes, array($this, "ordProcessAsc") );
} else {
usort( $processes, array($this, "ordProcessDesc") );
}
return $processes;
@@ -750,10 +754,10 @@ class Process extends BaseProcess
if ($limit == '') {
$limit = count($aProcesses);
}
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, array($this, "ordProcessDesc") );
if ($this->dir=='ASC') {
usort( $aProcesses, array($this, "ordProcessAsc") );
} else {
usort( $aProcesses, array($this, "ordProcessDesc") );
}
return $aProcesses;
@@ -881,27 +885,27 @@ class Process extends BaseProcess
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return 1;
if ($a[$this->sort] > $b[$this->sort]) {
return 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return - 1;
} else {
return 0;
return - 1;
} else {
return 0;
}
}
public function ordProcessDesc ($a, $b)
public function ordProcessDesc ($a, $b)
{
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return - 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return 1;
} else {
return 0;
}
if (($this->sort) == '') {
$this->sort = 'PRO_TITLE';
}
if ($a[$this->sort] > $b[$this->sort]) {
return - 1;
} elseif ($a[$this->sort] < $b[$this->sort]) {
return 1;
} else {
return 0;
}
}
}

9
workflow/engine/classes/model/Task.php
View File

@@ -356,12 +356,17 @@ class Task extends BaseTask
* @param array $aData with new values
* @return void
*/
public function create($aData)
public function create($aData, $generateUid = true)
{
$con = Propel::getConnection(TaskPeer::DATABASE_NAME);
try {
$sTaskUID = G::generateUniqueID();
if ($generateUid) {
$sTaskUID = G::generateUniqueID();
} else {
$sTaskUID = $aData['TAS_UID'];
}
$con->begin();
$this->setProUid($aData['PRO_UID']);
$this->setTasUid($sTaskUID);