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

Merged in 3.1 (pull request #4703)

Browse Source 
Updating branch HOR-1500 with last 3.1 changes
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-08 10:31:01 -04:00
parent 31076554e5 64985f5b76
commit 08c72686be
68 changed files with 1569 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/bin/cron.php
View File

@@ -228,6 +228,8 @@ try {
echo 'Done!' . "\n";
} catch (Exception $e) {
echo $e->getMessage() . "\n";
$token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
}

9
workflow/engine/bin/cron_single.php
View File

@@ -313,7 +313,9 @@ try {
break;
}
} catch (Exception $e) {
echo $e->getMessage() . "\n";
$token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
eprintln('Problem in workspace: ' . $workspace . ' it was omitted.', 'red');
}
@@ -325,7 +327,9 @@ try {
unlink(PATH_CORE . 'config' . PATH_SEP . '_databases_.php');
}
} catch (Exception $e) {
echo $e->getMessage() . "\n";
$token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
}
@@ -1054,6 +1058,7 @@ function sendNotifications()
setExecutionMessage("Resending Notifications");
setExecutionResultMessage("PROCESSING");
$notQueue = new \NotificationQueue();
$notQueue->checkIfCasesOpenForResendingNotification();
$notificationsAndroid = $notQueue->loadStatusDeviceType('pending', 'android');
if ($notificationsAndroid) {
setExecutionMessage("|-- Send Android's Notifications");

4
workflow/engine/bin/tasks/cliMafe.php
View File

@@ -59,10 +59,10 @@ function run_create_translation($args, $opts)
CLI::logging("Updating labels Mafe ...\n");
foreach ($workspaces as $workspace) {
try {
echo "Updating labels for workspace " . pakeColor::colorize($workspace->name, "INFO") . "\n";
G::outRes( "Updating labels for workspace " . pakeColor::colorize($workspace->name, "INFO") . "\n" );
$translation->generateTransaltionMafe($lang);
} catch (Exception $e) {
echo "Errors upgrading labels for workspace " . CLI::info($workspace->name) . ": " . CLI::error(G::getErrorMessage($e)) . "\n";
G::outRes( "Errors upgrading labels for workspace " . CLI::info($workspace->name) . ": " . CLI::error(G::getErrorMessage($e)) . "\n" );
}
}

31
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -321,7 +321,7 @@ function run_workspace_upgrade($args, $opts) {
$workspace->upgrade($first, false, $workspace->name, $lang);
$first = false;
} catch (Exception $e) {
echo "Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
G::outRes( "Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -335,11 +335,11 @@ function run_translation_upgrade($args, $opts) {
$first = true;
foreach ($workspaces as $workspace) {
try {
echo "Upgrading translation for " . pakeColor::colorize($workspace->name, "INFO") . "\n";
G::outRes( "Upgrading translation for " . pakeColor::colorize($workspace->name, "INFO") . "\n" );
$workspace->upgradeTranslation($first);
$first = false;
} catch (Exception $e) {
echo "Errors upgrading translation of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
G::outRes( "Errors upgrading translation of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -353,14 +353,13 @@ function run_cacheview_upgrade($args, $opts) {
$lang = array_key_exists("lang", $opts) ? $opts['lang'] : 'en';
foreach ($workspaces as $workspace) {
try {
echo "Upgrading cache view for " . pakeColor::colorize($workspace->name, "INFO") . "\n";
G::outRes( "Upgrading cache view for " . pakeColor::colorize($workspace->name, "INFO") . "\n" );
$workspace->upgradeCacheView(true, false, $lang);
} catch (Exception $e) {
echo "Errors upgrading cache view of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
G::outRes( "Errors upgrading cache view of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n" );
}
}
}
function run_plugins_database_upgrade($args, $opts) {
$workspaces = get_workspaces_from_args($args);
foreach ($workspaces as $workspace) {
@@ -441,7 +440,7 @@ function database_upgrade($command, $args) {
echo "> OK\n";
}
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
G::outRes( "> Error: ".CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -673,10 +672,10 @@ function run_database_generate_self_service_by_value($args, $opts)
$workspace = $value;
try {
echo "Generating the table \"self-service by value\" for " . pakeColor::colorize($workspace->name, "INFO") . "\n";
G::outRes( "Generating the table \"self-service by value\" for " . pakeColor::colorize($workspace->name, "INFO") . "\n" );
$workspace->appAssignSelfServiceValueTableGenerateData();
} catch (Exception $e) {
echo "Errors generating the table \"self-service by value\" of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n";
G::outRes( "Errors generating the table \"self-service by value\" of workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n" );
}
echo "\n";
@@ -684,7 +683,7 @@ function run_database_generate_self_service_by_value($args, $opts)
echo "Done!\n";
} catch (Exception $e) {
echo CLI::error($e->getMessage()) . "\n";
G::outRes( CLI::error($e->getMessage()) . "\n" );
}
}
@@ -754,7 +753,7 @@ function run_migrate_itee_to_dummytask($args, $opts){
$ws = new workspaceTools($workspace->name);
$res = $ws->migrateIteeToDummytask($workspace->name);
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
G::outRes( "> Error: ".CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -813,7 +812,7 @@ function run_check_workspace_disabled_code($args, $opts)
echo "The workspace it's OK\n\n";
}
} catch (Exception $e) {
echo "Errors to check disabled code: " . CLI::error($e->getMessage()) . "\n\n";
G::outRes( "Errors to check disabled code: " . CLI::error($e->getMessage()) . "\n\n" );
}
$workspace->close();
@@ -821,7 +820,7 @@ function run_check_workspace_disabled_code($args, $opts)
echo "Done!\n";
} catch (Exception $e) {
echo CLI::error($e->getMessage()) . "\n";
G::outRes( CLI::error($e->getMessage()) . "\n" );
}
}
@@ -838,7 +837,7 @@ function migrate_new_cases_lists($command, $args, $opts) {
$workspace->migrateList($workspace->name, true, $lang);
echo "> List tables are done\n";
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
G::outRes( "> Error: ".CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -854,7 +853,7 @@ function migrate_counters($command, $args) {
echo "> Counters are done\n";
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
G::outRes( "> Error: ".CLI::error($e->getMessage()) . "\n" );
}
}
}
@@ -872,7 +871,7 @@ function migrate_list_unassigned($command, $args, $opts) {
$workspace->regenerateListUnassigned();
echo "> Unassigned List is done\n";
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
G::outRes( "> Error: ".CLI::error($e->getMessage()) . "\n" );
}
}
}

4
workflow/engine/bin/verify_solr.php
View File

@@ -224,7 +224,9 @@ if (! defined ('SYS_SYS')) {
processWorkspace ();
}
catch (Exception $e) {
echo $e->getMessage ();
$token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
eprintln ("Problem in workspace: " . $sObject . ' it was omitted.', 'red');
}
eprintln ();

9
workflow/engine/classes/class.wsTools.php
View File

@@ -1537,7 +1537,8 @@ class workspaceTools
messages may be displayed during the restore process.") . "\n");
foreach ($metaFiles as $metaFile) {
$metadata = G::json_decode(file_get_contents($metaFile));
$metadata = preg_replace('/\r|\n/', '', file_get_contents($metaFile));
$metadata = G::json_decode(preg_replace('/\s+/', '', $metadata));
if ($metadata->version != 1) {
throw new Exception("Backup version {$metadata->version} not supported");
}
@@ -1578,8 +1579,8 @@ class workspaceTools
throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases.");
}
if(!$workspace->workspaceExists()){
throw new Exception('We can not overwrite this workspace because the workspace '.$workspaceName.' does not exist please check the lower case and upper case.');
if (!$workspace->workspaceExists()) {
throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.');
}
CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n");
} else {
@@ -1701,7 +1702,7 @@ class workspaceTools
$workspace->upgradeTriggersOfTables(true, $lang);
}
if($pmVersion == '' && strpos(strtoupper($version), 'BRANCH')){
if ($pmVersion == '' && strpos(strtoupper($version), 'BRANCH')) {
$pmVersion = 'dev-version-backup';
}

2
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -80,7 +80,7 @@ class CaseScheduler extends BaseCaseScheduler
break;
}
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: ".$aData['SCH_END_DATE'].", Execution time : ".$aData['SCH_START_TIME']);
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: " . ((array_key_exists('SCH_END_DATE', $aData))? $aData['SCH_END_DATE'] : '') . ", Execution time : ".$aData['SCH_START_TIME']);
return $result;
} catch (Exception $e) {

36
workflow/engine/classes/model/NotificationQueue.php
View File

@@ -27,6 +27,8 @@ class NotificationQueue extends BaseNotificationQueue
$this->setNotData($arrayData['NOT_DATA']);
$this->setNotStatus($arrayData['NOT_STATUS']);
$this->setNotSendDate('now');
$this->setAppUid($arrayData['APP_UID']);
$this->setDelIndex($arrayData['DEL_INDEX']);
if ($this->validate()) {
$cnn->begin();
@@ -62,6 +64,40 @@ class NotificationQueue extends BaseNotificationQueue
return $notifications;
}
/**
* This method changes the state of a notification when the case ended before running the cron.php
*/
public function checkIfCasesOpenForResendingNotification()
{
$arrayCondition = array();
$criteria = new Criteria();
$criteria->clearSelectColumns();
$criteria->addSelectColumn(NotificationQueuePeer::APP_UID);
$criteria->addSelectColumn(NotificationQueuePeer::DEL_INDEX);
$criteria->addSelectColumn(NotificationQueuePeer::NOT_UID);
$criteria->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNOTNULL);
$arrayCondition[] = array(NotificationQueuePeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::EQUAL);
$arrayCondition[] = array(NotificationQueuePeer::DEL_INDEX, AppDelegationPeer::DEL_INDEX, Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
$rs = NotificationQueuePeer::doSelectRS($criteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$notUID = array();
while ($rs->next()) {
$row = $rs->getRow();
if ($row['DEL_INDEX'] != 0 && $row['APP_UID'] != '') {
array_push($notUID, $row['NOT_UID']);
}
}
$criteriaSet = new Criteria("workflow");
$criteriaSet->add(NotificationQueuePeer::NOT_STATUS, 'sent');
$criteriaSet->add(NotificationQueuePeer::NOT_SEND_DATE, date('Y-m-d H:i:s'));
$criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(NotificationQueuePeer::NOT_UID, $notUID, Criteria::IN);
\BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
}
public function loadStatusDeviceType($status, $devType)
{
try {

20
workflow/engine/classes/model/OutputDocument.php
View File

@@ -264,7 +264,16 @@ class OutputDocument extends BaseOutputDocument
$iResult = $oOutputDocument->save();
$oConnection->commit();
//Add Audit Log
$description = "Output Document Name: ".$aData['OUT_DOC_TITLE'].", Output Document Uid: ".$aData['OUT_DOC_UID'].", Filename generated: ".$aData['OUT_DOC_FILENAME'];
$description = 'Output Document Uid: ' . $aData['OUT_DOC_UID'];
if (array_key_exists('OUT_DOC_TITLE', $aData) && (string)($aData['OUT_DOC_TITLE']) != '') {
$description .= ', Output Document Name: ' . $aData['OUT_DOC_TITLE'];
}
if (array_key_exists('OUT_DOC_FILENAME', $aData) && (string)($aData['OUT_DOC_FILENAME']) != '') {
$description .= ', Filename generated: ' . $aData['OUT_DOC_FILENAME'];
}
if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
}
@@ -274,12 +283,11 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
}
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled';
}else{
$pdfSecurity = 'Enabled';
if (array_key_exists('OUT_DOC_PDF_SECURITY_ENABLED', $aData) && (string)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != '') {
$description .= ', PDF Security: ' . (((int)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != 0)? 'Enabled' : 'Disabled');
}
$description .= ", PDF Security: ".$pdfSecurity;
if(!empty($aData['OUT_DOC_VERSIONING'])){
$description .= ", Enable Versioning: Yes";
}

2
workflow/engine/classes/model/map/ListCompletedMapBuilder.php
View File

@@ -83,7 +83,7 @@ class ListCompletedMapBuilder
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);

4
workflow/engine/classes/model/map/NotificationQueueMapBuilder.php
View File

@@ -79,6 +79,10 @@ class NotificationQueueMapBuilder
$tMap->addColumn('NOT_SEND_DATE', 'NotSendDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
} // doBuild()
} // NotificationQueueMapBuilder

4
workflow/engine/classes/model/om/BaseAppAssignSelfServiceValue.php
View File

@@ -55,7 +55,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
* The value for the grp_uid field.
* @var string
*/
protected $grp_uid = '';
protected $grp_uid;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -229,7 +229,7 @@ abstract class BaseAppAssignSelfServiceValue extends BaseObject implements Persi
$v = (string) $v;
}
if ($this->grp_uid !== $v || $v === '') {
if ($this->grp_uid !== $v) {
$this->grp_uid = $v;
$this->modifiedColumns[] = AppAssignSelfServiceValuePeer::GRP_UID;
}

4
workflow/engine/classes/model/om/BaseAppMessage.php
View File

@@ -133,7 +133,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
* The value for the app_msg_error field.
* @var string
*/
protected $app_msg_error = '';
protected $app_msg_error;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -792,7 +792,7 @@ abstract class BaseAppMessage extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->app_msg_error !== $v || $v === '') {
if ($this->app_msg_error !== $v) {
$this->app_msg_error = $v;
$this->modifiedColumns[] = AppMessagePeer::APP_MSG_ERROR;
}

4
workflow/engine/classes/model/om/BaseCatalog.php
View File

@@ -55,7 +55,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
* The value for the cat_observation field.
* @var string
*/
protected $cat_observation = '';
protected $cat_observation;
/**
* The value for the cat_create_date field.
@@ -305,7 +305,7 @@ abstract class BaseCatalog extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->cat_observation !== $v || $v === '') {
if ($this->cat_observation !== $v) {
$this->cat_observation = $v;
$this->modifiedColumns[] = CatalogPeer::CAT_OBSERVATION;
}

54
workflow/engine/classes/model/om/BaseListUnassigned.php
View File

@@ -35,7 +35,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* The value for the del_index field.
* @var string
* @var int
*/
protected $del_index = 0;
@@ -151,7 +151,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
/**
* Get the [del_index] column value.
*
* @return string
* @return int
*/
public function getDelIndex()
{
@@ -230,7 +230,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrUsername()
public function getDelPreviousUsrUsername()
{
return $this->del_previous_usr_username;
@@ -241,7 +241,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrFirstname()
public function getDelPreviousUsrFirstname()
{
return $this->del_previous_usr_firstname;
@@ -252,7 +252,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
*
* @return string
*/
public function getAppPreviousUsrLastname()
public function getDelPreviousUsrLastname()
{
return $this->del_previous_usr_lastname;
@@ -558,7 +558,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrUsername($v)
public function setDelPreviousUsrUsername($v)
{
// Since the native PHP type for this column is string,
@@ -572,7 +572,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME;
}
} // setAppPreviousUsrUsername()
} // setDelPreviousUsrUsername()
/**
* Set the value of [del_previous_usr_firstname] column.
@@ -580,7 +580,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrFirstname($v)
public function setDelPreviousUsrFirstname($v)
{
// Since the native PHP type for this column is string,
@@ -594,7 +594,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME;
}
} // setAppPreviousUsrFirstname()
} // setDelPreviousUsrFirstname()
/**
* Set the value of [del_previous_usr_lastname] column.
@@ -602,7 +602,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
* @param string $v new value
* @return void
*/
public function setAppPreviousUsrLastname($v)
public function setDelPreviousUsrLastname($v)
{
// Since the native PHP type for this column is string,
@@ -616,7 +616,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->modifiedColumns[] = ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME;
}
} // setAppPreviousUsrLastname()
} // setDelPreviousUsrLastname()
/**
* Set the value of [app_update_date] column.
@@ -1032,13 +1032,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
return $this->getAppTasTitle();
break;
case 8:
return $this->getAppPreviousUsrUsername();
return $this->getDelPreviousUsrUsername();
break;
case 9:
return $this->getAppPreviousUsrFirstname();
return $this->getDelPreviousUsrFirstname();
break;
case 10:
return $this->getAppPreviousUsrLastname();
return $this->getDelPreviousUsrLastname();
break;
case 11:
return $this->getAppUpdateDate();
@@ -1083,9 +1083,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$keys[5] => $this->getAppTitle(),
$keys[6] => $this->getAppProTitle(),
$keys[7] => $this->getAppTasTitle(),
$keys[8] => $this->getAppPreviousUsrUsername(),
$keys[9] => $this->getAppPreviousUsrFirstname(),
$keys[10] => $this->getAppPreviousUsrLastname(),
$keys[8] => $this->getDelPreviousUsrUsername(),
$keys[9] => $this->getDelPreviousUsrFirstname(),
$keys[10] => $this->getDelPreviousUsrLastname(),
$keys[11] => $this->getAppUpdateDate(),
$keys[12] => $this->getDelPreviousUsrUid(),
$keys[13] => $this->getDelDelegateDate(),
@@ -1147,13 +1147,13 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$this->setAppTasTitle($value);
break;
case 8:
$this->setAppPreviousUsrUsername($value);
$this->setDelPreviousUsrUsername($value);
break;
case 9:
$this->setAppPreviousUsrFirstname($value);
$this->setDelPreviousUsrFirstname($value);
break;
case 10:
$this->setAppPreviousUsrLastname($value);
$this->setDelPreviousUsrLastname($value);
break;
case 11:
$this->setAppUpdateDate($value);
@@ -1226,15 +1226,15 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
}
if (array_key_exists($keys[8], $arr)) {
$this->setAppPreviousUsrUsername($arr[$keys[8]]);
$this->setDelPreviousUsrUsername($arr[$keys[8]]);
}
if (array_key_exists($keys[9], $arr)) {
$this->setAppPreviousUsrFirstname($arr[$keys[9]]);
$this->setDelPreviousUsrFirstname($arr[$keys[9]]);
}
if (array_key_exists($keys[10], $arr)) {
$this->setAppPreviousUsrLastname($arr[$keys[10]]);
$this->setDelPreviousUsrLastname($arr[$keys[10]]);
}
if (array_key_exists($keys[11], $arr)) {
@@ -1410,11 +1410,11 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppTasTitle($this->app_tas_title);
$copyObj->setAppPreviousUsrUsername($this->del_previous_usr_username);
$copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username);
$copyObj->setAppPreviousUsrFirstname($this->del_previous_usr_firstname);
$copyObj->setDelPreviousUsrFirstname($this->del_previous_usr_firstname);
$copyObj->setAppPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setDelPreviousUsrLastname($this->del_previous_usr_lastname);
$copyObj->setAppUpdateDate($this->app_update_date);
@@ -1431,7 +1431,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent
$copyObj->setAppUid(''); // this is a pkey column, so set to default value
$copyObj->setDelIndex(0); // this is a pkey column, so set to default value
$copyObj->setDelIndex('0'); // this is a pkey column, so set to default value
}

4
workflow/engine/classes/model/om/BaseListUnassignedPeer.php
View File

@@ -103,7 +103,7 @@ abstract class BaseListUnassignedPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppPreviousUsrUsername' => 8, 'AppPreviousUsrFirstname' => 9, 'AppPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, ),
BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
@@ -595,7 +595,7 @@ abstract class BaseListUnassignedPeer
/**
* Retrieve object using using composite pkey values.
* @param string $app_uid
* @param string $del_index
* @param int $del_index
* @param Connection $con
* @return ListUnassigned
*/

118
workflow/engine/classes/model/om/BaseNotificationQueue.php
View File

@@ -69,6 +69,18 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
*/
protected $not_send_date;
/**
* The value for the app_uid field.
* @var string
*/
protected $app_uid = '';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -181,6 +193,28 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
}
}
/**
* Get the [app_uid] column value.
*
* @return string
*/
public function getAppUid()
{
return $this->app_uid;
}
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/**
* Set the value of [not_uid] column.
*
@@ -342,6 +376,50 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
} // setNotSendDate()
/**
* Set the value of [app_uid] column.
*
* @param string $v new value
* @return void
*/
public function setAppUid($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->app_uid !== $v || $v === '') {
$this->app_uid = $v;
$this->modifiedColumns[] = NotificationQueuePeer::APP_UID;
}
} // setAppUid()
/**
* Set the value of [del_index] column.
*
* @param int $v new value
* @return void
*/
public function setDelIndex($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->del_index !== $v || $v === 0) {
$this->del_index = $v;
$this->modifiedColumns[] = NotificationQueuePeer::DEL_INDEX;
}
} // setDelIndex()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -373,12 +451,16 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$this->not_send_date = $rs->getTimestamp($startcol + 6, null);
$this->app_uid = $rs->getString($startcol + 7);
$this->del_index = $rs->getInt($startcol + 8);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 7; // 7 = NotificationQueuePeer::NUM_COLUMNS - NotificationQueuePeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 9; // 9 = NotificationQueuePeer::NUM_COLUMNS - NotificationQueuePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating NotificationQueue object", $e);
@@ -603,6 +685,12 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
case 6:
return $this->getNotSendDate();
break;
case 7:
return $this->getAppUid();
break;
case 8:
return $this->getDelIndex();
break;
default:
return null;
break;
@@ -630,6 +718,8 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$keys[4] => $this->getNotData(),
$keys[5] => $this->getNotStatus(),
$keys[6] => $this->getNotSendDate(),
$keys[7] => $this->getAppUid(),
$keys[8] => $this->getDelIndex(),
);
return $result;
}
@@ -682,6 +772,12 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
case 6:
$this->setNotSendDate($value);
break;
case 7:
$this->setAppUid($value);
break;
case 8:
$this->setDelIndex($value);
break;
} // switch()
}
@@ -733,6 +829,14 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$this->setNotSendDate($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setAppUid($arr[$keys[7]]);
}
if (array_key_exists($keys[8], $arr)) {
$this->setDelIndex($arr[$keys[8]]);
}
}
/**
@@ -772,6 +876,14 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$criteria->add(NotificationQueuePeer::NOT_SEND_DATE, $this->not_send_date);
}
if ($this->isColumnModified(NotificationQueuePeer::APP_UID)) {
$criteria->add(NotificationQueuePeer::APP_UID, $this->app_uid);
}
if ($this->isColumnModified(NotificationQueuePeer::DEL_INDEX)) {
$criteria->add(NotificationQueuePeer::DEL_INDEX, $this->del_index);
}
return $criteria;
}
@@ -838,6 +950,10 @@ abstract class BaseNotificationQueue extends BaseObject implements Persistent
$copyObj->setNotSendDate($this->not_send_date);
$copyObj->setAppUid($this->app_uid);
$copyObj->setDelIndex($this->del_index);
$copyObj->setNew(true);

28
workflow/engine/classes/model/om/BaseNotificationQueuePeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseNotificationQueuePeer
const CLASS_DEFAULT = 'classes.model.NotificationQueue';
/** The total number of columns. */
const NUM_COLUMNS = 7;
const NUM_COLUMNS = 9;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -52,6 +52,12 @@ abstract class BaseNotificationQueuePeer
/** the column name for the NOT_SEND_DATE field */
const NOT_SEND_DATE = 'NOTIFICATION_QUEUE.NOT_SEND_DATE';
/** the column name for the APP_UID field */
const APP_UID = 'NOTIFICATION_QUEUE.APP_UID';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'NOTIFICATION_QUEUE.DEL_INDEX';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -63,10 +69,10 @@ abstract class BaseNotificationQueuePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('NotUid', 'DevType', 'DevUid', 'NotMsg', 'NotData', 'NotStatus', 'NotSendDate', ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID, NotificationQueuePeer::DEV_TYPE, NotificationQueuePeer::DEV_UID, NotificationQueuePeer::NOT_MSG, NotificationQueuePeer::NOT_DATA, NotificationQueuePeer::NOT_STATUS, NotificationQueuePeer::NOT_SEND_DATE, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID', 'DEV_TYPE', 'DEV_UID', 'NOT_MSG', 'NOT_DATA', 'NOT_STATUS', 'NOT_SEND_DATE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('NotUid', 'DevType', 'DevUid', 'NotMsg', 'NotData', 'NotStatus', 'NotSendDate', 'AppUid', 'DelIndex', ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID, NotificationQueuePeer::DEV_TYPE, NotificationQueuePeer::DEV_UID, NotificationQueuePeer::NOT_MSG, NotificationQueuePeer::NOT_DATA, NotificationQueuePeer::NOT_STATUS, NotificationQueuePeer::NOT_SEND_DATE, NotificationQueuePeer::APP_UID, NotificationQueuePeer::DEL_INDEX, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID', 'DEV_TYPE', 'DEV_UID', 'NOT_MSG', 'NOT_DATA', 'NOT_STATUS', 'NOT_SEND_DATE', 'APP_UID', 'DEL_INDEX', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
);
/**
@@ -76,10 +82,10 @@ abstract class BaseNotificationQueuePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('NotUid' => 0, 'DevType' => 1, 'DevUid' => 2, 'NotMsg' => 3, 'NotData' => 4, 'NotStatus' => 5, 'NotSendDate' => 6, ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID => 0, NotificationQueuePeer::DEV_TYPE => 1, NotificationQueuePeer::DEV_UID => 2, NotificationQueuePeer::NOT_MSG => 3, NotificationQueuePeer::NOT_DATA => 4, NotificationQueuePeer::NOT_STATUS => 5, NotificationQueuePeer::NOT_SEND_DATE => 6, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID' => 0, 'DEV_TYPE' => 1, 'DEV_UID' => 2, 'NOT_MSG' => 3, 'NOT_DATA' => 4, 'NOT_STATUS' => 5, 'NOT_SEND_DATE' => 6, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
BasePeer::TYPE_PHPNAME => array ('NotUid' => 0, 'DevType' => 1, 'DevUid' => 2, 'NotMsg' => 3, 'NotData' => 4, 'NotStatus' => 5, 'NotSendDate' => 6, 'AppUid' => 7, 'DelIndex' => 8, ),
BasePeer::TYPE_COLNAME => array (NotificationQueuePeer::NOT_UID => 0, NotificationQueuePeer::DEV_TYPE => 1, NotificationQueuePeer::DEV_UID => 2, NotificationQueuePeer::NOT_MSG => 3, NotificationQueuePeer::NOT_DATA => 4, NotificationQueuePeer::NOT_STATUS => 5, NotificationQueuePeer::NOT_SEND_DATE => 6, NotificationQueuePeer::APP_UID => 7, NotificationQueuePeer::DEL_INDEX => 8, ),
BasePeer::TYPE_FIELDNAME => array ('NOT_UID' => 0, 'DEV_TYPE' => 1, 'DEV_UID' => 2, 'NOT_MSG' => 3, 'NOT_DATA' => 4, 'NOT_STATUS' => 5, 'NOT_SEND_DATE' => 6, 'APP_UID' => 7, 'DEL_INDEX' => 8, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, )
);
/**
@@ -194,6 +200,10 @@ abstract class BaseNotificationQueuePeer
$criteria->addSelectColumn(NotificationQueuePeer::NOT_SEND_DATE);
$criteria->addSelectColumn(NotificationQueuePeer::APP_UID);
$criteria->addSelectColumn(NotificationQueuePeer::DEL_INDEX);
}
const COUNT = 'COUNT(NOTIFICATION_QUEUE.NOT_UID)';

10
workflow/engine/classes/model/om/BaseProcess.php
View File

@@ -250,10 +250,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
protected $pro_unit_cost = '';
/**
* The value for the pro_debug field.
* The value for the pro_itee field.
* @var int
*/
protected $pro_itee = 1;
protected $pro_itee = 0;
/**
* The value for the pro_action_done field.
@@ -727,7 +727,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
/**
* Get the [pro_itee] column value.
*
* @return string
* @return int
*/
public function getProItee()
{
@@ -1577,7 +1577,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$v = (int) $v;
}
if ($this->pro_itee !== $v || $v === 1) {
if ($this->pro_itee !== $v || $v === 0) {
$this->pro_itee = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_ITEE;
}
@@ -1697,7 +1697,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_unit_cost = $rs->getString($startcol + 36);
$this->pro_itee = $rs->getString($startcol + 37);
$this->pro_itee = $rs->getInt($startcol + 37);
$this->pro_action_done = $rs->getString($startcol + 38);

4
workflow/engine/classes/model/om/BaseTimerEvent.php
View File

@@ -85,7 +85,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
* The value for the tmrevn_configuration_data field.
* @var string
*/
protected $tmrevn_configuration_data = '';
protected $tmrevn_configuration_data;
/**
* The value for the tmrevn_next_run_date field.
@@ -611,7 +611,7 @@ abstract class BaseTimerEvent extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->tmrevn_configuration_data !== $v || $v === '') {
if ($this->tmrevn_configuration_data !== $v) {
$this->tmrevn_configuration_data = $v;
$this->modifiedColumns[] = TimerEventPeer::TMREVN_CONFIGURATION_DATA;
}

6
workflow/engine/config/schema.xml
View File

@@ -94,7 +94,7 @@
</index>
</table>
<table name="APP_SEQUENCE" idMethod="native">
<column name="ID" type="INTEGER" required="true" primaryKey="true"/>
<column name="ID" type="INTEGER" required="true" primaryKey="true" autoIncrement="true" />
</table>
<table name="APP_DELEGATION">
<vendor type="mysql">
@@ -2014,7 +2014,7 @@
</vendor>
</index>
</table>
<table name="CASE_CONSOLIDATED">
<table name="CASE_CONSOLIDATED" referenceOnly="true">
<vendor type="mysql">
<parameter name="Name" value="CASE_CONSOLIDATED"/>
<parameter name="Engine" value="InnoDB"/>
@@ -5378,6 +5378,8 @@
<column name="NOT_DATA" type="LONGVARCHAR" required="true" />
<column name="NOT_STATUS" type="VARCHAR" size="150" required="true"/>
<column name="NOT_SEND_DATE" type="TIMESTAMP" required="true" />
<column name="APP_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<index name="indexNotStatus">
<index-column name="NOT_STATUS"/>
</index>

4
workflow/engine/controllers/dashboard.php
View File

@@ -173,7 +173,9 @@ class Dashboard extends Controller
//G::pr($this->pmDashlet->setup( $width ));die;
} catch (Exception $error) {
//ToDo: Show the error message
echo $error->getMessage();
$token = strtotime("now");
PMException::registerErrorLog($error, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
}
}

2
workflow/engine/data/mysql/schema.sql
View File

@@ -2998,6 +2998,8 @@ CREATE TABLE `NOTIFICATION_QUEUE`
`NOT_DATA` MEDIUMTEXT NOT NULL,
`NOT_STATUS` VARCHAR(150) NOT NULL,
`NOT_SEND_DATE` DATETIME NOT NULL,
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
PRIMARY KEY (`NOT_UID`),
KEY `indexNotStatus`(`NOT_STATUS`)
)ENGINE=InnoDB ;

8
workflow/engine/methods/dbConnections/dbConnectionsAjax.php
View File

@@ -185,6 +185,8 @@ switch ($action) {
$oContent->addContent( 'DBS_DESCRIPTION', '', $newid, SYS_LANG, $_POST['desc'] );
break;
case 'deleteDbConnection':
$result = new stdclass();
try {
$oDBSource = new DbSource();
$oContent = new Content();
@@ -343,8 +345,6 @@ switch ($action) {
}
break;
case 'showEncodes':
//G::LoadThirdParty( 'pear/json', 'class.json' );
//$oJSON =
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$engine = $_POST['engine'];
@@ -352,10 +352,10 @@ switch ($action) {
if ($engine != "0") {
$dbs = new dbConnections();
$var = Bootstrap::json_encode($dbs->getEncondeList($filter->xssFilterHard($engine)));
echo $var;
G::outRes($var);
} else {
echo '[["0","..."]]';
G::outRes('[["0","..."]]');
}
break;
}

5
workflow/engine/methods/outputdocs/outputdocs_Delete.php
View File

@@ -49,12 +49,15 @@ try {
//refresh dbarray with the last change in outputDocument
$oMap = new processMap();
$oCriteria = $oMap->getOutputDocumentsCriteria( $fields['PRO_UID'] );
$result = new stdClass();
$result->success = true;
$result->msg = G::LoadTranslation( 'ID_OUTPUTDOCUMENT_REMOVED' );
} catch (Exception $e) {
$result = new stdClass();
$result->success = false;
$result->msg = $e->getMessage();
//die($oException->getMessage());
}
print G::json_encode( $result );

5
workflow/engine/methods/processCategory/processCategory_Ajax.php
View File

@@ -174,7 +174,10 @@ if (isset( $_REQUEST['action'] )) {
$varEcho = '{success: true}';
G::outRes( $varEcho );
} catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}';
$token = strtotime("now");
PMException::registerErrorLog($ex, $token);
$resJson = '{success: false, error: ' . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . '}';
G::outRes( $resJson );
}
break;
default:

5
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -993,6 +993,9 @@ try {
die($sOutput);
}
} catch (Exception $oException) {
die($oException->getMessage() . "\n" . $oException->getTraceAsString());
$token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
}

4
workflow/engine/methods/services/upload.php
View File

@@ -161,7 +161,9 @@ if (isset( $_FILES ) && $_FILES["ATTACH_FILE"]["error"] == 0) {
}
//End plugin
} catch (Exception $e) {
print ($e->getMessage()) ;
$token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
}
}

4
workflow/engine/methods/users/users_Ajax.php
View File

@@ -92,12 +92,12 @@ try {
switch ((int) $_POST['TU_RELATION']) {
case 1:
$resh = htmlentities($oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
echo $res;
G::outRes($resh);
G::auditlog("AssignUserTask","Assign a User to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
case 2:
$resh = htmlentities($oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']), ENT_QUOTES | ENT_HTML5, 'UTF-8');
echo $resh;
G::outRes($resh);
G::auditlog("AssignGroupTask","Assign a Group to a Task -> ".$_POST['TAS_UID'].' User UID -> '.$_POST['USR_UID']);
break;
}

5
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -302,6 +302,8 @@ class Light
$response['caseIndex'] = $aData['INDEX'];
$response['caseNumber'] = $aData['CASE_NUMBER'];
//Log
\Bootstrap::registerMonolog('create-case', 200, "Create case", ['application_uid' => $aData['APPLICATION'], 'usr_uid' => $userId], SYS_SYS, 'mobileLogs.log');
} catch (Exception $e) {
$response['status'] = 'failure';
$response['message'] = $e->getMessage();
@@ -535,6 +537,9 @@ class Light
unset($array['message']);
unset($array['timestamp']);
}
//Log
\Bootstrap::registerMonolog('route-case', 200, 'Route case', ['application_uid' => $applicationUid, 'usr_uid' => $userUid], SYS_SYS, 'mobileLogs.log');
} catch (\Exception $e) {
throw $e;
}

4
workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
View File

@@ -226,6 +226,8 @@ class NotificationDevice
$arrayData['NOT_MSG'] = $message;
$arrayData['NOT_DATA'] = serialize($data);
$arrayData['NOT_STATUS'] = "pending";
$arrayData['APP_UID'] = $appFields['APP_UID'];
$arrayData['DEL_INDEX'] = $iNewDelIndex;
$notQueue = new \NotificationQueue();
$notQueue->create($arrayData);
}
@@ -237,6 +239,8 @@ class NotificationDevice
$arrayData['NOT_MSG'] = $message;
$arrayData['NOT_DATA'] = serialize($data);
$arrayData['NOT_STATUS'] = "pending";
$arrayData['APP_UID'] = $appFields['APP_UID'];
$arrayData['DEL_INDEX'] = $iNewDelIndex;
$notQueue = new \NotificationQueue();
$notQueue->create($arrayData);
}

14
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php
View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\BusinessModel\Migrator;
use ProcessMaker\BusinessModel;
/**
* The assignment rules migrator class.
* The container class that stores the import and export rules for assignment rules.
@@ -37,13 +38,22 @@ class AssignmentRulesMigrator implements Importable, Exportable
public function import($data, $replace)
{
try {
$workflowTaks = array();
$dummyTaskTypes = BusinessModel\Task::getDummyTypes();
foreach ($data['tasks'] as $key => $value) {
$arrayTaskData = $value;
if (!in_array($arrayTaskData["TAS_TYPE"], $dummyTaskTypes)) {
$workflowTaks[] = $arrayTaskData;
}
}
if ($replace) {
$this->processes->createTaskRows($data['tasks']);
$this->processes->createTaskRows($workflowTaks);
$this->processes->addNewGroupRow($data['groupwfs']);
$this->processes->removeTaskUserRows($data['tasks']);
$this->processes->createTaskUserRows($data['taskusers']);
} else {
$this->processes->addNewTaskRows($data['tasks']);
$this->processes->addNewTaskRows($workflowTaks);
$this->processes->addNewGroupRow($data['groupwfs']);
$this->processes->addNewTaskUserRows($data['taskusers']);
}

11
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php
View File

@@ -3,6 +3,7 @@
namespace ProcessMaker\BusinessModel\Migrator;
use ProcessMaker\Project\Adapter;
use ProcessMaker\BusinessModel;
use Symfony\Component\Config\Definition\Exception\Exception;
class ProcessDefinitionMigrator implements Importable, Exportable
@@ -53,7 +54,15 @@ class ProcessDefinitionMigrator implements Importable, Exportable
try {
//Workflow elements
$this->processes->updateProcessRow($data['workflow']['process']);
$this->processes->createTaskRows($data['workflow']['tasks']);
$workflowTaks = array();
$dummyTaskTypes = BusinessModel\Task::getDummyTypes();
foreach ($data['workflow']['tasks'] as $key => $value) {
$arrayTaskData = $value;
if (!in_array($arrayTaskData["TAS_TYPE"], $dummyTaskTypes)) {
$workflowTaks[] = $arrayTaskData;
}
}
$this->processes->createTaskRows($workflowTaks);
$this->processes->createLaneRows($data['workflow']['lanes']);
$this->processes->createGatewayRows($data['workflow']['gateways']);
$this->processes->createStepRows($data['workflow']['steps']);

53
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -1913,32 +1913,32 @@ class Task
throw $e;
}
}
public function getValidateSelfService($data)
{
$paused = false;
{
$paused = false;
$data = array_change_key_case($data, CASE_LOWER);
$sTaskUID = $data['act_uid'];
$sTaskUID = $data['act_uid'];
$caseType = isset($data['case_type']) ? ($data['case_type'] == 'assigned' ? $data['case_type'] : 'unassigned') : 'unassigned';
$response = new \stdclass();
$response = new \stdclass();
$oCriteria = new \Criteria();
$arrayCondition = array();
$arrayCondition = array();
$arrayCondition[] = array(\AppDelegationPeer::APP_UID, \AppDelayPeer::APP_UID);
$arrayCondition[] = array(\AppDelegationPeer::DEL_INDEX, \AppDelayPeer::APP_DEL_INDEX);
$oCriteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$oCriteria->add(\AppDelegationPeer::TAS_UID, $sTaskUID);
$oCriteria->add(\AppDelayPeer::APP_DISABLE_ACTION_USER, "0");
$oResult = \AppDelegationPeer::doSelectOne($oCriteria);
if(!empty($oResult)) {
$paused = true;
$arrayCondition[] = array(\AppDelegationPeer::DEL_INDEX, \AppDelayPeer::APP_DEL_INDEX);
$oCriteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$oCriteria->add(\AppDelegationPeer::TAS_UID, $sTaskUID);
$oCriteria->add(\AppDelayPeer::APP_DISABLE_ACTION_USER, "0");
$oResult = \AppDelegationPeer::doSelectOne($oCriteria);
if(!empty($oResult)) {
$paused = true;
}
$response->paused = $paused;
$oCriteria = new \Criteria();
$oCriteria->add(\AppDelegationPeer::DEL_THREAD_STATUS, "OPEN");
$oCriteria->add(\AppDelegationPeer::TAS_UID, $sTaskUID);
if($caseType == 'unassigned') {
if($caseType == 'unassigned') {
$oCriteria->add(\AppDelegationPeer::USR_UID, "", \Criteria::EQUAL);
}
$oApplication = \AppDelegationPeer::doSelectOne($oCriteria);
@@ -1949,4 +1949,27 @@ class Task
}
return $response;
}
/**
* Return a list of Dummy Types
*
* return array
*
* @access public
*/
public static function getDummyTypes(){
$aTypes = array(
"GATEWAYTOGATEWAY",
"WEBENTRYEVENT",
"END-MESSAGE-EVENT",
"START-MESSAGE-EVENT",
"INTERMEDIATE-THROW-MESSAGE-EVENT",
"INTERMEDIATE-CATCH-MESSAGE-EVENT",
"START-TIMER-EVENT",
"INTERMEDIATE-CATCH-TIMER-EVENT",
"END-EMAIL-EVENT",
"INTERMEDIATE-THROW-EMAIL-EVENT"
);
return $aTypes;
}
}

16
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -531,23 +531,11 @@ abstract class Importer
//Update
$workflow = \ProcessMaker\Project\Workflow::load($projectUid);
$dummyTaskTypes = \ProcessMaker\BusinessModel\Task::getDummyTypes();
foreach ($arrayWorkflowTables["tasks"] as $key => $value) {
$arrayTaskData = $value;
if (!in_array($arrayTaskData["TAS_TYPE"], array(
"GATEWAYTOGATEWAY",
"WEBENTRYEVENT",
"END-MESSAGE-EVENT",
"START-MESSAGE-EVENT",
"INTERMEDIATE-THROW-MESSAGE-EVENT",
"INTERMEDIATE-CATCH-MESSAGE-EVENT",
"START-TIMER-EVENT",
"INTERMEDIATE-CATCH-TIMER-EVENT",
"END-EMAIL-EVENT",
"INTERMEDIATE-THROW-EMAIL-EVENT"
))
) {
if ( !in_array($arrayTaskData["TAS_TYPE"], $dummyTaskTypes) ) {
$result = $workflow->updateTask($arrayTaskData["TAS_UID"], $arrayTaskData);
}
}

58
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -32,8 +32,8 @@ class Cases extends Api
/**
* Get list Cases To Do
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -79,8 +79,8 @@ class Cases extends Api
/**
* Get list Cases To Do with paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -125,8 +125,8 @@ class Cases extends Api
/**
* Get list Cases Draft
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -171,8 +171,8 @@ class Cases extends Api
/**
* Get list Cases Draft with paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -217,8 +217,8 @@ class Cases extends Api
/**
* Get list Cases Participated
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -263,8 +263,8 @@ class Cases extends Api
/**
* Get list Cases Participated with paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -309,8 +309,8 @@ class Cases extends Api
/**
* Get list Cases Unassigned
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -355,8 +355,8 @@ class Cases extends Api
/**
* Get list Cases Unassigned with paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -401,8 +401,8 @@ class Cases extends Api
/**
* Get list Cases Paused
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -447,8 +447,8 @@ class Cases extends Api
/**
* Get list Cases Paused with paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -493,8 +493,8 @@ class Cases extends Api
/**
* Get list Cases Advanced Search
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -551,8 +551,8 @@ class Cases extends Api
/**
* Get list Cases Advanced Search with Paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $cat_uid {@from path}
@@ -862,7 +862,7 @@ class Cases extends Api
* @param string $app_uid {@min 1}{@max 32}
* @param array $request_data
* @param string $dyn_uid {@from path}
* @param string $del_index {@from path}
* @param int $del_index {@from path}
*
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
* @copyright Colosa - Bolivia
@@ -884,8 +884,8 @@ class Cases extends Api
/**
* Get Case Notes
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $usr_uid {@from path}
@@ -934,8 +934,8 @@ class Cases extends Api
/**
* Get Case Notes with Paged
*
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $usr_uid {@from path}

8
workflow/engine/src/ProcessMaker/Services/Api/Consolidated.php
View File

@@ -84,8 +84,8 @@ class Consolidated extends Api
* @param string $tas_uid {@min 1} {@max 32}
* @param string $dyn_uid {@min 1} {@max 32}
* @param string $pro_uid {@min 1} {@max 32}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $search {@from path}
* @return array
*
@@ -94,7 +94,7 @@ class Consolidated extends Api
*
* @url GET /cases/:tas_uid/:dyn_uid/:pro_uid
*/
public function doGetCasesConsolidated($tas_uid, $dyn_uid, $pro_uid, $start = '', $limit = '', $search = '')
public function doGetCasesConsolidated($tas_uid, $dyn_uid, $pro_uid, $start = 0, $limit = 0, $search = '')
{
try {
$usr_uid = $this->getUserId();
@@ -135,7 +135,7 @@ class Consolidated extends Api
*
* @param string $app_uid {@min 1} {@max 32}
* @param string $app_number
* @param string $del_index
* @param int $del_index
* @param string $field_grid
* @param string $field_grid_val
* @return array

6
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -1264,8 +1264,8 @@ class Light extends Api
* Get Case Notes
*
* @param string $app_uid {@min 1}{@max 32}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $usr_uid {@from path}
@@ -1535,7 +1535,7 @@ class Light extends Api
* @param string $app_uid {@min 1}{@max 32}
* @param array $request_data
* @param string $dyn_uid {@from path}
* @param string $del_index {@from path}
* @param int $del_index {@from path}
*
* @url PUT /:app_uid/variable
*/

64
workflow/engine/src/ProcessMaker/Services/Api/Lists.php
View File

@@ -28,10 +28,10 @@ class Lists extends Api
/**
* Get list Inbox
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -137,10 +137,10 @@ class Lists extends Api
/**
* Get list Participated Last
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -243,10 +243,10 @@ class Lists extends Api
/**
* Get list Participated History
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -350,10 +350,10 @@ class Lists extends Api
/**
* Get list Paused
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -456,10 +456,10 @@ class Lists extends Api
/**
* Get list Canceled
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -561,10 +561,10 @@ class Lists extends Api
/**
* Get List Completed
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -666,10 +666,10 @@ class Lists extends Api
/**
* Get List Completed
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}
@@ -770,10 +770,10 @@ class Lists extends Api
/**
* Get list Unassigned
*
* @param string $count {@from path}
* @param string $paged {@from path}
* @param string $start {@from path}
* @param string $limit {@from path}
* @param boolean $count {@from path}
* @param boolean $paged {@from path}
* @param int $start {@from path}
* @param int $limit {@from path}
* @param string $sort {@from path}
* @param string $dir {@from path}
* @param string $category {@from path}