fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:colosa/processmaker

Browse Source 
Conflicts:
	workflow/public_html/sysGeneric.php
This commit is contained in:
Erik Amaru Ortiz
2014-01-15 11:14:59 -04:00
parent bbfca418a7 7ca20324e7
commit 428da67762
23 changed files with 708 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/model/Language.php
View File

@@ -22,11 +22,9 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
//require_once 'classes/model/om/BaseLanguage.php';
//require_once 'classes/model/Content.php';
//require_once 'classes/model/IsoCountry.php';
//require_once 'classes/model/Translation.php';
@@ -34,12 +32,11 @@
/**
* Skeleton subclass for representing a row from the 'LANGUAGE' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*
*
* @package workflow.engine.classes.model
*/
class Language extends BaseLanguage
@@ -133,6 +130,16 @@ class Language extends BaseLanguage
return $oDataset->getRow();
}
public function findLocationByLanId ($LAN_ID)
{
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( LanguagePeer::LAN_LOCATION );
$oCriteria->add( LanguagePeer::LAN_ID, $LAN_ID, Criteria::LIKE );
$oDataset = LanguagePeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
return $oDataset->getRow();
}
/*
* Import a language file
*

120
workflow/engine/classes/model/om/BaseLanguage.php
View File

@@ -1,19 +1,13 @@
<?php
require_once 'propel/om/BaseObject.php';
require_once 'propel/om/Persistent.php';
include_once 'propel/util/Criteria.php';
include_once 'classes/model/LanguagePeer.php';
/**
* Base class that represents a row from the 'LANGUAGE' table.
*
*
*
* @package workflow.classes.model.om
*/
abstract class BaseLanguage extends BaseObject implements Persistent
@@ -33,6 +27,12 @@ abstract class BaseLanguage extends BaseObject implements Persistent
*/
protected $lan_id = '';
/**
* The value for the lan_location field.
* @var string
*/
protected $lan_location = '';
/**
* The value for the lan_name field.
* @var string
@@ -94,6 +94,17 @@ abstract class BaseLanguage extends BaseObject implements Persistent
return $this->lan_id;
}
/**
* Get the [lan_location] column value.
*
* @return string
*/
public function getLanLocation()
{
return $this->lan_location;
}
/**
* Get the [lan_name] column value.
*
@@ -182,6 +193,28 @@ abstract class BaseLanguage extends BaseObject implements Persistent
} // setLanId()
/**
* Set the value of [lan_location] column.
*
* @param string $v new value
* @return void
*/
public function setLanLocation($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->lan_location !== $v || $v === '') {
$this->lan_location = $v;
$this->modifiedColumns[] = LanguagePeer::LAN_LOCATION;
}
} // setLanLocation()
/**
* Set the value of [lan_name] column.
*
@@ -333,17 +366,19 @@ abstract class BaseLanguage extends BaseObject implements Persistent
$this->lan_id = $rs->getString($startcol + 0);
$this->lan_name = $rs->getString($startcol + 1);
$this->lan_location = $rs->getString($startcol + 1);
$this->lan_native_name = $rs->getString($startcol + 2);
$this->lan_name = $rs->getString($startcol + 2);
$this->lan_direction = $rs->getString($startcol + 3);
$this->lan_native_name = $rs->getString($startcol + 3);
$this->lan_weight = $rs->getInt($startcol + 4);
$this->lan_direction = $rs->getString($startcol + 4);
$this->lan_enabled = $rs->getString($startcol + 5);
$this->lan_weight = $rs->getInt($startcol + 5);
$this->lan_calendar = $rs->getString($startcol + 6);
$this->lan_enabled = $rs->getString($startcol + 6);
$this->lan_calendar = $rs->getString($startcol + 7);
$this->resetModified();
@@ -558,21 +593,24 @@ abstract class BaseLanguage extends BaseObject implements Persistent
return $this->getLanId();
break;
case 1:
return $this->getLanName();
return $this->getLanLocation();
break;
case 2:
return $this->getLanNativeName();
return $this->getLanName();
break;
case 3:
return $this->getLanDirection();
return $this->getLanNativeName();
break;
case 4:
return $this->getLanWeight();
return $this->getLanDirection();
break;
case 5:
return $this->getLanEnabled();
return $this->getLanWeight();
break;
case 6:
return $this->getLanEnabled();
break;
case 7:
return $this->getLanCalendar();
break;
default:
@@ -596,12 +634,13 @@ abstract class BaseLanguage extends BaseObject implements Persistent
$keys = LanguagePeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getLanId(),
$keys[1] => $this->getLanName(),
$keys[2] => $this->getLanNativeName(),
$keys[3] => $this->getLanDirection(),
$keys[4] => $this->getLanWeight(),
$keys[5] => $this->getLanEnabled(),
$keys[6] => $this->getLanCalendar(),
$keys[1] => $this->getLanLocation(),
$keys[2] => $this->getLanName(),
$keys[3] => $this->getLanNativeName(),
$keys[4] => $this->getLanDirection(),
$keys[5] => $this->getLanWeight(),
$keys[6] => $this->getLanEnabled(),
$keys[7] => $this->getLanCalendar(),
);
return $result;
}
@@ -637,21 +676,24 @@ abstract class BaseLanguage extends BaseObject implements Persistent
$this->setLanId($value);
break;
case 1:
$this->setLanName($value);
$this->setLanLocation($value);
break;
case 2:
$this->setLanNativeName($value);
$this->setLanName($value);
break;
case 3:
$this->setLanDirection($value);
$this->setLanNativeName($value);
break;
case 4:
$this->setLanWeight($value);
$this->setLanDirection($value);
break;
case 5:
$this->setLanEnabled($value);
$this->setLanWeight($value);
break;
case 6:
$this->setLanEnabled($value);
break;
case 7:
$this->setLanCalendar($value);
break;
} // switch()
@@ -682,29 +724,32 @@ abstract class BaseLanguage extends BaseObject implements Persistent
}
if (array_key_exists($keys[1], $arr)) {
$this->setLanName($arr[$keys[1]]);
$this->setLanLocation($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setLanNativeName($arr[$keys[2]]);
$this->setLanName($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setLanDirection($arr[$keys[3]]);
$this->setLanNativeName($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setLanWeight($arr[$keys[4]]);
$this->setLanDirection($arr[$keys[4]]);
}
if (array_key_exists($keys[5], $arr)) {
$this->setLanEnabled($arr[$keys[5]]);
$this->setLanWeight($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setLanCalendar($arr[$keys[6]]);
$this->setLanEnabled($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setLanCalendar($arr[$keys[7]]);
}
}
/**
@@ -720,6 +765,10 @@ abstract class BaseLanguage extends BaseObject implements Persistent
$criteria->add(LanguagePeer::LAN_ID, $this->lan_id);
}
if ($this->isColumnModified(LanguagePeer::LAN_LOCATION)) {
$criteria->add(LanguagePeer::LAN_ID, $this->lan_location);
}
if ($this->isColumnModified(LanguagePeer::LAN_NAME)) {
$criteria->add(LanguagePeer::LAN_NAME, $this->lan_name);
}
@@ -798,6 +847,8 @@ abstract class BaseLanguage extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
$copyObj->setLanLocation($this->lan_location);
$copyObj->setLanName($this->lan_name);
$copyObj->setLanNativeName($this->lan_native_name);
@@ -845,6 +896,7 @@ abstract class BaseLanguage extends BaseObject implements Persistent
* same instance for all member of this class. The method could therefore
* be static, but this would prevent one from overriding the behavior.
*
*
* @return LanguagePeer
*/
public function getPeer()

