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

CODE STYLE some classes in classes/model

Browse Source
This commit is contained in:
Fernando Ontiveros
2012-10-20 16:01:28 -04:00
committed by root
parent 35de8ac088
commit ad53bd8a50
12 changed files with 984 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -775,5 +775,4 @@ class Task extends BaseTask
return $event_uid;
}
}
//Task

5
workflow/engine/classes/model/TaskPeer.php
View File

@@ -42,6 +42,7 @@
*
* @package workflow.engine.classes.model
*/
class TaskPeer extends BaseTaskPeer {
class TaskPeer extends BaseTaskPeer
{
}
} // TaskPeer

1
workflow/engine/classes/model/TaskUser.php
View File

@@ -194,5 +194,4 @@ class TaskUser extends BaseTaskUser
return $result;
}
}
// TaskUser

5
workflow/engine/classes/model/TaskUserPeer.php
View File

@@ -42,6 +42,7 @@
*
* @package workflow.engine.classes.model
*/
class TaskUserPeer extends BaseTaskUserPeer {
class TaskUserPeer extends BaseTaskUserPeer
{
}
} // TaskUserPeer

28
workflow/engine/classes/model/Translation.php
View File

@@ -86,9 +86,19 @@ class Translation extends BaseTranslation
}
// for date filter
if (($dateFrom) && ($dateTo)) {
$oCriteria->add( $oCriteria->getNewCriterion( TranslationPeer::TRN_UPDATE_DATE, "$dateFrom", Criteria::GREATER_EQUAL ) //LESS_EQUAL
->addAnd( $oCriteria->getNewCriterion( TranslationPeer::TRN_UPDATE_DATE, "$dateTo", Criteria::LESS_EQUAL ) //GREATER_EQUAL
) );
$oCriteria->add(
$oCriteria->getNewCriterion(
TranslationPeer::TRN_UPDATE_DATE,
"$dateFrom",
Criteria::GREATER_EQUAL
)->addAnd(
$oCriteria->getNewCriterion(
TranslationPeer::TRN_UPDATE_DATE,
"$dateTo",
Criteria::LESS_EQUAL
)
)
);
}
// end filter
$c = clone $oCriteria;
@@ -125,7 +135,6 @@ class Translation extends BaseTranslation
* @author Fernando Ontiveros <fernando@colosa.com>
* @parameter $languageId (es|en|...).
*/
public function generateFileTranslation ($languageId = '')
{
$translation = Array ();
@@ -357,13 +366,15 @@ class Translation extends BaseTranslation
} elseif ($country == '.') {
//this a trsnlation file with a language international, no country name was set
$LOCALE = $language['LAN_ID'];
} else
} else {
throw new Exception( 'PO File Error: "' . $file . '" has a invalid country definition!' );
} else
}
} else {
throw new Exception( 'PO File Error: "' . $file . '" has a invalid country definition!' );
} else
}
} else {
throw new Exception( 'PO File Error: "' . $file . '" has a invalid language definition!' );
}
$countItems = 0;
try {
while ($rowTranslation = $POFile->getTranslation()) {
@@ -451,5 +462,4 @@ class Translation extends BaseTranslation
return false;
}
}
// Translation

5
workflow/engine/classes/model/TranslationPeer.php
View File

@@ -42,6 +42,7 @@
*
* @package workflow.engine.classes.model
*/
class TranslationPeer extends BaseTranslationPeer {
class TranslationPeer extends BaseTranslationPeer
{
}
} // TranslationPeer

115
workflow/engine/classes/model/Triggers.php
View File

