PMC-1308 New attributes in the PMTables editions
This commit is contained in:
28
database/factories/AdditionalTablesFactory.php
Normal file
28
database/factories/AdditionalTablesFactory.php
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Faker\Generator as Faker;
|
||||||
|
|
||||||
|
$factory->define(\ProcessMaker\Model\AdditionalTables::class, function(Faker $faker) {
|
||||||
|
return [
|
||||||
|
'ADD_TAB_UID' => G::generateUniqueID(),
|
||||||
|
'ADD_TAB_NAME' => $faker->name,
|
||||||
|
'ADD_TAB_CLASS_NAME' => $faker->name,
|
||||||
|
'ADD_TAB_DESCRIPTION' => $faker->text,
|
||||||
|
'ADD_TAB_SDW_LOG_INSERT' => 0,
|
||||||
|
'ADD_TAB_SDW_LOG_UPDATE' => 0,
|
||||||
|
'ADD_TAB_SDW_LOG_DELETE' => 0,
|
||||||
|
'ADD_TAB_SDW_LOG_SELECT' => 0,
|
||||||
|
'ADD_TAB_SDW_MAX_LENGTH' => 0,
|
||||||
|
'ADD_TAB_SDW_AUTO_DELETE' => 0,
|
||||||
|
'ADD_TAB_PLG_UID' => '',
|
||||||
|
'DBS_UID' => 'workflow',
|
||||||
|
'PRO_UID' => function() {
|
||||||
|
return factory(\ProcessMaker\Model\Process::class)->create()->PRO_UID;
|
||||||
|
},
|
||||||
|
'ADD_TAB_TYPE' => '',
|
||||||
|
'ADD_TAB_GRID' => '',
|
||||||
|
'ADD_TAB_TAG' => '',
|
||||||
|
'ADD_TAB_OFFLINE' => 0,
|
||||||
|
'ADD_TAB_UPDATE_DATE' => $faker->dateTime()
|
||||||
|
];
|
||||||
|
});
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\unit\workflow\engine\classes\model;
|
||||||
|
|
||||||
|
use AdditionalTables;
|
||||||
|
use Exception;
|
||||||
|
use G;
|
||||||
|
use ProcessMaker\Model\AdditionalTables as AdditionalTablesModel;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdditionalTablesTest extends TestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This tests the creation of a PMTable.
|
||||||
|
* @test
|
||||||
|
* @covers \AdditionalTables::create()
|
||||||
|
*/
|
||||||
|
public function it_should_create()
|
||||||
|
{
|
||||||
|
$data = [
|
||||||
|
"ADD_TAB_UID" => "",
|
||||||
|
"ADD_TAB_NAME" => "PMT_TEST11",
|
||||||
|
"ADD_TAB_CLASS_NAME" => "PmtTest11",
|
||||||
|
"ADD_TAB_DESCRIPTION" => "",
|
||||||
|
"ADD_TAB_PLG_UID" => "",
|
||||||
|
"DBS_UID" => "workflow",
|
||||||
|
"PRO_UID" => "",
|
||||||
|
"ADD_TAB_TYPE" => "",
|
||||||
|
"ADD_TAB_GRID" => "",
|
||||||
|
"ADD_TAB_OFFLINE" => false,
|
||||||
|
"ADD_TAB_UPDATE_DATE" => "2019-10-22 19:52:52"
|
||||||
|
];
|
||||||
|
|
||||||
|
$additionalTables = new AdditionalTables();
|
||||||
|
$result = $additionalTables->create($data);
|
||||||
|
|
||||||
|
$additionalTablesModel = AdditionalTablesModel::where('ADD_TAB_UID', '=', $result)
|
||||||
|
->get()
|
||||||
|
->first();
|
||||||
|
$actual = $additionalTablesModel->toArray();
|
||||||
|
unset($data["ADD_TAB_UID"]);
|
||||||
|
|
||||||
|
$this->assertArraySubset($data, $actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This attempts to create a PMTable without correct data to cause an exception.
|
||||||
|
* @test
|
||||||
|
* @covers \AdditionalTables::create()
|
||||||
|
*/
|
||||||
|
public function it_should_create_without_data()
|
||||||
|
{
|
||||||
|
$data = [
|
||||||
|
];
|
||||||
|
$additionalTables = new AdditionalTables();
|
||||||
|
$this->expectException(Exception::class);
|
||||||
|
$additionalTables->create($data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This updates the data of a PMTable.
|
||||||
|
* @test
|
||||||
|
* @covers \AdditionalTables::update()
|
||||||
|
*/
|
||||||
|
public function it_should_update()
|
||||||
|
{
|
||||||
|
$additionalTables = factory(AdditionalTablesModel::class)->create();
|
||||||
|
|
||||||
|
$expected = [
|
||||||
|
"ADD_TAB_UID" => $additionalTables->ADD_TAB_UID,
|
||||||
|
"ADD_TAB_NAME" => "PMT_TEST11",
|
||||||
|
"ADD_TAB_CLASS_NAME" => "PmtTest11",
|
||||||
|
"DBS_UID" => "workflow",
|
||||||
|
"ADD_TAB_OFFLINE" => false,
|
||||||
|
"ADD_TAB_UPDATE_DATE" => "2019-10-22 19:53:11"
|
||||||
|
];
|
||||||
|
$additionalTables = new AdditionalTables();
|
||||||
|
$additionalTables->update($expected);
|
||||||
|
|
||||||
|
$additionalTables = AdditionalTablesModel::where('ADD_TAB_UID', '=', $expected['ADD_TAB_UID'])
|
||||||
|
->get()
|
||||||
|
->first();
|
||||||
|
|
||||||
|
$this->assertEquals($expected["ADD_TAB_NAME"], $additionalTables->ADD_TAB_NAME);
|
||||||
|
$this->assertEquals($expected["ADD_TAB_CLASS_NAME"], $additionalTables->ADD_TAB_CLASS_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It tries to update the data of a non-existent "PMTable".
|
||||||
|
* @test
|
||||||
|
* @covers \AdditionalTables::update()
|
||||||
|
*/
|
||||||
|
public function it_should_update_if_registry_not_exist()
|
||||||
|
{
|
||||||
|
$expected = [
|
||||||
|
"ADD_TAB_UID" => G::generateUniqueID(),
|
||||||
|
"ADD_TAB_NAME" => "PMT_TEST11",
|
||||||
|
"ADD_TAB_CLASS_NAME" => "PmtTest11",
|
||||||
|
"DBS_UID" => "workflow",
|
||||||
|
"ADD_TAB_OFFLINE" => false,
|
||||||
|
"ADD_TAB_UPDATE_DATE" => "2019-10-22 19:53:11"
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->expectException(Exception::class);
|
||||||
|
$additionalTables = new AdditionalTables();
|
||||||
|
$additionalTables->update($expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1086,6 +1086,7 @@ class AdditionalTables extends BaseAdditionalTables
|
|||||||
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
|
||||||
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TYPE);
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TYPE);
|
||||||
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
|
||||||
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_OFFLINE);
|
||||||
$criteria->addSelectColumn(AdditionalTablesPeer::PRO_UID);
|
$criteria->addSelectColumn(AdditionalTablesPeer::PRO_UID);
|
||||||
$criteria->addSelectColumn(AdditionalTablesPeer::DBS_UID);
|
$criteria->addSelectColumn(AdditionalTablesPeer::DBS_UID);
|
||||||
|
|
||||||
|
|||||||
@@ -97,6 +97,10 @@ class AdditionalTablesMapBuilder
|
|||||||
|
|
||||||
$tMap->addColumn('ADD_TAB_TAG', 'AddTabTag', 'string', CreoleTypes::VARCHAR, false, 256);
|
$tMap->addColumn('ADD_TAB_TAG', 'AddTabTag', 'string', CreoleTypes::VARCHAR, false, 256);
|
||||||
|
|
||||||
|
$tMap->addColumn('ADD_TAB_OFFLINE', 'AddTabOffline', 'int', CreoleTypes::TINYINT, true, null);
|
||||||
|
|
||||||
|
$tMap->addColumn('ADD_TAB_UPDATE_DATE', 'AddTabUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
|
||||||
|
|
||||||
} // doBuild()
|
} // doBuild()
|
||||||
|
|
||||||
} // AdditionalTablesMapBuilder
|
} // AdditionalTablesMapBuilder
|
||||||
|
|||||||
@@ -123,6 +123,18 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
*/
|
*/
|
||||||
protected $add_tab_tag = '';
|
protected $add_tab_tag = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The value for the add_tab_offline field.
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
protected $add_tab_offline = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The value for the add_tab_update_date field.
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
protected $add_tab_update_date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flag to prevent endless save loop, if this object is referenced
|
* Flag to prevent endless save loop, if this object is referenced
|
||||||
* by another object which falls in this transaction.
|
* by another object which falls in this transaction.
|
||||||
@@ -313,6 +325,49 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
return $this->add_tab_tag;
|
return $this->add_tab_tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the [add_tab_offline] column value.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getAddTabOffline()
|
||||||
|
{
|
||||||
|
|
||||||
|
return $this->add_tab_offline;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the [optionally formatted] [add_tab_update_date] column value.
|
||||||
|
*
|
||||||
|
* @param string $format The date/time format string (either date()-style or strftime()-style).
|
||||||
|
* If format is NULL, then the integer unix timestamp will be returned.
|
||||||
|
* @return mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
|
||||||
|
* @throws PropelException - if unable to convert the date/time to timestamp.
|
||||||
|
*/
|
||||||
|
public function getAddTabUpdateDate($format = 'Y-m-d H:i:s')
|
||||||
|
{
|
||||||
|
|
||||||
|
if ($this->add_tab_update_date === null || $this->add_tab_update_date === '') {
|
||||||
|
return null;
|
||||||
|
} elseif (!is_int($this->add_tab_update_date)) {
|
||||||
|
// a non-timestamp value was set externally, so we convert it
|
||||||
|
$ts = strtotime($this->add_tab_update_date);
|
||||||
|
if ($ts === -1 || $ts === false) {
|
||||||
|
throw new PropelException("Unable to parse value of [add_tab_update_date] as date/time value: " .
|
||||||
|
var_export($this->add_tab_update_date, true));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$ts = $this->add_tab_update_date;
|
||||||
|
}
|
||||||
|
if ($format === null) {
|
||||||
|
return $ts;
|
||||||
|
} elseif (strpos($format, '%') !== false) {
|
||||||
|
return strftime($format, $ts);
|
||||||
|
} else {
|
||||||
|
return date($format, $ts);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the value of [add_tab_uid] column.
|
* Set the value of [add_tab_uid] column.
|
||||||
*
|
*
|
||||||
@@ -665,6 +720,57 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
|
|
||||||
} // setAddTabTag()
|
} // setAddTabTag()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the value of [add_tab_offline] column.
|
||||||
|
*
|
||||||
|
* @param int $v new value
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function setAddTabOffline($v)
|
||||||
|
{
|
||||||
|
|
||||||
|
// Since the native PHP type for this column is integer,
|
||||||
|
// we will cast the input value to an int (if it is not).
|
||||||
|
if ($v !== null && !is_int($v) && is_numeric($v)) {
|
||||||
|
$v = (int) $v;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->add_tab_offline !== $v || $v === 0) {
|
||||||
|
$this->add_tab_offline = $v;
|
||||||
|
$this->modifiedColumns[] = AdditionalTablesPeer::ADD_TAB_OFFLINE;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // setAddTabOffline()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the value of [add_tab_update_date] column.
|
||||||
|
*
|
||||||
|
* @param int $v new value
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function setAddTabUpdateDate($v)
|
||||||
|
{
|
||||||
|
|
||||||
|
if ($v !== null && !is_int($v)) {
|
||||||
|
$ts = strtotime($v);
|
||||||
|
//Date/time accepts null values
|
||||||
|
if ($v == '') {
|
||||||
|
$ts = null;
|
||||||
|
}
|
||||||
|
if ($ts === -1 || $ts === false) {
|
||||||
|
throw new PropelException("Unable to parse date/time value for [add_tab_update_date] from input: " .
|
||||||
|
var_export($v, true));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$ts = $v;
|
||||||
|
}
|
||||||
|
if ($this->add_tab_update_date !== $ts) {
|
||||||
|
$this->add_tab_update_date = $ts;
|
||||||
|
$this->modifiedColumns[] = AdditionalTablesPeer::ADD_TAB_UPDATE_DATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // setAddTabUpdateDate()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hydrates (populates) the object variables with values from the database resultset.
|
* Hydrates (populates) the object variables with values from the database resultset.
|
||||||
*
|
*
|
||||||
@@ -714,12 +820,16 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
|
|
||||||
$this->add_tab_tag = $rs->getString($startcol + 15);
|
$this->add_tab_tag = $rs->getString($startcol + 15);
|
||||||
|
|
||||||
|
$this->add_tab_offline = $rs->getInt($startcol + 16);
|
||||||
|
|
||||||
|
$this->add_tab_update_date = $rs->getTimestamp($startcol + 17, null);
|
||||||
|
|
||||||
$this->resetModified();
|
$this->resetModified();
|
||||||
|
|
||||||
$this->setNew(false);
|
$this->setNew(false);
|
||||||
|
|
||||||
// FIXME - using NUM_COLUMNS may be clearer.
|
// FIXME - using NUM_COLUMNS may be clearer.
|
||||||
return $startcol + 16; // 16 = AdditionalTablesPeer::NUM_COLUMNS - AdditionalTablesPeer::NUM_LAZY_LOAD_COLUMNS).
|
return $startcol + 18; // 18 = AdditionalTablesPeer::NUM_COLUMNS - AdditionalTablesPeer::NUM_LAZY_LOAD_COLUMNS).
|
||||||
|
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
throw new PropelException("Error populating AdditionalTables object", $e);
|
throw new PropelException("Error populating AdditionalTables object", $e);
|
||||||
@@ -971,6 +1081,12 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
case 15:
|
case 15:
|
||||||
return $this->getAddTabTag();
|
return $this->getAddTabTag();
|
||||||
break;
|
break;
|
||||||
|
case 16:
|
||||||
|
return $this->getAddTabOffline();
|
||||||
|
break;
|
||||||
|
case 17:
|
||||||
|
return $this->getAddTabUpdateDate();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
break;
|
break;
|
||||||
@@ -1007,6 +1123,8 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
$keys[13] => $this->getAddTabType(),
|
$keys[13] => $this->getAddTabType(),
|
||||||
$keys[14] => $this->getAddTabGrid(),
|
$keys[14] => $this->getAddTabGrid(),
|
||||||
$keys[15] => $this->getAddTabTag(),
|
$keys[15] => $this->getAddTabTag(),
|
||||||
|
$keys[16] => $this->getAddTabOffline(),
|
||||||
|
$keys[17] => $this->getAddTabUpdateDate(),
|
||||||
);
|
);
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
@@ -1086,6 +1204,12 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
case 15:
|
case 15:
|
||||||
$this->setAddTabTag($value);
|
$this->setAddTabTag($value);
|
||||||
break;
|
break;
|
||||||
|
case 16:
|
||||||
|
$this->setAddTabOffline($value);
|
||||||
|
break;
|
||||||
|
case 17:
|
||||||
|
$this->setAddTabUpdateDate($value);
|
||||||
|
break;
|
||||||
} // switch()
|
} // switch()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1173,6 +1297,14 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
$this->setAddTabTag($arr[$keys[15]]);
|
$this->setAddTabTag($arr[$keys[15]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (array_key_exists($keys[16], $arr)) {
|
||||||
|
$this->setAddTabOffline($arr[$keys[16]]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_key_exists($keys[17], $arr)) {
|
||||||
|
$this->setAddTabUpdateDate($arr[$keys[17]]);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1248,6 +1380,14 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
$criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
|
$criteria->add(AdditionalTablesPeer::ADD_TAB_TAG, $this->add_tab_tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_OFFLINE)) {
|
||||||
|
$criteria->add(AdditionalTablesPeer::ADD_TAB_OFFLINE, $this->add_tab_offline);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->isColumnModified(AdditionalTablesPeer::ADD_TAB_UPDATE_DATE)) {
|
||||||
|
$criteria->add(AdditionalTablesPeer::ADD_TAB_UPDATE_DATE, $this->add_tab_update_date);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return $criteria;
|
return $criteria;
|
||||||
}
|
}
|
||||||
@@ -1332,6 +1472,10 @@ abstract class BaseAdditionalTables extends BaseObject implements Persistent
|
|||||||
|
|
||||||
$copyObj->setAddTabTag($this->add_tab_tag);
|
$copyObj->setAddTabTag($this->add_tab_tag);
|
||||||
|
|
||||||
|
$copyObj->setAddTabOffline($this->add_tab_offline);
|
||||||
|
|
||||||
|
$copyObj->setAddTabUpdateDate($this->add_tab_update_date);
|
||||||
|
|
||||||
|
|
||||||
$copyObj->setNew(true);
|
$copyObj->setNew(true);
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ abstract class BaseAdditionalTablesPeer
|
|||||||
const CLASS_DEFAULT = 'classes.model.AdditionalTables';
|
const CLASS_DEFAULT = 'classes.model.AdditionalTables';
|
||||||
|
|
||||||
/** The total number of columns. */
|
/** The total number of columns. */
|
||||||
const NUM_COLUMNS = 16;
|
const NUM_COLUMNS = 18;
|
||||||
|
|
||||||
/** The number of lazy-loaded columns. */
|
/** The number of lazy-loaded columns. */
|
||||||
const NUM_LAZY_LOAD_COLUMNS = 0;
|
const NUM_LAZY_LOAD_COLUMNS = 0;
|
||||||
@@ -79,6 +79,12 @@ abstract class BaseAdditionalTablesPeer
|
|||||||
/** the column name for the ADD_TAB_TAG field */
|
/** the column name for the ADD_TAB_TAG field */
|
||||||
const ADD_TAB_TAG = 'ADDITIONAL_TABLES.ADD_TAB_TAG';
|
const ADD_TAB_TAG = 'ADDITIONAL_TABLES.ADD_TAB_TAG';
|
||||||
|
|
||||||
|
/** the column name for the ADD_TAB_OFFLINE field */
|
||||||
|
const ADD_TAB_OFFLINE = 'ADDITIONAL_TABLES.ADD_TAB_OFFLINE';
|
||||||
|
|
||||||
|
/** the column name for the ADD_TAB_UPDATE_DATE field */
|
||||||
|
const ADD_TAB_UPDATE_DATE = 'ADDITIONAL_TABLES.ADD_TAB_UPDATE_DATE';
|
||||||
|
|
||||||
/** The PHP to DB Name Mapping */
|
/** The PHP to DB Name Mapping */
|
||||||
private static $phpNameMap = null;
|
private static $phpNameMap = null;
|
||||||
|
|
||||||
@@ -90,10 +96,10 @@ abstract class BaseAdditionalTablesPeer
|
|||||||
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
|
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
|
||||||
*/
|
*/
|
||||||
private static $fieldNames = array (
|
private static $fieldNames = array (
|
||||||
BasePeer::TYPE_PHPNAME => array ('AddTabUid', 'AddTabName', 'AddTabClassName', 'AddTabDescription', 'AddTabSdwLogInsert', 'AddTabSdwLogUpdate', 'AddTabSdwLogDelete', 'AddTabSdwLogSelect', 'AddTabSdwMaxLength', 'AddTabSdwAutoDelete', 'AddTabPlgUid', 'DbsUid', 'ProUid', 'AddTabType', 'AddTabGrid', 'AddTabTag', ),
|
BasePeer::TYPE_PHPNAME => array ('AddTabUid', 'AddTabName', 'AddTabClassName', 'AddTabDescription', 'AddTabSdwLogInsert', 'AddTabSdwLogUpdate', 'AddTabSdwLogDelete', 'AddTabSdwLogSelect', 'AddTabSdwMaxLength', 'AddTabSdwAutoDelete', 'AddTabPlgUid', 'DbsUid', 'ProUid', 'AddTabType', 'AddTabGrid', 'AddTabTag', 'AddTabOffline', 'AddTabUpdateDate', ),
|
||||||
BasePeer::TYPE_COLNAME => array (AdditionalTablesPeer::ADD_TAB_UID, AdditionalTablesPeer::ADD_TAB_NAME, AdditionalTablesPeer::ADD_TAB_CLASS_NAME, AdditionalTablesPeer::ADD_TAB_DESCRIPTION, AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, AdditionalTablesPeer::ADD_TAB_PLG_UID, AdditionalTablesPeer::DBS_UID, AdditionalTablesPeer::PRO_UID, AdditionalTablesPeer::ADD_TAB_TYPE, AdditionalTablesPeer::ADD_TAB_GRID, AdditionalTablesPeer::ADD_TAB_TAG, ),
|
BasePeer::TYPE_COLNAME => array (AdditionalTablesPeer::ADD_TAB_UID, AdditionalTablesPeer::ADD_TAB_NAME, AdditionalTablesPeer::ADD_TAB_CLASS_NAME, AdditionalTablesPeer::ADD_TAB_DESCRIPTION, AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT, AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE, AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE, AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT, AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH, AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE, AdditionalTablesPeer::ADD_TAB_PLG_UID, AdditionalTablesPeer::DBS_UID, AdditionalTablesPeer::PRO_UID, AdditionalTablesPeer::ADD_TAB_TYPE, AdditionalTablesPeer::ADD_TAB_GRID, AdditionalTablesPeer::ADD_TAB_TAG, AdditionalTablesPeer::ADD_TAB_OFFLINE, AdditionalTablesPeer::ADD_TAB_UPDATE_DATE, ),
|
||||||
BasePeer::TYPE_FIELDNAME => array ('ADD_TAB_UID', 'ADD_TAB_NAME', 'ADD_TAB_CLASS_NAME', 'ADD_TAB_DESCRIPTION', 'ADD_TAB_SDW_LOG_INSERT', 'ADD_TAB_SDW_LOG_UPDATE', 'ADD_TAB_SDW_LOG_DELETE', 'ADD_TAB_SDW_LOG_SELECT', 'ADD_TAB_SDW_MAX_LENGTH', 'ADD_TAB_SDW_AUTO_DELETE', 'ADD_TAB_PLG_UID', 'DBS_UID', 'PRO_UID', 'ADD_TAB_TYPE', 'ADD_TAB_GRID', 'ADD_TAB_TAG', ),
|
BasePeer::TYPE_FIELDNAME => array ('ADD_TAB_UID', 'ADD_TAB_NAME', 'ADD_TAB_CLASS_NAME', 'ADD_TAB_DESCRIPTION', 'ADD_TAB_SDW_LOG_INSERT', 'ADD_TAB_SDW_LOG_UPDATE', 'ADD_TAB_SDW_LOG_DELETE', 'ADD_TAB_SDW_LOG_SELECT', 'ADD_TAB_SDW_MAX_LENGTH', 'ADD_TAB_SDW_AUTO_DELETE', 'ADD_TAB_PLG_UID', 'DBS_UID', 'PRO_UID', 'ADD_TAB_TYPE', 'ADD_TAB_GRID', 'ADD_TAB_TAG', 'ADD_TAB_OFFLINE', 'ADD_TAB_UPDATE_DATE', ),
|
||||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
|
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -103,10 +109,10 @@ abstract class BaseAdditionalTablesPeer
|
|||||||
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
|
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
|
||||||
*/
|
*/
|
||||||
private static $fieldKeys = array (
|
private static $fieldKeys = array (
|
||||||
BasePeer::TYPE_PHPNAME => array ('AddTabUid' => 0, 'AddTabName' => 1, 'AddTabClassName' => 2, 'AddTabDescription' => 3, 'AddTabSdwLogInsert' => 4, 'AddTabSdwLogUpdate' => 5, 'AddTabSdwLogDelete' => 6, 'AddTabSdwLogSelect' => 7, 'AddTabSdwMaxLength' => 8, 'AddTabSdwAutoDelete' => 9, 'AddTabPlgUid' => 10, 'DbsUid' => 11, 'ProUid' => 12, 'AddTabType' => 13, 'AddTabGrid' => 14, 'AddTabTag' => 15, ),
|
BasePeer::TYPE_PHPNAME => array ('AddTabUid' => 0, 'AddTabName' => 1, 'AddTabClassName' => 2, 'AddTabDescription' => 3, 'AddTabSdwLogInsert' => 4, 'AddTabSdwLogUpdate' => 5, 'AddTabSdwLogDelete' => 6, 'AddTabSdwLogSelect' => 7, 'AddTabSdwMaxLength' => 8, 'AddTabSdwAutoDelete' => 9, 'AddTabPlgUid' => 10, 'DbsUid' => 11, 'ProUid' => 12, 'AddTabType' => 13, 'AddTabGrid' => 14, 'AddTabTag' => 15, 'AddTabOffline' => 16, 'AddTabUpdateDate' => 17, ),
|
||||||
BasePeer::TYPE_COLNAME => array (AdditionalTablesPeer::ADD_TAB_UID => 0, AdditionalTablesPeer::ADD_TAB_NAME => 1, AdditionalTablesPeer::ADD_TAB_CLASS_NAME => 2, AdditionalTablesPeer::ADD_TAB_DESCRIPTION => 3, AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT => 4, AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE => 5, AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE => 6, AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT => 7, AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH => 8, AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE => 9, AdditionalTablesPeer::ADD_TAB_PLG_UID => 10, AdditionalTablesPeer::DBS_UID => 11, AdditionalTablesPeer::PRO_UID => 12, AdditionalTablesPeer::ADD_TAB_TYPE => 13, AdditionalTablesPeer::ADD_TAB_GRID => 14, AdditionalTablesPeer::ADD_TAB_TAG => 15, ),
|
BasePeer::TYPE_COLNAME => array (AdditionalTablesPeer::ADD_TAB_UID => 0, AdditionalTablesPeer::ADD_TAB_NAME => 1, AdditionalTablesPeer::ADD_TAB_CLASS_NAME => 2, AdditionalTablesPeer::ADD_TAB_DESCRIPTION => 3, AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT => 4, AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE => 5, AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE => 6, AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT => 7, AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH => 8, AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE => 9, AdditionalTablesPeer::ADD_TAB_PLG_UID => 10, AdditionalTablesPeer::DBS_UID => 11, AdditionalTablesPeer::PRO_UID => 12, AdditionalTablesPeer::ADD_TAB_TYPE => 13, AdditionalTablesPeer::ADD_TAB_GRID => 14, AdditionalTablesPeer::ADD_TAB_TAG => 15, AdditionalTablesPeer::ADD_TAB_OFFLINE => 16, AdditionalTablesPeer::ADD_TAB_UPDATE_DATE => 17, ),
|
||||||
BasePeer::TYPE_FIELDNAME => array ('ADD_TAB_UID' => 0, 'ADD_TAB_NAME' => 1, 'ADD_TAB_CLASS_NAME' => 2, 'ADD_TAB_DESCRIPTION' => 3, 'ADD_TAB_SDW_LOG_INSERT' => 4, 'ADD_TAB_SDW_LOG_UPDATE' => 5, 'ADD_TAB_SDW_LOG_DELETE' => 6, 'ADD_TAB_SDW_LOG_SELECT' => 7, 'ADD_TAB_SDW_MAX_LENGTH' => 8, 'ADD_TAB_SDW_AUTO_DELETE' => 9, 'ADD_TAB_PLG_UID' => 10, 'DBS_UID' => 11, 'PRO_UID' => 12, 'ADD_TAB_TYPE' => 13, 'ADD_TAB_GRID' => 14, 'ADD_TAB_TAG' => 15, ),
|
BasePeer::TYPE_FIELDNAME => array ('ADD_TAB_UID' => 0, 'ADD_TAB_NAME' => 1, 'ADD_TAB_CLASS_NAME' => 2, 'ADD_TAB_DESCRIPTION' => 3, 'ADD_TAB_SDW_LOG_INSERT' => 4, 'ADD_TAB_SDW_LOG_UPDATE' => 5, 'ADD_TAB_SDW_LOG_DELETE' => 6, 'ADD_TAB_SDW_LOG_SELECT' => 7, 'ADD_TAB_SDW_MAX_LENGTH' => 8, 'ADD_TAB_SDW_AUTO_DELETE' => 9, 'ADD_TAB_PLG_UID' => 10, 'DBS_UID' => 11, 'PRO_UID' => 12, 'ADD_TAB_TYPE' => 13, 'ADD_TAB_GRID' => 14, 'ADD_TAB_TAG' => 15, 'ADD_TAB_OFFLINE' => 16, 'ADD_TAB_UPDATE_DATE' => 17, ),
|
||||||
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
|
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -239,6 +245,10 @@ abstract class BaseAdditionalTablesPeer
|
|||||||
|
|
||||||
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
|
||||||
|
|
||||||
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_OFFLINE);
|
||||||
|
|
||||||
|
$criteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_UPDATE_DATE);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const COUNT = 'COUNT(ADDITIONAL_TABLES.ADD_TAB_UID)';
|
const COUNT = 'COUNT(ADDITIONAL_TABLES.ADD_TAB_UID)';
|
||||||
|
|||||||
@@ -2522,6 +2522,8 @@
|
|||||||
<column name="ADD_TAB_TYPE" type="VARCHAR" size="32" required="false" default=""/>
|
<column name="ADD_TAB_TYPE" type="VARCHAR" size="32" required="false" default=""/>
|
||||||
<column name="ADD_TAB_GRID" type="VARCHAR" size="256" required="false" default=""/>
|
<column name="ADD_TAB_GRID" type="VARCHAR" size="256" required="false" default=""/>
|
||||||
<column name="ADD_TAB_TAG" type="VARCHAR" size="256" required="false" default=""/>
|
<column name="ADD_TAB_TAG" type="VARCHAR" size="256" required="false" default=""/>
|
||||||
|
<column name="ADD_TAB_OFFLINE" type="TINYINT" required="true" default="0"/>
|
||||||
|
<column name="ADD_TAB_UPDATE_DATE" type="TIMESTAMP" required="true"/>
|
||||||
<index name="indexAdditionalProcess">
|
<index name="indexAdditionalProcess">
|
||||||
<index-column name="PRO_UID"/>
|
<index-column name="PRO_UID"/>
|
||||||
</index>
|
</index>
|
||||||
|
|||||||
@@ -2749,6 +2749,18 @@ msgstr "AVAILABLE GROUPS"
|
|||||||
msgid "AVAILABLE MEMBERS"
|
msgid "AVAILABLE MEMBERS"
|
||||||
msgstr "AVAILABLE MEMBERS"
|
msgstr "AVAILABLE MEMBERS"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_AVAILABLE_OFFLINE
|
||||||
|
#: LABEL/ID_AVAILABLE_OFFLINE
|
||||||
|
msgid "Available offline"
|
||||||
|
msgstr "Available offline"
|
||||||
|
|
||||||
|
# TRANSLATION
|
||||||
|
# LABEL/ID_AVAILABLE_OFFLINE_THE_MOBILE_APPLICATIONS
|
||||||
|
#: LABEL/ID_AVAILABLE_OFFLINE_THE_MOBILE_APPLICATIONS
|
||||||
|
msgid "Available offline, the mobile applications will download this table for offline use"
|
||||||
|
msgstr "Available offline, the mobile applications will download this table for offline use"
|
||||||
|
|
||||||
# TRANSLATION
|
# TRANSLATION
|
||||||
# LABEL/ID_AVAILABLE_PERMISSIONS
|
# LABEL/ID_AVAILABLE_PERMISSIONS
|
||||||
#: LABEL/ID_AVAILABLE_PERMISSIONS
|
#: LABEL/ID_AVAILABLE_PERMISSIONS
|
||||||
|
|||||||
@@ -57260,6 +57260,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
|
|||||||
( 'LABEL','ID_AVAILABLE_FIELDS','en','Available Fields','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_FIELDS','en','Available Fields','2014-01-15') ,
|
||||||
( 'LABEL','ID_AVAILABLE_GROUPS','en','AVAILABLE GROUPS','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_GROUPS','en','AVAILABLE GROUPS','2014-01-15') ,
|
||||||
( 'LABEL','ID_AVAILABLE_MEMBERS','en','AVAILABLE MEMBERS','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_MEMBERS','en','AVAILABLE MEMBERS','2014-01-15') ,
|
||||||
|
( 'LABEL','ID_AVAILABLE_OFFLINE','en','Available offline','2019-10-15') ,
|
||||||
|
( 'LABEL','ID_AVAILABLE_OFFLINE_THE_MOBILE_APPLICATIONS','en','Available offline, the mobile applications will download this table for offline use','2019-10-15') ,
|
||||||
( 'LABEL','ID_AVAILABLE_PERMISSIONS','en','AVAILABLE PERMISSIONS','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_PERMISSIONS','en','AVAILABLE PERMISSIONS','2014-01-15') ,
|
||||||
( 'LABEL','ID_AVAILABLE_TRIGGERS','en','Available Triggers','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_TRIGGERS','en','Available Triggers','2014-01-15') ,
|
||||||
( 'LABEL','ID_AVAILABLE_USERS','en','AVAILABLE USERS','2014-01-15') ,
|
( 'LABEL','ID_AVAILABLE_USERS','en','AVAILABLE USERS','2014-01-15') ,
|
||||||
|
|||||||
@@ -1162,6 +1162,8 @@ CREATE TABLE `ADDITIONAL_TABLES`
|
|||||||
`ADD_TAB_TYPE` VARCHAR(32) default '',
|
`ADD_TAB_TYPE` VARCHAR(32) default '',
|
||||||
`ADD_TAB_GRID` VARCHAR(256) default '',
|
`ADD_TAB_GRID` VARCHAR(256) default '',
|
||||||
`ADD_TAB_TAG` VARCHAR(256) default '',
|
`ADD_TAB_TAG` VARCHAR(256) default '',
|
||||||
|
`ADD_TAB_OFFLINE` TINYINT default 0 NOT NULL,
|
||||||
|
`ADD_TAB_UPDATE_DATE` DATETIME NOT NULL,
|
||||||
PRIMARY KEY (`ADD_TAB_UID`),
|
PRIMARY KEY (`ADD_TAB_UID`),
|
||||||
KEY `indexAdditionalProcess`(`PRO_UID`)
|
KEY `indexAdditionalProcess`(`PRO_UID`)
|
||||||
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
|
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
|
||||||
|
|||||||
@@ -486,7 +486,9 @@ class ReportTable
|
|||||||
'DBS_UID' => ($arrayData['REP_TAB_CONNECTION']) ? $arrayData['REP_TAB_CONNECTION'] : 'workflow',
|
'DBS_UID' => ($arrayData['REP_TAB_CONNECTION']) ? $arrayData['REP_TAB_CONNECTION'] : 'workflow',
|
||||||
'PRO_UID' => $arrayData['PRO_UID'],
|
'PRO_UID' => $arrayData['PRO_UID'],
|
||||||
'ADD_TAB_TYPE' => $arrayData['REP_TAB_TYPE'],
|
'ADD_TAB_TYPE' => $arrayData['REP_TAB_TYPE'],
|
||||||
'ADD_TAB_GRID' => $arrayData['REP_TAB_GRID']
|
'ADD_TAB_GRID' => $arrayData['REP_TAB_GRID'],
|
||||||
|
'ADD_TAB_OFFLINE' => !empty($arrayData['REP_TAB_OFFLINE']) ?? 0,
|
||||||
|
'ADD_TAB_UPDATE_DATE' => date('Y-m-d H:i:s'),
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($arrayData['REP_TAB_UID'] == '' || (isset($arrayData['forceUid']) && $arrayData['forceUid'])) {
|
if ($arrayData['REP_TAB_UID'] == '' || (isset($arrayData['forceUid']) && $arrayData['forceUid'])) {
|
||||||
@@ -806,6 +808,8 @@ class ReportTable
|
|||||||
$tableData->REP_TAB_CONNECTION = $contentSchema['DBS_UID'];
|
$tableData->REP_TAB_CONNECTION = $contentSchema['DBS_UID'];
|
||||||
$tableData->REP_TAB_TYPE = (isset($contentSchema['ADD_TAB_TYPE'])) ? $contentSchema['ADD_TAB_TYPE'] : '';
|
$tableData->REP_TAB_TYPE = (isset($contentSchema['ADD_TAB_TYPE'])) ? $contentSchema['ADD_TAB_TYPE'] : '';
|
||||||
$tableData->REP_TAB_GRID = (isset($contentSchema['ADD_TAB_GRID'])) ? $contentSchema['ADD_TAB_GRID'] : '';
|
$tableData->REP_TAB_GRID = (isset($contentSchema['ADD_TAB_GRID'])) ? $contentSchema['ADD_TAB_GRID'] : '';
|
||||||
|
$tableData->REP_TAB_OFFLINE = (isset($contentSchema['ADD_TAB_OFFLINE'])) ? $contentSchema['ADD_TAB_OFFLINE'] : '0';
|
||||||
|
$tableData->REP_TAB_UPDATE_DATE = date('Y-m-d H:i:s');
|
||||||
$tableData->columns = G::json_encode($columns);
|
$tableData->columns = G::json_encode($columns);
|
||||||
$tableData->forceUid = true;
|
$tableData->forceUid = true;
|
||||||
|
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ class Table
|
|||||||
$tabData['PMT_UID'] = $tab_uid;
|
$tabData['PMT_UID'] = $tab_uid;
|
||||||
$tabData['PMT_TAB_NAME'] = $table['ADD_TAB_NAME'];
|
$tabData['PMT_TAB_NAME'] = $table['ADD_TAB_NAME'];
|
||||||
$tabData['PMT_TAB_DESCRIPTION'] = $table['ADD_TAB_DESCRIPTION'];
|
$tabData['PMT_TAB_DESCRIPTION'] = $table['ADD_TAB_DESCRIPTION'];
|
||||||
|
$tabData['PMT_TAB_OFFLINE'] = $table['ADD_TAB_OFFLINE'];
|
||||||
$tabData['PMT_TAB_CLASS_NAME'] = $table['ADD_TAB_CLASS_NAME'];
|
$tabData['PMT_TAB_CLASS_NAME'] = $table['ADD_TAB_CLASS_NAME'];
|
||||||
$tabData['PMT_NUM_ROWS'] = $tableData['count'];
|
$tabData['PMT_NUM_ROWS'] = $tableData['count'];
|
||||||
}
|
}
|
||||||
@@ -384,6 +385,8 @@ class Table
|
|||||||
'ADD_TAB_NAME' => $dataValidate['REP_TAB_NAME'],
|
'ADD_TAB_NAME' => $dataValidate['REP_TAB_NAME'],
|
||||||
'ADD_TAB_CLASS_NAME' => $repTabClassName,
|
'ADD_TAB_CLASS_NAME' => $repTabClassName,
|
||||||
'ADD_TAB_DESCRIPTION' => $dataValidate['REP_TAB_DSC'],
|
'ADD_TAB_DESCRIPTION' => $dataValidate['REP_TAB_DSC'],
|
||||||
|
'ADD_TAB_OFFLINE' => 0,
|
||||||
|
'ADD_TAB_UPDATE_DATE' => date('Y-m-d H:i:s'),
|
||||||
'ADD_TAB_PLG_UID' => '',
|
'ADD_TAB_PLG_UID' => '',
|
||||||
'DBS_UID' => ($dataValidate['REP_TAB_CONNECTION'] ? $dataValidate['REP_TAB_CONNECTION'] : 'workflow'),
|
'DBS_UID' => ($dataValidate['REP_TAB_CONNECTION'] ? $dataValidate['REP_TAB_CONNECTION'] : 'workflow'),
|
||||||
'PRO_UID' => $dataValidate['PRO_UID'],
|
'PRO_UID' => $dataValidate['PRO_UID'],
|
||||||
@@ -396,6 +399,8 @@ class Table
|
|||||||
'ADD_TAB_NAME' => $dataValidate['PMT_TAB_NAME'],
|
'ADD_TAB_NAME' => $dataValidate['PMT_TAB_NAME'],
|
||||||
'ADD_TAB_CLASS_NAME' => $repTabClassName,
|
'ADD_TAB_CLASS_NAME' => $repTabClassName,
|
||||||
'ADD_TAB_DESCRIPTION' => $dataValidate['PMT_TAB_DSC'],
|
'ADD_TAB_DESCRIPTION' => $dataValidate['PMT_TAB_DSC'],
|
||||||
|
'ADD_TAB_OFFLINE' => !empty($dataValidate['PMT_TAB_OFFLINE']) ?? 0,
|
||||||
|
'ADD_TAB_UPDATE_DATE' => date('Y-m-d H:i:s'),
|
||||||
'ADD_TAB_PLG_UID' => '',
|
'ADD_TAB_PLG_UID' => '',
|
||||||
'DBS_UID' => ($dataValidate['PMT_TAB_CONNECTION'] ? $dataValidate['PMT_TAB_CONNECTION'] : 'workflow'),
|
'DBS_UID' => ($dataValidate['PMT_TAB_CONNECTION'] ? $dataValidate['PMT_TAB_CONNECTION'] : 'workflow'),
|
||||||
'PRO_UID' => '',
|
'PRO_UID' => '',
|
||||||
@@ -549,6 +554,11 @@ class Table
|
|||||||
$dataValidate['rep_tab_dsc'] = $tableData['pmt_tab_dsc'];
|
$dataValidate['rep_tab_dsc'] = $tableData['pmt_tab_dsc'];
|
||||||
$tableDsc = true;
|
$tableDsc = true;
|
||||||
}
|
}
|
||||||
|
if (!empty($tableData['pmt_tab_offline'])) {
|
||||||
|
$dataValidate['rep_tab_offline'] = $tableData['pmt_tab_offline'];
|
||||||
|
$tableDsc = true;
|
||||||
|
}
|
||||||
|
$dataValidate['rep_tab_update_date'] = date('Y-m-d H:i:s');
|
||||||
}
|
}
|
||||||
if (!empty($tableData['fields'])) {
|
if (!empty($tableData['fields'])) {
|
||||||
$dataValidate['fields'] = $tableData['fields'];
|
$dataValidate['fields'] = $tableData['fields'];
|
||||||
|
|||||||
12
workflow/engine/src/ProcessMaker/Model/AdditionalTables.php
Normal file
12
workflow/engine/src/ProcessMaker/Model/AdditionalTables.php
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace ProcessMaker\Model;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class AdditionalTables extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'ADDITIONAL_TABLES';
|
||||||
|
public $timestamps = false;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -64,8 +64,12 @@ Ext.onReady(function(){
|
|||||||
listeners: {
|
listeners: {
|
||||||
selectionchange: function (sm) {
|
selectionchange: function (sm) {
|
||||||
switch (sm.getCount()) {
|
switch (sm.getCount()) {
|
||||||
case 0: Ext.getCmp('assignButton').disable(); break;
|
case 0:
|
||||||
default: Ext.getCmp('assignButton').enable(); break;
|
Ext.getCmp('assignButton').disable();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Ext.getCmp('assignButton').enable();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -732,9 +736,7 @@ Ext.onReady(function(){
|
|||||||
height: 40,
|
height: 40,
|
||||||
allowBlank: true
|
allowBlank: true
|
||||||
});
|
});
|
||||||
|
items.push({
|
||||||
items.push(
|
|
||||||
{
|
|
||||||
layout: "column",
|
layout: "column",
|
||||||
style: "margin-left: 255px;",
|
style: "margin-left: 255px;",
|
||||||
hidden: (dataNumRows > 0) ? false : true,
|
hidden: (dataNumRows > 0) ? false : true,
|
||||||
@@ -747,8 +749,21 @@ Ext.onReady(function(){
|
|||||||
boxLabel: _("ID_PMTABLE_DATA_KEEP")
|
boxLabel: _("ID_PMTABLE_DATA_KEEP")
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
});
|
||||||
|
items.push({
|
||||||
|
layout: "column",
|
||||||
|
style: "margin-left: 255px;",
|
||||||
|
hidden: false,
|
||||||
|
items: [
|
||||||
|
{
|
||||||
|
xtype: "checkbox",
|
||||||
|
id: "checkboxAvailableOffline",
|
||||||
|
name: "checkboxAvailableOffline",
|
||||||
|
checked: false,
|
||||||
|
boxLabel: _("ID_AVAILABLE_OFFLINE_THE_MOBILE_APPLICATIONS")
|
||||||
}
|
}
|
||||||
);
|
]
|
||||||
|
});
|
||||||
|
|
||||||
//items.push(comboDbConnections);
|
//items.push(comboDbConnections);
|
||||||
|
|
||||||
@@ -784,8 +799,7 @@ Ext.onReady(function(){
|
|||||||
} else {
|
} else {
|
||||||
createReportTable();
|
createReportTable();
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
PMExt.confirm(_('ID_CONFIRM'), _('ID_PMTABLE_SAVE_AND_DATA_LOST'), createReportTable);
|
PMExt.confirm(_('ID_CONFIRM'), _('ID_PMTABLE_SAVE_AND_DATA_LOST'), createReportTable);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -810,7 +824,7 @@ Ext.onReady(function(){
|
|||||||
Ext.getCmp('REP_TAB_NAME').setValue(TABLE.ADD_TAB_NAME);
|
Ext.getCmp('REP_TAB_NAME').setValue(TABLE.ADD_TAB_NAME);
|
||||||
Ext.getCmp('REP_TAB_NAME').setDisabled(false);
|
Ext.getCmp('REP_TAB_NAME').setDisabled(false);
|
||||||
Ext.getCmp('REP_TAB_DSC').setValue(TABLE.ADD_TAB_DESCRIPTION);
|
Ext.getCmp('REP_TAB_DSC').setValue(TABLE.ADD_TAB_DESCRIPTION);
|
||||||
|
Ext.getCmp('checkboxAvailableOffline').setValue(TABLE.ADD_TAB_OFFLINE === 1);
|
||||||
loadTableRowsFromArray(TABLE.FIELDS);
|
loadTableRowsFromArray(TABLE.FIELDS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -941,6 +955,7 @@ function createReportTable()
|
|||||||
REP_TAB_CONNECTION: "workflow",
|
REP_TAB_CONNECTION: "workflow",
|
||||||
REP_TAB_TYPE: "",
|
REP_TAB_TYPE: "",
|
||||||
REP_TAB_GRID: "",
|
REP_TAB_GRID: "",
|
||||||
|
REP_TAB_OFFLINE: Ext.getCmp("checkboxAvailableOffline").checked === true ? "1" : "0",
|
||||||
columns: Ext.util.JSON.encode(columns)
|
columns: Ext.util.JSON.encode(columns)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1151,6 +1166,8 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f
|
|||||||
|
|
||||||
////ASSIGNBUTON FUNCTIONALITY
|
////ASSIGNBUTON FUNCTIONALITY
|
||||||
AssignFieldsAction = function () {
|
AssignFieldsAction = function () {
|
||||||
|
var records, i;
|
||||||
|
|
||||||
records = Ext.getCmp('availableGrid').getSelectionModel().getSelections();
|
records = Ext.getCmp('availableGrid').getSelectionModel().getSelections();
|
||||||
|
|
||||||
for (i = 0; i < records.length; i++) {
|
for (i = 0; i < records.length; i++) {
|
||||||
@@ -1318,7 +1335,8 @@ var DDLoadFields = function(){
|
|||||||
function loadTableRowsFromArray(records)
|
function loadTableRowsFromArray(records)
|
||||||
{
|
{
|
||||||
var PMRow = assignedGrid.getStore().recordType;
|
var PMRow = assignedGrid.getStore().recordType;
|
||||||
if (records.length == 0) return;
|
if (records.length == 0)
|
||||||
|
return;
|
||||||
for (i = 0; i < records.length; i++) {
|
for (i = 0; i < records.length; i++) {
|
||||||
var row = new PMRow({
|
var row = new PMRow({
|
||||||
uid: records[i].FLD_UID,
|
uid: records[i].FLD_UID,
|
||||||
@@ -1341,7 +1359,8 @@ function loadTableRowsFromArray(records)
|
|||||||
|
|
||||||
function in_array(needle, haystack) {
|
function in_array(needle, haystack) {
|
||||||
for (var i in haystack) {
|
for (var i in haystack) {
|
||||||
if(haystack[i] == needle) return true;
|
if (haystack[i] == needle)
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,8 +30,7 @@ Ext.onReady(function(){
|
|||||||
}
|
}
|
||||||
e.stopEvent();
|
e.stopEvent();
|
||||||
document.location = document.location;
|
document.location = document.location;
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE'));
|
Ext.Msg.alert(_('ID_REFRESH_LABEL'), _('ID_REFRESH_MESSAGE'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,7 +231,8 @@ Ext.onReady(function(){
|
|||||||
{name: 'ADD_TAB_TAG'},
|
{name: 'ADD_TAB_TAG'},
|
||||||
{name: 'PRO_UID'},
|
{name: 'PRO_UID'},
|
||||||
{name: "DBS_UID"},
|
{name: "DBS_UID"},
|
||||||
{name : 'NUM_ROWS'}
|
{name: 'NUM_ROWS'},
|
||||||
|
{name: 'ADD_TAB_OFFLINE'}
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
listeners: {
|
listeners: {
|
||||||
@@ -280,7 +280,8 @@ Ext.onReady(function(){
|
|||||||
cmodelColumns.push({dataIndex: 'ADD_TAB_TAG', hidden: true, hideable: false});
|
cmodelColumns.push({dataIndex: 'ADD_TAB_TAG', hidden: true, hideable: false});
|
||||||
cmodelColumns.push({header: _('ID_NAME'), dataIndex: 'ADD_TAB_NAME', width: 300, align: 'left', renderer: function (v, p, r) {
|
cmodelColumns.push({header: _('ID_NAME'), dataIndex: 'ADD_TAB_NAME', width: 300, align: 'left', renderer: function (v, p, r) {
|
||||||
return r.get('TYPE') == 'CLASSIC' ? v + ' <span style="font-size:9px; color:green">(' + _('ID_OLD_VERSION') + ')</font>' : v;
|
return r.get('TYPE') == 'CLASSIC' ? v + ' <span style="font-size:9px; color:green">(' + _('ID_OLD_VERSION') + ')</font>' : v;
|
||||||
}});
|
}
|
||||||
|
});
|
||||||
cmodelColumns.push({header: _('ID_DESCRIPTION'), dataIndex: 'ADD_TAB_DESCRIPTION', sortable: true, width: 400, hidden: false, align: 'left', renderer: function (v, p, r) {
|
cmodelColumns.push({header: _('ID_DESCRIPTION'), dataIndex: 'ADD_TAB_DESCRIPTION', sortable: true, width: 400, hidden: false, align: 'left', renderer: function (v, p, r) {
|
||||||
if (r.get('ADD_TAB_TAG')) {
|
if (r.get('ADD_TAB_TAG')) {
|
||||||
tag = r.get('ADD_TAB_TAG').replace('plugin@', '');
|
tag = r.get('ADD_TAB_TAG').replace('plugin@', '');
|
||||||
@@ -295,18 +296,21 @@ Ext.onReady(function(){
|
|||||||
v = Ext.util.Format.htmlEncode(v);
|
v = Ext.util.Format.htmlEncode(v);
|
||||||
|
|
||||||
return r.get("ADD_TAB_TAG") ? "<span style = \"font-size:9px; color:green\">" + tag + ":</span> " + v : v;
|
return r.get("ADD_TAB_TAG") ? "<span style = \"font-size:9px; color:green\">" + tag + ":</span> " + v : v;
|
||||||
}});
|
}
|
||||||
|
});
|
||||||
cmodelColumns.push({header: _('ID_TABLE_TYPE'), dataIndex: 'PRO_UID', width: 120, align: 'left', renderer: function (v, p, r) {
|
cmodelColumns.push({header: _('ID_TABLE_TYPE'), dataIndex: 'PRO_UID', width: 120, align: 'left', renderer: function (v, p, r) {
|
||||||
color = r.get('PRO_UID') ? 'blue' : 'green';
|
color = r.get('PRO_UID') ? 'blue' : 'green';
|
||||||
value = r.get('PRO_UID') ? _('ID_REPORT_TABLE') : _('ID_PMTABLE');
|
value = r.get('PRO_UID') ? _('ID_REPORT_TABLE') : _('ID_PMTABLE');
|
||||||
return '<span style="color:' + color + '">' + value + '</span> ';
|
return '<span style="color:' + color + '">' + value + '</span> ';
|
||||||
}});
|
}
|
||||||
|
});
|
||||||
|
|
||||||
cmodelColumns.push({dataIndex: "DBS_UID", hidden: true, hideable: false});
|
cmodelColumns.push({dataIndex: "DBS_UID", hidden: true, hideable: false});
|
||||||
|
|
||||||
cmodelColumns.push({header: _('ID_RECORDS'), dataIndex: 'NUM_ROWS', width: 90, align: 'left', renderer: function (v, p, r) {
|
cmodelColumns.push({header: _('ID_RECORDS'), dataIndex: 'NUM_ROWS', width: 90, align: 'left', renderer: function (v, p, r) {
|
||||||
return '<div style="text-align:' + (isNaN(v) ? 'left' : 'right') + ';">' + v + '</div>';
|
return '<div style="text-align:' + (isNaN(v) ? 'left' : 'right') + ';">' + v + '</div>';
|
||||||
}});
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if (PRO_UID === false) {
|
if (PRO_UID === false) {
|
||||||
cmodelColumns.push({header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 180, align: 'left'});
|
cmodelColumns.push({header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 180, align: 'left'});
|
||||||
@@ -314,6 +318,11 @@ Ext.onReady(function(){
|
|||||||
|
|
||||||
cmodelColumns.push({header: _('ID_TYPE'), dataIndex: 'ADD_TAB_TYPE', width: 400, hidden: true, align: 'left'});
|
cmodelColumns.push({header: _('ID_TYPE'), dataIndex: 'ADD_TAB_TYPE', width: 400, hidden: true, align: 'left'});
|
||||||
|
|
||||||
|
cmodelColumns.push({header: _('ID_AVAILABLE_OFFLINE'), dataIndex: 'ADD_TAB_OFFLINE', width: 400, align: 'left', renderer: function (value) {
|
||||||
|
return value === "1" ? _('ID_YES') : _('ID_NO');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
cmodel = new Ext.grid.ColumnModel({
|
cmodel = new Ext.grid.ColumnModel({
|
||||||
defaults: {
|
defaults: {
|
||||||
width: 50,
|
width: 50,
|
||||||
@@ -401,7 +410,9 @@ Ext.onReady(function(){
|
|||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
infoGrid.on('contextmenu', function(evt){evt.preventDefault();}, this);
|
infoGrid.on('contextmenu', function (evt) {
|
||||||
|
evt.preventDefault();
|
||||||
|
}, this);
|
||||||
infoGrid.addListener('rowcontextmenu', onMessageContextMenu, this);
|
infoGrid.addListener('rowcontextmenu', onMessageContextMenu, this);
|
||||||
|
|
||||||
viewport = new Ext.Viewport({
|
viewport = new Ext.Viewport({
|
||||||
@@ -425,7 +436,9 @@ onMessageContextMenu = function (grid, rowIndex, e) {
|
|||||||
//Capitalize String Function
|
//Capitalize String Function
|
||||||
capitalize = function (s) {
|
capitalize = function (s) {
|
||||||
s = s.toLowerCase();
|
s = s.toLowerCase();
|
||||||
return s.replace( /(^|\s)([a-z])/g , function(m,p1,p2){ return p1+p2.toUpperCase(); } );
|
return s.replace(/(^|\s)([a-z])/g, function (m, p1, p2) {
|
||||||
|
return p1 + p2.toUpperCase();
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
//Do Nothing Function
|
//Do Nothing Function
|
||||||
@@ -458,8 +471,7 @@ EditPMTable = function(){
|
|||||||
tableType = row.data.PRO_UID ? 'report' : 'table';
|
tableType = row.data.PRO_UID ? 'report' : 'table';
|
||||||
proParam = PRO_UID !== false ? '&PRO_UID=' + PRO_UID : '';
|
proParam = PRO_UID !== false ? '&PRO_UID=' + PRO_UID : '';
|
||||||
location.href = 'pmTables/edit?id=' + row.data.ADD_TAB_UID + '&flagProcessmap=' + flagProcessmap + '&tableType=' + tableType + proParam;
|
location.href = 'pmTables/edit?id=' + row.data.ADD_TAB_UID + '&flagProcessmap=' + flagProcessmap + '&tableType=' + tableType + proParam;
|
||||||
}
|
} else { //edit old report table
|
||||||
else { //edit old report table
|
|
||||||
location.href = 'reportTables/reportTables_Edit?REP_TAB_UID=' + row.data.ADD_TAB_UID
|
location.href = 'reportTables/reportTables_Edit?REP_TAB_UID=' + row.data.ADD_TAB_UID
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -581,8 +593,7 @@ ImportPMTable = function(){
|
|||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
PMExt.notify('', result.message);
|
PMExt.notify('', result.message);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
win = new Ext.Window({
|
win = new Ext.Window({
|
||||||
id: 'windowImportingError',
|
id: 'windowImportingError',
|
||||||
applyTo: 'hello-win',
|
applyTo: 'hello-win',
|
||||||
@@ -775,7 +786,8 @@ function updateTagPermissions(){
|
|||||||
if (rowsSelected) {
|
if (rowsSelected) {
|
||||||
location.href = 'pmReports/reportsAjax?action=permissionList&ADD_TAB_NAME=' + rowsSelected[0].get('ADD_TAB_NAME') + '&ADD_TAB_UID=' + rowsSelected[0].get('ADD_TAB_UID') + '&pro_uid=' + PRO_UID + '&flagProcessmap=' + flagProcessmap;
|
location.href = 'pmReports/reportsAjax?action=permissionList&ADD_TAB_NAME=' + rowsSelected[0].get('ADD_TAB_NAME') + '&ADD_TAB_UID=' + rowsSelected[0].get('ADD_TAB_UID') + '&pro_uid=' + PRO_UID + '&flagProcessmap=' + flagProcessmap;
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
;
|
||||||
|
|
||||||
function PopupCenter(pageURL, title, w, h) {
|
function PopupCenter(pageURL, title, w, h) {
|
||||||
var left = (Ext.getBody().getViewSize().width / 3);
|
var left = (Ext.getBody().getViewSize().width / 3);
|
||||||
|
|||||||
Reference in New Issue
Block a user