21
workflow/engine/classes/model/om/BaseLanguagePeer.php
View File

@@ -34,6 +34,9 @@ abstract class BaseLanguagePeer
/** the column name for the LAN_ID field */
const LAN_ID = 'LANGUAGE.LAN_ID';
/** the column name for the LAN_LOCATION field */
const LAN_LOCATION = 'LANGUAGE.LAN_LOCATION';
/** the column name for the LAN_NAME field */
const LAN_NAME = 'LANGUAGE.LAN_NAME';
@@ -63,10 +66,10 @@ abstract class BaseLanguagePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('LanId', 'LanName', 'LanNativeName', 'LanDirection', 'LanWeight', 'LanEnabled', 'LanCalendar', ),
BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID, LanguagePeer::LAN_NAME, LanguagePeer::LAN_NATIVE_NAME, LanguagePeer::LAN_DIRECTION, LanguagePeer::LAN_WEIGHT, LanguagePeer::LAN_ENABLED, LanguagePeer::LAN_CALENDAR, ),
BasePeer::TYPE_FIELDNAME => array ('LAN_ID', 'LAN_NAME', 'LAN_NATIVE_NAME', 'LAN_DIRECTION', 'LAN_WEIGHT', 'LAN_ENABLED', 'LAN_CALENDAR', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('LanId', 'LanLocation', 'LanName', 'LanNativeName', 'LanDirection', 'LanWeight', 'LanEnabled', 'LanCalendar', ),
BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID, LanguagePeer::LAN_LOCATION, LanguagePeer::LAN_NAME, LanguagePeer::LAN_NATIVE_NAME, LanguagePeer::LAN_DIRECTION, LanguagePeer::LAN_WEIGHT, LanguagePeer::LAN_ENABLED, LanguagePeer::LAN_CALENDAR, ),
BasePeer::TYPE_FIELDNAME => array ('LAN_ID', 'LAN_LOCATION', 'LAN_NAME', 'LAN_NATIVE_NAME', 'LAN_DIRECTION', 'LAN_WEIGHT', 'LAN_ENABLED', 'LAN_CALENDAR', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,)
);
/**
@@ -76,10 +79,10 @@ abstract class BaseLanguagePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('LanId' => 0, 'LanName' => 1, 'LanNativeName' => 2, 'LanDirection' => 3, 'LanWeight' => 4, 'LanEnabled' => 5, 'LanCalendar' => 6, ),
BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID => 0, LanguagePeer::LAN_NAME => 1, LanguagePeer::LAN_NATIVE_NAME => 2, LanguagePeer::LAN_DIRECTION => 3, LanguagePeer::LAN_WEIGHT => 4, LanguagePeer::LAN_ENABLED => 5, LanguagePeer::LAN_CALENDAR => 6, ),
BasePeer::TYPE_FIELDNAME => array ('LAN_ID' => 0, 'LAN_NAME' => 1, 'LAN_NATIVE_NAME' => 2, 'LAN_DIRECTION' => 3, 'LAN_WEIGHT' => 4, 'LAN_ENABLED' => 5, 'LAN_CALENDAR' => 6, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('LanId' => 0, 'LanLocation' => 1, 'LanName' => 2, 'LanNativeName' => 3, 'LanDirection' => 4, 'LanWeight' => 5, 'LanEnabled' => 6, 'LanCalendar' => 7, ),
BasePeer::TYPE_COLNAME => array (LanguagePeer::LAN_ID => 0, LanguagePeer::LAN_LOCATION => 1, LanguagePeer::LAN_NAME => 2, LanguagePeer::LAN_NATIVE_NAME => 3, LanguagePeer::LAN_DIRECTION => 4, LanguagePeer::LAN_WEIGHT => 5, LanguagePeer::LAN_ENABLED => 6, LanguagePeer::LAN_CALENDAR => 7, ),
BasePeer::TYPE_FIELDNAME => array ('LAN_ID' => 0, 'LAN_LOCATION' => 1, 'LAN_NAME' => 2, 'LAN_NATIVE_NAME' => 3, 'LAN_DIRECTION' => 4, 'LAN_WEIGHT' => 5, 'LAN_ENABLED' => 6, 'LAN_CALENDAR' => 7, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7,)
);
/**
@@ -182,6 +185,8 @@ abstract class BaseLanguagePeer
$criteria->addSelectColumn(LanguagePeer::LAN_ID);
$criteria->addSelectColumn(LanguagePeer::LAN_LOCATION);
$criteria->addSelectColumn(LanguagePeer::LAN_NAME);
$criteria->addSelectColumn(LanguagePeer::LAN_NATIVE_NAME);