@@ -39,12 +39,14 @@ require_once 'classes/model/om/BaseTriggers.php';
*
* @package workflow.engine.classes.model
*/
class Triggers extends BaseTriggers {
class Triggers extends BaseTriggers
{
/**
* This value goes in the content table
* @var string
*/
protected $tri_title = '';
/**
* Get the tri_title column value.
* @return string
@@ -58,6 +60,7 @@ class Triggers extends BaseTriggers {
$this->tri_title = Content::load ( 'TRI_TITLE', '', $this->getTriUid(), $lang );
return $this->tri_title;
}
/**
* Set the tri_title column value.
*
@@ -73,12 +76,12 @@ class Triggers extends BaseTriggers {
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
if ($this->tri_title !== $v || $v==="") {
$this->tri_title = $v;
$res = Content::addContent( 'TRI_TITLE', '', $this->getTriUid(), $lang, $this->tri_title );
return $res;
}
return 0;
}
/**
* This value goes in the content table
* @var string
@@ -88,6 +91,7 @@ class Triggers extends BaseTriggers {
* Get the tri_description column value.
* @return string
*/
public function getTriDescription()
{
if ($this->getTriUid() == "") {
@@ -97,6 +101,7 @@ class Triggers extends BaseTriggers {
$this->tri_description = Content::load ( 'TRI_DESCRIPTION', '', $this->getTriUid(), $lang );
return $this->tri_description;
}
/**
* Set the tri_description column value.
*
@@ -112,124 +117,118 @@ class Triggers extends BaseTriggers {
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
if ($this->tri_description !== $v || $v==="") {
$this->tri_description = $v;
$res = Content::addContent( 'TRI_DESCRIPTION', '', $this->getTriUid(), $lang, $this->tri_description );
return $res;
}
return 0;
}
public function load($TriUid)
{
try {
$oRow = TriggersPeer::retrieveByPK( $TriUid );
if (!is_null($oRow))
{
if (!is_null($oRow)) {
$aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
$this->setNew(false);
$this->setTriTitle($aFields['TRI_TITLE']=$this->getTriTitle());
$this->setTriDescription($aFields['TRI_DESCRIPTION']=$this->getTriDescription());
return $aFields;
}
else {
} else {
throw( new Exception( "The row '$TriUid' in table TRIGGERS doesn't exist!" ));
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
public function create($aData)
{
$con = Propel::getConnection(TriggersPeer::DATABASE_NAME);
try
{
try {
$con->begin();
if ( isset ( $aData['TRI_UID'] ) && $aData['TRI_UID']== '' )
if (isset ( $aData['TRI_UID'] ) && $aData['TRI_UID']== '') {
unset ( $aData['TRI_UID'] );
if ( !isset ( $aData['TRI_UID'] ) )
}
if ( !isset ( $aData['TRI_UID'] ) ) {
$this->setTriUid(G::generateUniqueID());
else
} else {
$this->setTriUid($aData['TRI_UID'] );
}
$this->setProUid($aData['PRO_UID']);
$this->setTriType("SCRIPT");
if ( !isset ( $aData['TRI_WEBBOT'] ) )
if (!isset ( $aData['TRI_WEBBOT'] )) {
$this->setTriWebbot("");
else
} else {
$this->setTriWebbot( $aData['TRI_WEBBOT'] );
}
if($this->validate())
{
if ( !isset ( $aData['TRI_TITLE'] ) )
if ($this->validate()) {
if (!isset ( $aData['TRI_TITLE'] )) {
$this->setTriTitle("");
else
} else {
$this->setTriTitle( $aData['TRI_TITLE'] );
if ( !isset ( $aData['TRI_DESCRIPTION'] ) )
}
if (!isset ( $aData['TRI_DESCRIPTION'] )) {
$this->setTriDescription("");
else
} else {
$this->setTriDescription( $aData['TRI_DESCRIPTION'] );
if ( !isset ( $aData['TRI_PARAM'] ) )
}
if (!isset ( $aData['TRI_PARAM'] )) {
$this->setTriParam("");
else
} else {
$this->setTriParam( $aData['TRI_PARAM'] );
}
$result=$this->save();
$con->commit();
return $result;
}
else
{
} else {
$con->rollback();
throw(new Exception("Failed Validation in class ".get_class($this)."."));
}
}
catch(Exception $e)
{
} catch (Exception $e) {
$con->rollback();
throw($e);
}
}
public function update($fields)
{
$con = Propel::getConnection(TriggersPeer::DATABASE_NAME);
try
{
try {
$con->begin();
$this->load($fields['TRI_UID']);
$this->fromArray($fields,BasePeer::TYPE_FIELDNAME);
if($this->validate())
{
if ($this->validate()) {
$contentResult=0;
if (array_key_exists("TRI_TITLE", $fields)) $contentResult+=$this->setTriTitle($fields["TRI_TITLE"]);
if (array_key_exists("TRI_DESCRIPTION", $fields)) $contentResult+=$this->setTriDescription($fields["TRI_DESCRIPTION"]);
if (array_key_exists("TRI_TITLE", $fields)) {
$contentResult+=$this->setTriTitle($fields["TRI_TITLE"]);
}
if (array_key_exists("TRI_DESCRIPTION", $fields)) {
$contentResult+=$this->setTriDescription($fields["TRI_DESCRIPTION"]);
}
$result=$this->save();
$result=($result==0)?($contentResult>0?1:0):$result;
$con->commit();
return $result;
}
else
{
} else {
$con->rollback();
$validationE=new Exception("Failed Validation in class ".get_class($this).".");
$validationE->aValidationFailures = $this->getValidationFailures();
throw($validationE);
}
}
catch(Exception $e)
{
} catch (Exception $e) {
$con->rollback();
throw($e);
}
}
public function remove($TriUid)
{
$con = Propel::getConnection(TriggersPeer::DATABASE_NAME);
try
{
try {
$result = false;
$con->begin();
$oTri = TriggersPeer::retrieveByPK( $TriUid );
@@ -240,9 +239,7 @@ class Triggers extends BaseTriggers {
$con->commit();
}
return $result;
}
catch(Exception $e)
{
} catch (Exception $e) {
$con->rollback();
throw($e);
}
@@ -253,24 +250,23 @@ class Triggers extends BaseTriggers {
*
* @param string $sUid the uid of the Prolication
*/
function TriggerExists ( $sUid ) {
public function TriggerExists ($sUid)
{
$con = Propel::getConnection(TriggersPeer::DATABASE_NAME);
try {
$oObj = TriggersPeer::retrieveByPk( $sUid );
if (is_object($oObj) && get_class ($oObj) == 'Triggers' ) {
return true;
}
else {
} else {
return false;
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw($oError);
}
}
function verifyDependecies($TRI_UID){
public function verifyDependecies($TRI_UID)
{
require_once "classes/model/Event.php";
require_once "classes/model/StepTrigger.php";
@@ -283,7 +279,6 @@ class Triggers extends BaseTriggers {
$oCriteria->add(EventPeer::EVN_ACTION, '', Criteria::NOT_EQUAL);
$oCriteria->add(EventPeer::TRI_UID, $TRI_UID);
$oDataset = EventPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -327,9 +322,7 @@ class Triggers extends BaseTriggers {
array_push($oResult->dependencies['Tasks'], Array('UID'=>($oTask->getTasUid()), 'DESCRIPTION'=>($oTask->getTasTitle())));
}
}
return $oResult;
}
}
} // Trigger
?>

5
workflow/engine/classes/model/TriggersPeer.php
View File

@@ -42,6 +42,7 @@
*
* @package workflow.engine.classes.model
*/
class TriggersPeer extends BaseTriggersPeer {
class TriggersPeer extends BaseTriggersPeer
{
}
} // TriggersPeer

13
workflow/engine/classes/model/Users.php
View File

@@ -44,7 +44,7 @@ require_once 'classes/model/IsoLocation.php';
class Users extends BaseUsers
{
function create ($aData)
public function create ($aData)
{
$con = Propel::getConnection( UsersPeer::DATABASE_NAME );
try {
@@ -175,7 +175,7 @@ class Users extends BaseUsers
}
}
function remove ($UsrUid)
public function remove ($UsrUid)
{
$con = Propel::getConnection( UsersPeer::DATABASE_NAME );
try {
@@ -190,7 +190,7 @@ class Users extends BaseUsers
}
}
function loadByUsername ($sUsername)
public function loadByUsername ($sUsername)
{
$c = new Criteria( 'workflow' );
$del = DBAdapter::getStringDelimiter();
@@ -204,7 +204,7 @@ class Users extends BaseUsers
return $c;
}
function loadByUsernameInArray ($sUsername)
public function loadByUsernameInArray ($sUsername)
{
$c = $this->loadByUsername( $sUsername );
$rs = UsersPeer::doSelectRS( $c );
@@ -296,7 +296,7 @@ class Users extends BaseUsers
}
}
function getAvailableUsersCriteria ($sGroupUID = '')
public function getAvailableUsersCriteria ($sGroupUID = '')
{
try {
@@ -317,7 +317,7 @@ class Users extends BaseUsers
*
* @return array of all active users
*/
function getAll ($start = null, $limit = null, $search = null)
public function getAll ($start = null, $limit = null, $search = null)
{
$totalCount = 0;
$criteria = new Criteria( 'workflow' );
@@ -380,5 +380,4 @@ class Users extends BaseUsers
return $aFields;
}
}
// Users

5
workflow/engine/classes/model/UsersPeer.php
View File

@@ -42,6 +42,7 @@
*
* @package workflow.engine.classes.model
*/
class UsersPeer extends BaseUsersPeer {
class UsersPeer extends BaseUsersPeer
{
}
} // UsersPeer

5
workflow/engine/classes/model/UsersProperties.php
View File

@@ -22,12 +22,12 @@ class UsersProperties extends BaseUsersProperties
public $usrID = '';
public $lang = 'en';
function __construct ()
public function __construct ()
{
$this->lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
}
function UserPropertyExists ($sUserUID)
public function UserPropertyExists ($sUserUID)
{
$oUserProperty = UsersPropertiesPeer::retrieveByPk( $sUserUID );
if (! is_null( $oUserProperty ) && is_object( $oUserProperty ) && get_class( $oUserProperty ) == 'UsersProperties') {
@@ -436,5 +436,4 @@ class UsersProperties extends BaseUsersProperties
return $baseUrl . $url;
}
}
// UsersProperties

5
workflow/engine/classes/model/UsersPropertiesPeer.php
View File

@@ -22,6 +22,7 @@
*
* @package workflow.engine.classes.model
*/
class UsersPropertiesPeer extends BaseUsersPropertiesPeer {
class UsersPropertiesPeer extends BaseUsersPropertiesPeer
{
}
} // UsersPropertiesPeer