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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Gustavo Cruz
2015-03-09 15:47:33 -04:00
parent 280e1326e2 1f99c5a471
commit cb9c21b92e
53 changed files with 1530 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php vendored
View File

@@ -36,8 +36,11 @@ function uploadContentFile()
$FileObject = $_FILES["upload_file"]; // find data on the file
$DestPath = sys_get_temp_dir();
$aux='';
$cadena=str_replace ("\r\n","",file_get_contents(htmlentities($FileObject['tmp_name'])));
updateEditorContent(trim($cadena));
$chain = preg_replace("/\r\n+|\r+|\n+|\t+/i", ' ', file_get_contents(htmlentities($FileObject['tmp_name'])));
$chain=preg_replace('#<head(.*?)>(.*?)</head>#is', ' ', $chain);
$chain=strip_tags($chain, '<address><label><canvas><option><ol><u><textarea><em><h1><h2><h3><h4><h5><h6><section><tbody><tr><th><td><hr><center><br><b><img><p><a><table><caption><thead><div><ul><li><form><input><strong><span><small><button><figure>');
$chain=str_replace ('"',"'",$chain);
updateEditorContent(trim($chain));
closeWindow();
}

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

@@ -350,13 +350,17 @@ Bootstrap::registerClass('Xml_Node', PATH_GULLIVER . "class.xmlDocume
Bootstrap::registerClass('wsResponse', PATH_HOME . "engine/classes/class.wsResponse.php");
Bootstrap::registerClass('PMLicensedFeatures', PATH_HOME . "engine/classes/class.LicensedFeatures.php");
Bootstrap::registerClass('AddonsManagerPeer', PATH_HOME . "engine/classes/model/AddonsManagerPeer.php");
Bootstrap::registerClass("PMLicensedFeatures", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.licensedFeatures.php");
Bootstrap::registerClass("AddonsManagerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AddonsManagerPeer.php");
Bootstrap::registerClass("BaseEmailServer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEmailServer.php");
Bootstrap::registerClass("EmailServer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "EmailServer.php");
Bootstrap::registerClass("BaseEmailServerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "BaseEmailServerPeer.php");
Bootstrap::registerClass("EmailServerPeer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "EmailServerPeer.php");
$arrayClass = array("EmailServer", "ListInbox", "ListParticipatedHistory");
foreach ($arrayClass as $value) {
Bootstrap::registerClass("Base" . $value, PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "Base" . $value . ".php");
Bootstrap::registerClass($value, PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . $value . ".php");
Bootstrap::registerClass("Base" . $value . "Peer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "om" . PATH_SEP . "Base" . $value . "Peer.php");
Bootstrap::registerClass($value . "Peer", PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . $value . "Peer.php");
}
G::LoadClass("serverConfiguration");
G::LoadClass("dates"); //Load Criteria

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

@@ -1,4 +1,4 @@
<?php
<?php
/**
* cliWorkspaces.php
*
@@ -199,6 +199,19 @@ EOT
);
CLI::taskArg("workspace-name", true, true);
CLI::taskRun("run_check_workspace_disabled_code");
CLI::taskName('migrate-new-cases-lists');
CLI::taskDescription(<<<EOT
Migrating the list cases schema to match the latest version
  Specify the WORKSPACE to migrate from a existing workspace.
If no workspace is specified, then the tables schema will be upgraded or
migrate on all available workspaces.
EOT
);
CLI::taskArg('workspace', true, true);
CLI::taskRun("run_migrate_new_cases_lists");
/*----------------------------------********---------------------------------*/
/**
@@ -286,6 +299,10 @@ function run_database_check($args, $opts) {
database_upgrade("check", $args);
}
function run_migrate_new_cases_lists($args, $opts) {
migrate_new_cases_lists("migrate", $args);
}
function database_upgrade($command, $args) {
$workspaces = get_workspaces_from_args($args);
$checkOnly = (strcmp($command, "check") == 0);
@@ -642,4 +659,39 @@ function run_check_workspace_disabled_code($args, $opts)
echo CLI::error($e->getMessage()) . "\n";
}
}
/*----------------------------------********---------------------------------*/
function migrate_new_cases_lists($command, $args) {
$workspaces = get_workspaces_from_args($args);
$checkOnly = (strcmp($command, "migrate") == 0);
foreach ($workspaces as $workspace) {
if ($checkOnly){
print_r("Checking database in ".pakeColor::colorize($workspace->name, "INFO")."\n");
} else {
print_r("Upgrading database in ".pakeColor::colorize($workspace->name, "INFO")."\n");
}
try {
$ws = $workspace->name;
$sContent = file_get_contents (PATH_DB . $ws . PATH_SEP . 'db.php');
if (strpos($sContent, 'rb_')) {
$workspace->onedb = false;
} else {
$workspace->onedb = true;
}
//check if is the tables List are empty
$changes = $workspace->listFirstExecution('check');
if ($workspace->onedb && $changes != true) {
$workspace->migrateList($workspace->name);
}
if ($changes) {
if ($checkOnly) {
echo "-> List tables are done\n";
}
} else {
echo "> List tables are done\n";
}
} catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n";
}
}
}
/*----------------------------------********---------------------------------*/

21
workflow/engine/classes/class.case.php
View File

@@ -992,12 +992,11 @@ class Cases
if (isset($Fields["APP_STATUS"]) && $Fields["APP_STATUS"] == "COMPLETED") {
if (isset($Fields['CURRENT_USER_UID'])) {
$Fields['USR_UID'] = $Fields['CURRENT_USER_UID'];
/*This "list" code is discussed to operate with sub-processes. It should adjust the code for operation with sub-processes.
$listCompleted = new ListCompleted();
$listCompleted->create($Fields);
$listMyInbox = new ListMyInbox();
$listMyInbox->refresh($Fields);*/
}
/*----------------------------------********---------------------------------*/
$completed = new ListCompleted();
$completed->create($Fields);
/*----------------------------------********---------------------------------*/
}
$oApp->update($Fields);
@@ -2040,6 +2039,18 @@ class Cases
if ($this->appSolr != null) {
$this->appSolr->updateApplicationSearchIndex($sAppUid);
}
/*----------------------------------********---------------------------------*/
$Fields['TAS_UID'] = $sTasUid;
$Fields['USR_UID'] = $sUsrUid;
$Fields['DEL_INDEX'] = $iDelIndex;
$Fields['APP_STATUS'] = 'TO_DO';
if(!$isSubprocess){
$Fields['APP_STATUS'] = 'DRAFT';
}
$inbox = new ListInbox();
$inbox->newRow($Fields, $sUsrUid);
/*----------------------------------********---------------------------------*/
} catch (exception $e) {
throw ($e);
}

2
workflow/engine/classes/class.configuration.php
View File

@@ -778,7 +778,7 @@ class Configurations // extends Configuration
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_TASK") : "ID_TASK", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_CURRENT_USER") : "ID_CURRENT_USER", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_LAST_MODIFY") : "ID_LAST_MODIFY", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_DEL_THREAD_STATUS") : "ID_DEL_THREAD_STATUS", "dataIndex" => "DEL_THREAD_STATUS", "width" => 50);
$caseColumns[] = array("header" => ($translation == 1) ? G::LoadTranslation("ID_STATUS") : "ID_STATUS", "dataIndex" => "APP_STATUS_LABEL", "width" => 50);
$caseReaderFields[] = array("name" => "APP_UID");
$caseReaderFields[] = array("name" => "USR_UID");

11
workflow/engine/classes/class.derivation.php
View File

@@ -748,8 +748,17 @@ class Derivation
//SETS THE APP_PROC_CODE
//if (isset($nextDel['TAS_DEF_PROC_CODE']))
//$appFields['APP_PROC_CODE'] = $nextDel['TAS_DEF_PROC_CODE'];
unset( $aSP );
/*----------------------------------********---------------------------------*/
if (!empty($iNewDelIndex) && empty($aSP)) {
$oAppDel = AppDelegationPeer::retrieveByPK( $appFields['APP_UID'], $iNewDelIndex );
$aFields = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['APP_STATUS'] = $currentDelegation['APP_STATUS'];
$inbox = new ListInbox();
$inbox->newRow($aFields, $nextDel['USR_UID']);
}
/*----------------------------------********---------------------------------*/
unset( $aSP );
} //end foreach

75
workflow/engine/classes/class.pmDynaform.php
View File

@@ -11,7 +11,6 @@ class pmDynaform
{
public static $instance = null;
private $debugMode = false;
public $dyn_uid = null;
public $record = null;
public $app_data = null;
@@ -88,17 +87,34 @@ class pmDynaform
}
}
//query & options
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "radio")) {
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "radio" || $value === "datetime")) {
if (!isset($json->data)) {
$json->data = array(
"value" => "",
"label" => ""
);
}
if (!isset($json->dbConnection))
$json->dbConnection = "none";
if (!isset($json->sql))
$json->sql = "";
if (!isset($json->options))
$json->options = array();
else {
//convert stdClass to array
$option = array();
foreach ($json->options as $valueOptions) {
array_push($option, array(
"value" => $valueOptions->value,
"label" => $valueOptions->label
));
}
$json->options = $option;
}
if ($json->dbConnection !== "none" && $json->sql !== "") {
$cnn = Propel::getConnection($json->dbConnection);
$stmt = $cnn->createStatement();
$rs = $stmt->executeQuery(\G::replaceDataField($json->sql, array()), \ResultSet::FETCHMODE_NUM);
$rs = $stmt->executeQuery(strtoupper($json->sql), \ResultSet::FETCHMODE_NUM);
while ($rs->next()) {
$row = $rs->getRow();
$option = array(
@@ -107,22 +123,40 @@ class pmDynaform
);
array_push($json->options, $option);
}
if (isset($json->options[0])) {
$json->data = $json->options[0];
}
}
if (isset($json->options[0])) {
$json->data = $json->options[0];
}
}
//data
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "checkbox" || $value === "radio")) {
if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "suggest" || $value === "dropdown" || $value === "checkbox" || $value === "radio" || $value === "datetime")) {
$json->data = array(
"value" => isset($this->data[$json->name]) ? $this->data[$json->name] : "",
"label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : ""
"value" => isset($this->data[$json->name]) ? $this->data[$json->name] : $json->data["value"],
"label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : $json->data["label"]
);
}
if ($key === "type" && ($value === "suggest")) {
if ($key === "type" && ($value === "checkbox")) {
$json->data = array(
"value" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : "",
"label" => isset($this->data[$json->name]) ? $this->data[$json->name] : ""
"value" => isset($this->data[$json->name]) ? $this->data[$json->name] : array(),
"label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : "[]"
);
}
if ($key === "type" && ($value === "file") && isset($this->app_data["APPLICATION"])) {
$oCriteria = new Criteria("workflow");
$oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
$oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
$oCriteria->add(AppDocumentPeer::APP_UID, $this->app_data["APPLICATION"]);
$oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
$rs = AppDocumentPeer::doSelectRS($oCriteria);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$links = array();
while ($rs->next()) {
$row = $rs->getRow();
array_push($links, "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"]);
}
$json->data = array(
"value" => $links,
"label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : "[]"
);
}
//grid
@@ -135,7 +169,7 @@ class pmDynaform
$cells = array();
foreach ($json->columns as $column) {
//data
if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown") {
if ($column->type === "checkbox" || $column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime") {
array_push($cells, array(
"value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : ""
@@ -217,14 +251,12 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file);
$this->debug();
echo $file;
exit();
}
public function printEdit($pm_run_outside_main_app, $application, $headData, $step_mode = 'EDIT')
{
error_log(print_r($this->app_data, true));
ob_clean();
$json = G::json_decode($this->record["DYN_CONTENT"]);
$this->jsonr($json);
@@ -263,8 +295,6 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file);
$this->debug();
echo $file;
exit();
}
@@ -300,7 +330,6 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file);
$this->debug();
echo $file;
exit();
}
@@ -317,7 +346,6 @@ class pmDynaform
$file = file_get_contents(PATH_HOME . 'public_html/lib/pmdynaform/build/pmdynaform.html');
$file = str_replace("{javascript}", $javascrip, $file);
$this->debug();
echo $file;
exit();
}
@@ -389,13 +417,4 @@ class pmDynaform
return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
}
private function debug()
{
if ($this->debugMode) {
echo "<pre>";
echo G::json_encode(array($this->app_data, $this->data));
echo "</pre>";
}
}
}

4
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2771,7 +2771,7 @@ function PMFUnpauseCase ($caseUid, $delIndex, $userUid)
*
* @method
*
* Add case note.
* Add a case note.
*
* @name PMFAddACaseNote
* @label PMF Add a case note
@@ -2783,7 +2783,7 @@ function PMFUnpauseCase ($caseUid, $delIndex, $userUid)
* @param string(32) | $userUid | ID user | The unique ID of the user who will add note case.
* @param string | $note | Note of the case | Note of the case.
* @param int | $sendMail = 1 | Send mail | Optional parameter. If set to 1, will send an email to all participants in the case.
* @return int | $result | Result of the add case note | Returns 1 if the note has been added to the case.; otherwise, returns 0 if an error occurred.
* @return int | $result | Result of the add a case note | Returns 1 if the note has been added to the case.; otherwise, returns 0 if an error occurred.
*
*/
function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)

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

@@ -1842,5 +1842,175 @@ class workspaceTools
throw $e;
}
}
/**
* Migrate all cases to New list
*
* return all LIST TABLES with data
*/
public function migrateList ($workSpace){
$this->initPropel(true);
$appCache = new AppCacheView();
G::LoadClass("case");
$case = new Cases();
//Select data CANCELLED
$canCriteria = $appCache->getSelAllColumns();
$canCriteria->add(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::EQUAL);
$canCriteria->add(AppCacheViewPeer::DEL_LAST_INDEX, "1", CRITERIA::EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($canCriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//Insert data LIST_CANCELED
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$listCanceled = new ListCanceled();
$listCanceled->remove($row["APP_UID"]);
$listCanceled->setDeleted(false);
$listCanceled->create($row);
}
CLI::logging("> Completed table LIST_CANCELED\n");
//Select data COMPLETED
$comCriteria = $appCache->getSelAllColumns();
$comCriteria->add(AppCacheViewPeer::APP_STATUS, "COMPLETED", CRITERIA::EQUAL);
$comCriteria->add(AppCacheViewPeer::DEL_LAST_INDEX, "1", CRITERIA::EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($comCriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//Insert new data LIST_COMPLETED
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$listCompleted = new ListCompleted();
$listCompleted->remove($row["APP_UID"]);
$listCompleted->setDeleted(false);
$listCompleted->create($row);
}
CLI::logging("> Completed table LIST_COMPLETED\n");
//Select data TO_DO OR DRAFT
$inbCriteria = $appCache->getSelAllColumns();
$inbCriteria->add(AppCacheViewPeer::APP_STATUS, "CANCELLED", CRITERIA::NOT_EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($inbCriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//Insert new data LIST_INBOX
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
if($row["DEL_THREAD_STATUS"] == 'OPEN'){
$listInbox = new ListInbox();
$listInbox->remove($row["APP_UID"],$row["DEL_INDEX"]);
$listInbox->setDeleted(false);
$listInbox->create($row);
} else {
// create participated List when the thread is CLOSED
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->remove($row['APP_UID'],$row['DEL_INDEX']);
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->create($row);
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->remove($row['APP_UID'], $row['USR_UID']);
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->create($row);
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->refresh($row);
}
}
CLI::logging("> Completed table LIST_INBOX\n");
//With this List is populated the LIST_PARTICIPATED_HISTORY and LIST_PARTICIPATED_LAST
CLI::logging("> Completed table LIST_PARTICIPATED_HISTORY\n");
CLI::logging("> Completed table LIST_PARTICIPATED_LAST\n");
//Select data TO_DO OR DRAFT CASES CREATED BY AN USER
$myiCriteria = $appCache->getSelAllColumns();
$myiCriteria->add(AppCacheViewPeer::DEL_INDEX, "1", CRITERIA::EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($myiCriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//Insert new data LIST_MY_INBOX
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$listMyInbox = new ListMyInbox();
$listMyInbox ->remove($row["APP_UID"],$row["USR_UID"]);
$listMyInbox->setDeleted(false);
$listMyInbox->create($row);
}
CLI::logging("> Completed table LIST_MY_INBOX\n");
//Select data PAUSED
$delaycriteria = new Criteria("workflow");
$delaycriteria->addSelectColumn(AppDelayPeer::APP_UID);
$delaycriteria->addSelectColumn(AppDelayPeer::PRO_UID);
$delaycriteria->addSelectColumn(AppDelayPeer::APP_DEL_INDEX);
$delaycriteria->addSelectColumn(AppCacheViewPeer::APP_NUMBER);
$delaycriteria->addJoin( AppCacheViewPeer::APP_UID, AppDelayPeer::APP_UID, Criteria::INNER_JOIN );
$rsCriteria = AppDelayPeer::doSelectRS($delaycriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
//Insert new data LIST_PAUSED
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$data = $row;
$data["DEL_INDEX"] = $row["APP_DEL_INDEX"];
$listPaused = new ListPaused();
$listPaused->remove($data["APP_UID"],$data["DEL_INDEX"]);
$listPaused->setDeleted(false);
$listPaused->create($data);
}
CLI::logging("> Completed table LIST_PAUSED\n");
//Select and Insert LIST_UNASSIGNED
$unaCriteria = $appCache->getSelAllColumns();
$unaCriteria->add(AppCacheViewPeer::USR_UID, "", CRITERIA::EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($unaCriteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$del = new ListUnassignedPeer();
$del->doDeleteAll();
$del = new ListUnassignedGroupPeer();
$del->doDeleteAll();
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$listUnassigned = new ListUnassigned();
$unaUid = $listUnassigned->generateData($row["APP_UID"],$row["PREVIOUS_USR_UID"]);
}
CLI::logging("> Completed table LIST_UNASSIGNED\n");
CLI::logging("> Completed table LIST_UNASSIGNED_GROUP\n");
$this->listFirstExecution('insert');
return true;
}
/**
* This function checks if List tables are going to migrated
*
* return boolean value
*/
public function listFirstExecution ($action){
$this->initPropel(true);
switch ($action) {
case 'insert':
$conf = new Configuration();
$data["CFG_UID"] ='MIGRATED_LIST';
$data["OBJ_UID"] ='list';
$data["CFG_VALUE"]='true';
$data["PRO_UID"] ='list';
$data["USR_UID"] ='list';
$data["APP_UID"] ='list';
$conf->create($data);
return true;
break;
case 'check':
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(ConfigurationPeer::CFG_UID);
$criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST", CRITERIA::EQUAL);
$rsCriteria = AppCacheViewPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRows = array ();
while ($rsCriteria->next()) {
$aRows[] = $rsCriteria->getRow();
}
if(empty($aRows)){
return false; //If is false continue with the migrated
} else {
return true; //Stop
}
break;
default:
return true;
}
}
}

40
workflow/engine/classes/model/AppCacheView.php
View File

@@ -1752,5 +1752,45 @@ class AppCacheView extends BaseAppCacheView
}
}
}
/**
* Get all columns by APP_CACHE_VIEW
*
* @return object criteria
*/
public function getSelAllColumns(){
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_LAST_INDEX);
$criteria->addSelectColumn(AppCacheViewPeer::APP_NUMBER);
$criteria->addSelectColumn(AppCacheViewPeer::APP_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::USR_UID);
$criteria->addSelectColumn(AppCacheViewPeer::PREVIOUS_USR_UID);
$criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
$criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELEGATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_TASK_DUE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISH_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_THREAD_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::APP_THREAD_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_CURRENT_USER);
$criteria->addSelectColumn(AppCacheViewPeer::APP_DEL_PREVIOUS_USER);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_PRIORITY);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_QUEUE_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELAY_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_STARTED);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISHED);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELAYED);
$criteria->addSelectColumn(AppCacheViewPeer::APP_CREATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_FINISH_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_UPDATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE);
return $criteria;
}
}

10
workflow/engine/classes/model/AppDelegation.php
View File

@@ -151,16 +151,6 @@ class AppDelegation extends BaseAppDelegation
if ($this->validate()) {
try {
$res = $this->save();
/*----------------------------------********---------------------------------*/
$task = TaskPeer::retrieveByPK( $this->getTasUid() );
$taskType = $task->getTasType();
if($taskType == 'NORMAL'){
$inbox = new ListInbox();
$res = $this->toArray(BasePeer::TYPE_FIELDNAME);
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
}
/*----------------------------------********---------------------------------*/
} catch (PropelException $e) {
throw ($e);
}

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

@@ -95,25 +95,27 @@ class CaseScheduler extends BaseCaseScheduler
$result = $this->save();
$con->commit();
//Add Audit Log
switch ($fields['SCH_OPTION']){
case '1':
$perform = 'Daily';
break;
case '2':
$perform = 'Weekly';
break;
case '3':
$perform = 'Monthly';
break;
case '4':
$perform = 'One time only';
break;
case '5':
$perform = 'Every';
break;
if (isset($fields['SCH_OPTION'])) {
//Add Audit Log
switch ($fields['SCH_OPTION']){
case '1':
$perform = 'Daily';
break;
case '2':
$perform = 'Weekly';
break;
case '3':
$perform = 'Monthly';
break;
case '4':
$perform = 'One time only';
break;
case '5':
$perform = 'Every';
break;
}
G::auditLog("UpdateCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$fields['SCH_START_DATE'].", End Date: ".$fields['SCH_END_DATE'].", Execution time : ".$fields['SCH_START_TIME']);
}
G::auditLog("UpdateCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$fields['SCH_START_DATE'].", End Date: ".$fields['SCH_END_DATE'].", Execution time : ".$fields['SCH_START_TIME']);
return $result;
} else {
@@ -369,11 +371,10 @@ class CaseScheduler extends BaseCaseScheduler
}
$sActualTime = $aRow['SCH_TIME_NEXT_RUN'];
$sActualDataHour = date( 'H', strtotime( $aRow['SCH_TIME_NEXT_RUN'] ) );
$sActualDataMinutes = date( 'i', strtotime( $aRow['SCH_TIME_NEXT_RUN'] ) );
$dActualSysHour = date( 'H', $nTime );
$dActualSysHour = ($dActualSysHour == '00') ? '24' : $dActualSysHour;
$dActualSysMinutes = date( 'i', $nTime );
$sActualDataHour = (int)(date("H", strtotime($aRow["SCH_TIME_NEXT_RUN"])));
$sActualDataMinutes = (int)(date("i", strtotime($aRow["SCH_TIME_NEXT_RUN"])));
$dActualSysHour = (int)(date("H", $nTime));
$dActualSysMinutes = (int)(date("i", $nTime));
$sActualDataTime = strtotime( $aRow['SCH_TIME_NEXT_RUN'] );
$sActualSysTime = strtotime( $nTime );

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

@@ -149,6 +149,34 @@ class GroupUser extends BaseGroupUser
}
}
return $rows;
}
/**
* Get all users assigned to Group
*
* @param string $gprUid
* @return array $rows
*/
public function getAllGroupUser ($gprUid)
{
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( GroupUserPeer::GRP_UID, $gprUid );
$oDataset = GroupUserPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rows = Array ();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$g = new Groupwf();
try {
$grpRow = $g->load( $row['GRP_UID'] );
$row = array_merge( $row, $grpRow );
$rows[] = $row;
} catch (Exception $e) {
continue;
}
}
return $rows;
}
}

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

@@ -73,6 +73,7 @@ class ListCompleted extends BaseListCompleted
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$data['DEL_PREVIOUS'] = isset($data['DEL_PREVIOUS']) ? $data['DEL_PREVIOUS'] : "";
if ($data['DEL_PREVIOUS'] != 0) {
$criteria = new Criteria();
@@ -85,6 +86,14 @@ class ListCompleted extends BaseListCompleted
$data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID'];
}
//Update - WHERE
$criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
//Update - SET
$criteriaSet = new Criteria("workflow");
$criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );

12
workflow/engine/classes/model/ListInbox.php
View File

@@ -39,6 +39,8 @@ class ListInbox extends BaseListInbox
// create participated history
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->remove($data['APP_UID'],$data['DEL_INDEX']);
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->create($data);
// create participated history
@@ -47,7 +49,7 @@ class ListInbox extends BaseListInbox
// remove and create participated last
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'],$data['DEL_INDEX']);
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']);
$listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->create($data);
$listParticipatedLast = new ListParticipatedLast();
@@ -139,8 +141,8 @@ class ListInbox extends BaseListInbox
}
}
public function newRow ($data, $delPreviusUsrUid) {
public function newRow ($data, $delPreviusUsrUid)
{
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
if (isset($data['DEL_TASK_DUE_DATE'])) {
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -208,10 +210,6 @@ class ListInbox extends BaseListInbox
$data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
}
if(!isset($data['APP_STATUS']) && $data['DEL_INDEX']>1){
$data['APP_STATUS'] = 'TO_DO';
}
self::create($data);
}

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

@@ -74,7 +74,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
* @throws type
*/
public function update($data)
{
{
$data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
@@ -130,12 +130,11 @@ class ListParticipatedLast extends BaseListParticipatedLast
* @throws type
*
*/
public function remove ($app_uid, $usr_uid, $del_index)
public function remove ($app_uid, $usr_uid)
{
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
$this->setDelIndex($del_index);
$this->setUsrUid($usr_uid);
$con->begin();

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

@@ -47,6 +47,7 @@ class ListPaused extends BaseListPaused {
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
$criteria = new Criteria();
$criteria->addSelectColumn(AppDelegationPeer::USR_UID);
$criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -58,6 +59,7 @@ class ListPaused extends BaseListPaused {
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['USR_UID'] = isset($data['USR_UID']) ? $data['USR_UID'] : $aRow['USR_UID'];
$data['TAS_UID'] = $aRow['TAS_UID'];
$data['DEL_INIT_DATE'] = $aRow['DEL_INIT_DATE'];
$data['DEL_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];

75
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -17,7 +17,7 @@ require_once 'classes/model/om/BaseListUnassigned.php';
class ListUnassigned extends BaseListUnassigned
{
/**
* Create List Inbox Table
* Create List Unassigned Table
*
* @param type $data
* @return type
@@ -44,7 +44,7 @@ class ListUnassigned extends BaseListUnassigned
}
/**
* Update List Inbox Table
* Update List Unassigned Table
*
* @param type $data
* @return type
@@ -72,19 +72,18 @@ class ListUnassigned extends BaseListUnassigned
}
/**
* Remove List Inbox
* Remove List Unassigned
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function remove ($app_uid, $del_index)
public function remove ($app_uid)
{
$con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
$this->setDelIndex($del_index);
$con->begin();
$this->delete();
@@ -96,6 +95,7 @@ class ListUnassigned extends BaseListUnassigned
}
public function newRow ($data, $delPreviusUsrUid) {
$data['UNA_UID'] = (isset($data['UNA_UID'])) ? $data['UNA_UID']: G::GenerateUniqueId() ;
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -163,6 +163,7 @@ class ListUnassigned extends BaseListUnassigned
}
self::create($data);
return $data['UNA_UID'];
}
public function loadFilters (&$criteria, $filters)
@@ -315,5 +316,69 @@ class ListUnassigned extends BaseListUnassigned
}
return $resp;
}
/**
* Generate Data
*
* @return object criteria
*/
public function generateData($appUid,$delPreviusUsrUid){
try {
G::LoadClass("case");
//Generate data
$case = new Cases();
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(AppDelegationPeer::APP_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
$criteria->addSelectColumn(ApplicationPeer::APP_DATA);
$criteria->addSelectColumn(AppDelegationPeer::PRO_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
$criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->addSelectColumn(TaskPeer::TAS_GROUP_VARIABLE);
$criteria->addJoin(AppDelegationPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
$criteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$criteria->add(TaskPeer::TAS_ASSIGN_TYPE, "SELF_SERVICE", Criteria::EQUAL);
//$criteria->add(TaskPeer::TAS_GROUP_VARIABLE, "", Criteria::NOT_EQUAL);
$criteria->add(AppDelegationPeer::USR_UID, "", Criteria::EQUAL);
$criteria->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN", Criteria::EQUAL);
$criteria->add(AppDelegationPeer::APP_UID, $appUid, Criteria::EQUAL);
$rsCriteria = AppDelegationPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$applicationData = $case->unserializeData($row["APP_DATA"]);
$taskGroupVariable = trim($row["TAS_GROUP_VARIABLE"], " @#");
$delPreviusUsrUid = '';
$unaUid = $this->newRow($row,$delPreviusUsrUid);
//Selfservice by group
if ($taskGroupVariable != "" && isset($applicationData[$taskGroupVariable]) && trim($applicationData[$taskGroupVariable]) != "") {
$gprUid = trim($applicationData[$taskGroupVariable]);
//Define Users by Group
$gpr = new GroupUser();
$arrayUsers = $gpr->getAllGroupUser($gprUid);
foreach($arrayUsers as $urow){
$newRow["USR_UID"] = $urow["USR_UID"];
$listUnassignedGpr = new ListUnassignedGroup();
$listUnassignedGpr->newRow($unaUid,$urow["USR_UID"],"GROUP",$gprUid);
}
} else {
//Define all users assigned to Task
$task = new TaskUser();
$arrayUsers = $task->getAllUsersTask($row["TAS_UID"]);
foreach($arrayUsers as $urow){
$newRow["USR_UID"] = $urow["USR_UID"];
$listUnassignedGpr = new ListUnassignedGroup();
$listUnassignedGpr->newRow($unaUid,$urow["USR_UID"],"USER","");
}
}
}
} catch (Exception $e) {
throw $e;
}
}
}

90
workflow/engine/classes/model/ListUnassignedGroup.php
View File

@@ -15,5 +15,95 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php';
* @package classes.model
*/
class ListUnassignedGroup extends BaseListUnassignedGroup {
/**
* Create List Unassigned Group Table
*
* @param type $data
* @return type
*
*/
public function create($data)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) {
$result = $this->save();
} else {
$e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
$e->aValidationFailures = $this->getValidationFailures();
throw ($e);
}
$con->commit();
return $result;
} catch(Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* Update List Unassigned Group Table
*
* @param type $data
* @return type
* @throws type
*/
public function update($data)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$con->begin();
$this->setNew( false );
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) {
$result = $this->save();
$con->commit();
return $result;
} else {
$con->rollback();
throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
}
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* Remove List Unassigned Group
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function remove ($app_uid,$una_uid)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
$this->setUnaUid($una_uid);
$con->begin();
$this->delete();
$con->commit();
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* newRow List Unassigned Group
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function newRow($unaUid, $usrUid, $type, $typeUid=''){
$data['UNA_UID'] = $unaUid;
$data['USR_UID'] = $usrUid;
$data['TYPE'] = $type;
$data['TYP_UID'] = $typeUid;
self::create($data);
}
} // ListUnassignedGroup

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

@@ -194,5 +194,46 @@ class TaskUser extends BaseTaskUser
return $result;
}
/**
* Get All users assigned to task
*
* @param string $TAS_UID
* @return array users info
*
*/
public function getAllUsersTask ($TAS_UID)
{
require_once 'classes/model/Users.php';
$groupsTask = array ();
$usersTask = array ();
//getting task's users
$criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
$criteria->addSelectColumn( UsersPeer::USR_LASTNAME );
$criteria->addSelectColumn( UsersPeer::USR_USERNAME );
$criteria->addSelectColumn( TaskUserPeer::TAS_UID );
$criteria->addSelectColumn( TaskUserPeer::USR_UID );
$criteria->addSelectColumn( TaskUserPeer::TU_TYPE );
$criteria->addSelectColumn( TaskUserPeer::TU_RELATION );
$criteria->addJoin( TaskUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$criteria->add( TaskUserPeer::TAS_UID, $TAS_UID );
$dataset = TaskUserPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dataset->next()) {
$row = $dataset->getRow();
if($row["TU_RELATION"] == 2){
$gpr = new GroupUser();
$array = $gpr->getAllGroupUser($row["USR_UID"]);
foreach($array as $urow){
$usersTask[] = $urow;
}
}else{
$usersTask[] = $row;
}
}
return $usersTask;
}
}

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

@@ -385,5 +385,59 @@ class Users extends BaseUsers
} while ($aFields['USR_STATUS'] != 'ACTIVE');
return $aFields;
}
public function refreshTotal ($userId, $type = 'add', $list = "inbox", $total = 1)
{
$nameList = self::getNameTotal($list);
$criteria = new Criteria();
$criteria->addSelectColumn( $nameList );
$criteria->add( UsersPeer::USR_UID, $userId, Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$num = $aRow[$nameList];
if ($type == 'add') {
$num++;
} else {
$num--;
}
$data = array(
'USR_UID' => $userId,
$nameList => $num
);
self::update($data);
}
public function getNameTotal($list = "inbox")
{
switch ($list) {
case 'draft':
$return = 'USR_TOTAL_DRAFT';
break;
case 'canceled':
$return = 'USR_TOTAL_CANCELLED';
break;
case 'participated':
$return = 'USR_TOTAL_PARTICIPATED';
break;
case 'paused':
$return = 'USR_TOTAL_PAUSED';
break;
case 'completed':
$return = 'USR_TOTAL_COMPLETED';
break;
case 'unassigned':
$return = 'USR_TOTAL_UNASSIGNED';
break;
case 'inbox':
default:
$return = 'USR_TOTAL_INBOX';
break;
}
return $return;
}
}

6
workflow/engine/classes/model/map/ListInboxMapBuilder.php
View File

@@ -3,6 +3,7 @@
require_once 'propel/map/MapBuilder.php';
include_once 'creole/CreoleTypes.php';
/**
* This class adds structure of 'LIST_INBOX' table to 'workflow' DatabaseMap object.
*
@@ -15,7 +16,6 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ListInboxMapBuilder
{
@@ -76,8 +76,8 @@ class ListInboxMapBuilder
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255);

12
workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php
View File

@@ -3,6 +3,7 @@
require_once 'propel/map/MapBuilder.php';
include_once 'creole/CreoleTypes.php';
/**
* This class adds structure of 'LIST_PARTICIPATED_LAST' table to 'workflow' DatabaseMap object.
*
@@ -15,7 +16,6 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class ListParticipatedLastMapBuilder
{
@@ -66,11 +66,11 @@ class ListParticipatedLastMapBuilder
$tMap->setUseIdGenerator(false);
$tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addPrimaryKey('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32);
@@ -106,8 +106,8 @@ class ListParticipatedLastMapBuilder
$tMap->addColumn('DEL_DUE_DATE', 'DelDueDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, true, 32);
} // doBuild()

14
workflow/engine/classes/model/map/UsersMapBuilder.php
View File

@@ -117,6 +117,20 @@ class UsersMapBuilder
$tMap->addColumn('USR_UX', 'UsrUx', 'string', CreoleTypes::VARCHAR, false, 128);
$tMap->addColumn('USR_TOTAL_INBOX', 'UsrTotalInbox', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_DRAFT', 'UsrTotalDraft', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_CANCELLED', 'UsrTotalCancelled', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_PARTICIPATED', 'UsrTotalParticipated', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_PAUSED', 'UsrTotalPaused', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_COMPLETED', 'UsrTotalCompleted', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('USR_TOTAL_UNASSIGNED', 'UsrTotalUnassigned', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addValidator('USR_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|VACATION|CLOSED', 'Please select a valid type.');
$tMap->addValidator('USR_STATUS', 'required', 'propel.validator.RequiredValidator', '', 'Type is required.');

6
workflow/engine/classes/model/om/BaseHolidayPeer.php
View File

@@ -8,7 +8,7 @@ include_once 'classes/model/Holiday.php';
/**
* Base static class for performing query and update operations on the 'HOLIDAY' table.
*
*
*
*
* @package workflow.classes.model.om
*/
@@ -348,8 +348,8 @@ abstract class BaseHolidayPeer
$criteria = $values->buildCriteria(); // build Criteria from Holiday object
}
$criteria->remove(HolidayPeer::HLD_UID); // remove pkey col since this table uses auto-increment
//$criteria->remove(HolidayPeer::HLD_UID); // remove pkey col since this table uses auto-increment
// Set the correct dbName
$criteria->setDbName(self::DATABASE_NAME);

26
workflow/engine/classes/model/om/BaseListInbox.php
View File

@@ -9,15 +9,13 @@ include_once 'propel/util/Criteria.php';
include_once 'classes/model/ListInboxPeer.php';
/**
* Base class that represents a row from the 'LIST_INBOX' table.
*
*
*
* @package workflow.classes.model.om
*/
*/
abstract class BaseListInbox extends BaseObject implements Persistent
{
@@ -64,12 +62,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent
* @var int
*/
protected $app_number = 0;
/**
* The value for the app_status field.
* @var string
*/
protected $app_status = '';
protected $app_status = '0';
/**
* The value for the app_title field.
@@ -222,7 +220,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
return $this->app_number;
}
/**
* Get the [app_status] column value.
*
@@ -581,7 +579,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
}
} // setAppNumber()
/**
* Set the value of [app_status] column.
*
@@ -597,12 +595,13 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->app_status !== $v || $v === '') {
if ($this->app_status !== $v || $v === '0') {
$this->app_status = $v;
$this->modifiedColumns[] = ListInboxPeer::APP_STATUS;
}
} // setAppStatus()
/**
* Set the value of [app_title] column.
*
@@ -923,7 +922,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$this->pro_uid = $rs->getString($startcol + 4);
$this->app_number = $rs->getInt($startcol + 5);
$this->app_status = $rs->getString($startcol + 6);
$this->app_title = $rs->getString($startcol + 7);
@@ -955,7 +954,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 19; // 18 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 19; // 19 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating ListInbox object", $e);
@@ -1216,7 +1215,6 @@ abstract class BaseListInbox extends BaseObject implements Persistent
case 18:
return $this->getDelPriority();
break;
default:
return null;
break;
@@ -1390,7 +1388,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
if (array_key_exists($keys[5], $arr)) {
$this->setAppNumber($arr[$keys[5]]);
}
if (array_key_exists($keys[6], $arr)) {
$this->setAppStatus($arr[$keys[6]]);
}
@@ -1477,7 +1475,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
if ($this->isColumnModified(ListInboxPeer::APP_NUMBER)) {
$criteria->add(ListInboxPeer::APP_NUMBER, $this->app_number);
}
if ($this->isColumnModified(ListInboxPeer::APP_STATUS)) {
$criteria->add(ListInboxPeer::APP_STATUS, $this->app_status);
}
@@ -1603,7 +1601,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent
$copyObj->setProUid($this->pro_uid);
$copyObj->setAppNumber($this->app_number);
$copyObj->setAppStatus($this->app_status);
$copyObj->setAppTitle($this->app_title);

17
workflow/engine/classes/model/om/BaseListInboxPeer.php
View File

@@ -1,20 +1,17 @@
<?php
require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by ListInboxPeer::getOMClass()
include_once 'classes/model/ListInbox.php';
/**
* Base static class for performing query and update operations on the 'LIST_INBOX' table.
*
*
*
* @package workflow.classes.model.om
*/
*/
abstract class BaseListInboxPeer
{
@@ -28,7 +25,7 @@ abstract class BaseListInboxPeer
const CLASS_DEFAULT = 'classes.model.ListInbox';
/** The total number of columns. */
const NUM_COLUMNS = 18;
const NUM_COLUMNS = 19;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -51,7 +48,7 @@ abstract class BaseListInboxPeer
/** the column name for the APP_NUMBER field */
const APP_NUMBER = 'LIST_INBOX.APP_NUMBER';
/** the column name for the APP_STATUS field */
const APP_STATUS = 'LIST_INBOX.APP_STATUS';
@@ -102,7 +99,7 @@ abstract class BaseListInboxPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus','AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ),
BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_PRIORITY, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
@@ -115,10 +112,10 @@ abstract class BaseListInboxPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppUpdateDate' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, ),
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelPriority' => 18, ),
BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_PRIORITY => 18, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_PRIORITY' => 18, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 )
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, )
);
/**
@@ -230,7 +227,7 @@ abstract class BaseListInboxPeer
$criteria->addSelectColumn(ListInboxPeer::PRO_UID);
$criteria->addSelectColumn(ListInboxPeer::APP_NUMBER);
$criteria->addSelectColumn(ListInboxPeer::APP_STATUS);
$criteria->addSelectColumn(ListInboxPeer::APP_TITLE);

163
workflow/engine/classes/model/om/BaseListParticipatedLast.php
View File

@@ -9,15 +9,13 @@ include_once 'propel/util/Criteria.php';
include_once 'classes/model/ListParticipatedLastPeer.php';
/**
* Base class that represents a row from the 'LIST_PARTICIPATED_LAST' table.
*
*
*
* @package workflow.classes.model.om
*/
*/
abstract class BaseListParticipatedLast extends BaseObject implements Persistent
{
@@ -35,18 +33,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
*/
protected $app_uid = '';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/**
* The value for the usr_uid field.
* @var string
*/
protected $usr_uid = '';
/**
* The value for the del_index field.
* @var int
*/
protected $del_index = 0;
/**
* The value for the tas_uid field.
* @var string
@@ -154,12 +152,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
* @var string
*/
protected $del_priority = '3';
/**
* The value for the del_thread_status field.
* @var string
*/
protected $del_thread_status = '';
protected $del_thread_status = 'OPEN';
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -185,18 +183,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->app_uid;
}
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/**
* Get the [usr_uid] column value.
*
@@ -208,6 +195,17 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->usr_uid;
}
/**
* Get the [del_index] column value.
*
* @return int
*/
public function getDelIndex()
{
return $this->del_index;
}
/**
* Get the [tas_uid] column value.
*
@@ -284,7 +282,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->app_status;
}
/**
* Get the [del_previous_usr_uid] column value.
*
@@ -468,7 +466,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->del_priority;
}
/**
* Get the [del_thread_status] column value.
*
@@ -501,28 +499,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
}
} // 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[] = ListParticipatedLastPeer::DEL_INDEX;
}
} // setDelIndex()
/**
* Set the value of [usr_uid] column.
@@ -546,6 +522,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
} // setUsrUid()
/**
* 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[] = ListParticipatedLastPeer::DEL_INDEX;
}
} // setDelIndex()
/**
* Set the value of [tas_uid] column.
*
@@ -962,7 +960,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
}
} // setDelPriority()
/**
* Set the value of [del_thread_status] column.
*
@@ -1003,10 +1001,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
try {
$this->app_uid = $rs->getString($startcol + 0);
$this->del_index = $rs->getInt($startcol + 1);
$this->usr_uid = $rs->getString($startcol + 2);
$this->usr_uid = $rs->getString($startcol + 1);
$this->del_index = $rs->getInt($startcol + 2);
$this->tas_uid = $rs->getString($startcol + 3);
@@ -1020,7 +1018,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->app_tas_title = $rs->getString($startcol + 8);
$this->app_status = $rs->getString($startcol + 9);
$this->app_status = $rs->getString($startcol + 9);
$this->del_previous_usr_uid = $rs->getString($startcol + 10);
@@ -1043,7 +1041,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->del_due_date = $rs->getTimestamp($startcol + 19, null);
$this->del_priority = $rs->getString($startcol + 20);
$this->del_thread_status = $rs->getString($startcol + 21);
$this->resetModified();
@@ -1259,10 +1257,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
return $this->getAppUid();
break;
case 1:
return $this->getDelIndex();
return $this->getUsrUid();
break;
case 2:
return $this->getUsrUid();
return $this->getDelIndex();
break;
case 3:
return $this->getTasUid();
@@ -1284,7 +1282,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
break;
case 9:
return $this->getAppStatus();
break;
break;
case 10:
return $this->getDelPreviousUsrUid();
break;
@@ -1318,7 +1316,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
case 20:
return $this->getDelPriority();
break;
case 21:
case 21:
return $this->getDelThreadStatus();
break;
default:
@@ -1342,15 +1340,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$keys = ListParticipatedLastPeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getAppUid(),
$keys[1] => $this->getDelIndex(),
$keys[2] => $this->getUsrUid(),
$keys[1] => $this->getUsrUid(),
$keys[2] => $this->getDelIndex(),
$keys[3] => $this->getTasUid(),
$keys[4] => $this->getProUid(),
$keys[5] => $this->getAppNumber(),
$keys[6] => $this->getAppTitle(),
$keys[7] => $this->getAppProTitle(),
$keys[8] => $this->getAppTasTitle(),
$keys[9] => $this->getAppStatus(),
$keys[9] => $this->getAppStatus(),
$keys[10] => $this->getDelPreviousUsrUid(),
$keys[11] => $this->getDelPreviousUsrUsername(),
$keys[12] => $this->getDelPreviousUsrFirstname(),
@@ -1398,11 +1396,11 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$this->setAppUid($value);
break;
case 1:
$this->setDelIndex($value);
break;
case 2:
$this->setUsrUid($value);
break;
case 2:
$this->setDelIndex($value);
break;
case 3:
$this->setTasUid($value);
break;
@@ -1423,7 +1421,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
break;
case 9:
$this->setAppStatus($value);
break;
break;
case 10:
$this->setDelPreviousUsrUid($value);
break;
@@ -1486,13 +1484,13 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if (array_key_exists($keys[0], $arr)) {
$this->setAppUid($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
$this->setDelIndex($arr[$keys[1]]);
$this->setUsrUid($arr[$keys[1]]);
}
if (array_key_exists($keys[2], $arr)) {
$this->setUsrUid($arr[$keys[2]]);
$this->setDelIndex($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
@@ -1521,7 +1519,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if (array_key_exists($keys[9], $arr)) {
$this->setAppStatus($arr[$keys[9]]);
}
}
if (array_key_exists($keys[10], $arr)) {
$this->setDelPreviousUsrUid($arr[$keys[10]]);
@@ -1566,7 +1564,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if (array_key_exists($keys[20], $arr)) {
$this->setDelPriority($arr[$keys[20]]);
}
if (array_key_exists($keys[21], $arr)) {
$this->setDelThreadStatus($arr[$keys[21]]);
}
@@ -1585,15 +1583,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::APP_UID)) {
$criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) {
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
}
if ($this->isColumnModified(ListParticipatedLastPeer::USR_UID)) {
$criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) {
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
}
if ($this->isColumnModified(ListParticipatedLastPeer::TAS_UID)) {
$criteria->add(ListParticipatedLastPeer::TAS_UID, $this->tas_uid);
}
@@ -1620,7 +1618,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS)) {
$criteria->add(ListParticipatedLastPeer::APP_STATUS, $this->app_status);
}
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID)) {
$criteria->add(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, $this->del_previous_usr_uid);
@@ -1665,7 +1663,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PRIORITY)) {
$criteria->add(ListParticipatedLastPeer::DEL_PRIORITY, $this->del_priority);
}
if ($this->isColumnModified(ListParticipatedLastPeer::DEL_THREAD_STATUS)) {
$criteria->add(ListParticipatedLastPeer::DEL_THREAD_STATUS, $this->del_thread_status);
}
@@ -1687,7 +1685,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$criteria = new Criteria(ListParticipatedLastPeer::DATABASE_NAME);
$criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index);
$criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid);
return $criteria;
@@ -1703,10 +1700,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$pks = array();
$pks[0] = $this->getAppUid();
$pks[1] = $this->getDelIndex();
$pks[2] = $this->getUsrUid();
$pks[1] = $this->getUsrUid();
return $pks;
}
@@ -1721,10 +1716,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
{
$this->setAppUid($keys[0]);
$this->setDelIndex($keys[1]);
$this->setUsrUid($keys[2]);
$this->setUsrUid($keys[1]);
}
@@ -1741,6 +1734,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false)
{
$copyObj->setDelIndex($this->del_index);
$copyObj->setTasUid($this->tas_uid);
$copyObj->setProUid($this->pro_uid);
@@ -1755,8 +1750,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setAppStatus($this->app_status);
// $copyObj->setDelIndex($this->del_index);
$copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid);
$copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username);
@@ -1778,15 +1771,13 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setDelDueDate($this->del_due_date);
$copyObj->setDelPriority($this->del_priority);
$copyObj->setDelThreadStatus($this->del_thread_status);
$copyObj->setNew(true);
$copyObj->setAppUid(''); // this is a pkey column, so set to default value
$copyObj->setDelIndex(''); // this is a pkey column, so set to default value
$copyObj->setUsrUid(''); // this is a pkey column, so set to default value

48
workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php
View File

@@ -5,15 +5,13 @@ require_once 'propel/util/BasePeer.php';
// actual class may be a subclass -- as returned by ListParticipatedLastPeer::getOMClass()
include_once 'classes/model/ListParticipatedLast.php';
/**
* Base static class for performing query and update operations on the 'LIST_PARTICIPATED_LAST' table.
*
*
*
* @package workflow.classes.model.om
*/
*/
abstract class BaseListParticipatedLastPeer
{
@@ -27,7 +25,7 @@ abstract class BaseListParticipatedLastPeer
const CLASS_DEFAULT = 'classes.model.ListParticipatedLast';
/** The total number of columns. */
const NUM_COLUMNS = 21;
const NUM_COLUMNS = 22;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -35,13 +33,13 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the APP_UID field */
const APP_UID = 'LIST_PARTICIPATED_LAST.APP_UID';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX';
/** the column name for the USR_UID field */
const USR_UID = 'LIST_PARTICIPATED_LAST.USR_UID';
/** the column name for the DEL_INDEX field */
const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX';
/** the column name for the TAS_UID field */
const TAS_UID = 'LIST_PARTICIPATED_LAST.TAS_UID';
@@ -61,7 +59,7 @@ abstract class BaseListParticipatedLastPeer
const APP_TAS_TITLE = 'LIST_PARTICIPATED_LAST.APP_TAS_TITLE';
/** the column name for the APP_STATUS field */
const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS';
const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS';
/** the column name for the DEL_PREVIOUS_USR_UID field */
const DEL_PREVIOUS_USR_UID = 'LIST_PARTICIPATED_LAST.DEL_PREVIOUS_USR_UID';
@@ -95,8 +93,8 @@ abstract class BaseListParticipatedLastPeer
/** the column name for the DEL_PRIORITY field */
const DEL_PRIORITY = 'LIST_PARTICIPATED_LAST.DEL_PRIORITY';
/** the column name for the DEL_THREAD_STATUS field */
/** the column name for the DEL_THREAD_STATUS field */
const DEL_THREAD_STATUS = 'LIST_PARTICIPATED_LAST.DEL_THREAD_STATUS';
/** The PHP to DB Name Mapping */
@@ -110,9 +108,9 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelPriority', 'DelThreadStatus'),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', ),
BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelThreadStatus', ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
);
@@ -123,9 +121,9 @@ abstract class BaseListParticipatedLastPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 2, 'UsrUid' => 3, 'TasUid' => 4, 'ProUid' => 5, 'AppNumber' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, 'DelThreadStatus' => 21,),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::DEL_INDEX => 1, ListParticipatedLastPeer::USR_UID => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 17, ListParticipatedLastPeer::DEL_INIT_DATE => 18, ListParticipatedLastPeer::DEL_DUE_DATE => 19, ListParticipatedLastPeer::DEL_PRIORITY => 20, ListParticipatedLastPeer::DEL_THREAD_STATUS => 21, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_DELEGATE_DATE' => 17, 'DEL_INIT_DATE' => 18, 'DEL_DUE_DATE' => 19, 'DEL_PRIORITY' => 20, 'DEL_THREAD_STATUS' => 21, ),
BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'DelIndex' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, 'DelThreadStatus' => 21, ),
BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::DEL_INDEX => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 17, ListParticipatedLastPeer::DEL_INIT_DATE => 18, ListParticipatedLastPeer::DEL_DUE_DATE => 19, ListParticipatedLastPeer::DEL_PRIORITY => 20, ListParticipatedLastPeer::DEL_THREAD_STATUS => 21, ),
BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'DEL_INDEX' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_DELEGATE_DATE' => 17, 'DEL_INIT_DATE' => 18, 'DEL_DUE_DATE' => 19, 'DEL_PRIORITY' => 20, 'DEL_THREAD_STATUS' => 21, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
);
@@ -228,11 +226,11 @@ abstract class BaseListParticipatedLastPeer
{
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
$criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID);
$criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID);
@@ -245,7 +243,7 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
@@ -268,7 +266,7 @@ abstract class BaseListParticipatedLastPeer
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
}
@@ -485,9 +483,6 @@ abstract class BaseListParticipatedLastPeer
$comparison = $criteria->getComparison(ListParticipatedLastPeer::APP_UID);
$selectCriteria->add(ListParticipatedLastPeer::APP_UID, $criteria->remove(ListParticipatedLastPeer::APP_UID), $comparison);
$comparison = $criteria->getComparison(ListParticipatedLastPeer::DEL_INDEX);
$selectCriteria->add(ListParticipatedLastPeer::DEL_INDEX, $criteria->remove(ListParticipatedLastPeer::DEL_INDEX), $comparison);
$comparison = $criteria->getComparison(ListParticipatedLastPeer::USR_UID);
$selectCriteria->add(ListParticipatedLastPeer::USR_UID, $criteria->remove(ListParticipatedLastPeer::USR_UID), $comparison);
@@ -565,12 +560,10 @@ abstract class BaseListParticipatedLastPeer
$vals[0][] = $value[0];
$vals[1][] = $value[1];
$vals[2][] = $value[2];
}
$criteria->add(ListParticipatedLastPeer::APP_UID, $vals[0], Criteria::IN);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $vals[1], Criteria::IN);
$criteria->add(ListParticipatedLastPeer::USR_UID, $vals[2], Criteria::IN);
$criteria->add(ListParticipatedLastPeer::USR_UID, $vals[1], Criteria::IN);
}
// Set the correct dbName
@@ -636,14 +629,13 @@ abstract class BaseListParticipatedLastPeer
* @param Connection $con
* @return ListParticipatedLast
*/
public static function retrieveByPK($app_uid, $usr_uid, $del_index, $con = null)
public static function retrieveByPK($app_uid, $usr_uid, $con = null)
{
if ($con === null) {
$con = Propel::getConnection(self::DATABASE_NAME);
}
$criteria = new Criteria();
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$v = ListParticipatedLastPeer::doSelect($criteria, $con);

408
workflow/engine/classes/model/om/BaseUsers.php
View File

@@ -183,6 +183,48 @@ abstract class BaseUsers extends BaseObject implements Persistent
*/
protected $usr_ux = 'NORMAL';
/**
* The value for the usr_total_inbox field.
* @var int
*/
protected $usr_total_inbox = 0;
/**
* The value for the usr_total_draft field.
* @var int
*/
protected $usr_total_draft = 0;
/**
* The value for the usr_total_cancelled field.
* @var int
*/
protected $usr_total_cancelled = 0;
/**
* The value for the usr_total_participated field.
* @var int
*/
protected $usr_total_participated = 0;
/**
* The value for the usr_total_paused field.
* @var int
*/
protected $usr_total_paused = 0;
/**
* The value for the usr_total_completed field.
* @var int
*/
protected $usr_total_completed = 0;
/**
* The value for the usr_total_unassigned field.
* @var int
*/
protected $usr_total_unassigned = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -567,6 +609,83 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->usr_ux;
}
/**
* Get the [usr_total_inbox] column value.
*
* @return int
*/
public function getUsrTotalInbox()
{
return $this->usr_total_inbox;
}
/**
* Get the [usr_total_draft] column value.
*
* @return int
*/
public function getUsrTotalDraft()
{
return $this->usr_total_draft;
}
/**
* Get the [usr_total_cancelled] column value.
*
* @return int
*/
public function getUsrTotalCancelled()
{
return $this->usr_total_cancelled;
}
/**
* Get the [usr_total_participated] column value.
*
* @return int
*/
public function getUsrTotalParticipated()
{
return $this->usr_total_participated;
}
/**
* Get the [usr_total_paused] column value.
*
* @return int
*/
public function getUsrTotalPaused()
{
return $this->usr_total_paused;
}
/**
* Get the [usr_total_completed] column value.
*
* @return int
*/
public function getUsrTotalCompleted()
{
return $this->usr_total_completed;
}
/**
* Get the [usr_total_unassigned] column value.
*
* @return int
*/
public function getUsrTotalUnassigned()
{
return $this->usr_total_unassigned;
}
/**
* Set the value of [usr_uid] column.
*
@@ -1167,6 +1286,160 @@ abstract class BaseUsers extends BaseObject implements Persistent
} // setUsrUx()
/**
* Set the value of [usr_total_inbox] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalInbox($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->usr_total_inbox !== $v || $v === 0) {
$this->usr_total_inbox = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_INBOX;
}
} // setUsrTotalInbox()
/**
* Set the value of [usr_total_draft] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalDraft($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->usr_total_draft !== $v || $v === 0) {
$this->usr_total_draft = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_DRAFT;
}
} // setUsrTotalDraft()
/**
* Set the value of [usr_total_cancelled] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalCancelled($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->usr_total_cancelled !== $v || $v === 0) {
$this->usr_total_cancelled = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_CANCELLED;
}
} // setUsrTotalCancelled()
/**
* Set the value of [usr_total_participated] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalParticipated($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->usr_total_participated !== $v || $v === 0) {
$this->usr_total_participated = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_PARTICIPATED;
}
} // setUsrTotalParticipated()
/**
* Set the value of [usr_total_paused] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalPaused($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->usr_total_paused !== $v || $v === 0) {
$this->usr_total_paused = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_PAUSED;
}
} // setUsrTotalPaused()
/**
* Set the value of [usr_total_completed] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalCompleted($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->usr_total_completed !== $v || $v === 0) {
$this->usr_total_completed = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_COMPLETED;
}
} // setUsrTotalCompleted()
/**
* Set the value of [usr_total_unassigned] column.
*
* @param int $v new value
* @return void
*/
public function setUsrTotalUnassigned($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->usr_total_unassigned !== $v || $v === 0) {
$this->usr_total_unassigned = $v;
$this->modifiedColumns[] = UsersPeer::USR_TOTAL_UNASSIGNED;
}
} // setUsrTotalUnassigned()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -1236,12 +1509,26 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->usr_ux = $rs->getString($startcol + 25);
$this->usr_total_inbox = $rs->getInt($startcol + 26);
$this->usr_total_draft = $rs->getInt($startcol + 27);
$this->usr_total_cancelled = $rs->getInt($startcol + 28);
$this->usr_total_participated = $rs->getInt($startcol + 29);
$this->usr_total_paused = $rs->getInt($startcol + 30);
$this->usr_total_completed = $rs->getInt($startcol + 31);
$this->usr_total_unassigned = $rs->getInt($startcol + 32);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 26; // 26 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 33; // 33 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Users object", $e);
@@ -1523,6 +1810,27 @@ abstract class BaseUsers extends BaseObject implements Persistent
case 25:
return $this->getUsrUx();
break;
case 26:
return $this->getUsrTotalInbox();
break;
case 27:
return $this->getUsrTotalDraft();
break;
case 28:
return $this->getUsrTotalCancelled();
break;
case 29:
return $this->getUsrTotalParticipated();
break;
case 30:
return $this->getUsrTotalPaused();
break;
case 31:
return $this->getUsrTotalCompleted();
break;
case 32:
return $this->getUsrTotalUnassigned();
break;
default:
return null;
break;
@@ -1569,6 +1877,13 @@ abstract class BaseUsers extends BaseObject implements Persistent
$keys[23] => $this->getUsrReportsTo(),
$keys[24] => $this->getUsrReplacedBy(),
$keys[25] => $this->getUsrUx(),
$keys[26] => $this->getUsrTotalInbox(),
$keys[27] => $this->getUsrTotalDraft(),
$keys[28] => $this->getUsrTotalCancelled(),
$keys[29] => $this->getUsrTotalParticipated(),
$keys[30] => $this->getUsrTotalPaused(),
$keys[31] => $this->getUsrTotalCompleted(),
$keys[32] => $this->getUsrTotalUnassigned(),
);
return $result;
}
@@ -1678,6 +1993,27 @@ abstract class BaseUsers extends BaseObject implements Persistent
case 25:
$this->setUsrUx($value);
break;
case 26:
$this->setUsrTotalInbox($value);
break;
case 27:
$this->setUsrTotalDraft($value);
break;
case 28:
$this->setUsrTotalCancelled($value);
break;
case 29:
$this->setUsrTotalParticipated($value);
break;
case 30:
$this->setUsrTotalPaused($value);
break;
case 31:
$this->setUsrTotalCompleted($value);
break;
case 32:
$this->setUsrTotalUnassigned($value);
break;
} // switch()
}
@@ -1805,6 +2141,34 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->setUsrUx($arr[$keys[25]]);
}
if (array_key_exists($keys[26], $arr)) {
$this->setUsrTotalInbox($arr[$keys[26]]);
}
if (array_key_exists($keys[27], $arr)) {
$this->setUsrTotalDraft($arr[$keys[27]]);
}
if (array_key_exists($keys[28], $arr)) {
$this->setUsrTotalCancelled($arr[$keys[28]]);
}
if (array_key_exists($keys[29], $arr)) {
$this->setUsrTotalParticipated($arr[$keys[29]]);
}
if (array_key_exists($keys[30], $arr)) {
$this->setUsrTotalPaused($arr[$keys[30]]);
}
if (array_key_exists($keys[31], $arr)) {
$this->setUsrTotalCompleted($arr[$keys[31]]);
}
if (array_key_exists($keys[32], $arr)) {
$this->setUsrTotalUnassigned($arr[$keys[32]]);
}
}
/**
@@ -1920,6 +2284,34 @@ abstract class BaseUsers extends BaseObject implements Persistent
$criteria->add(UsersPeer::USR_UX, $this->usr_ux);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_INBOX)) {
$criteria->add(UsersPeer::USR_TOTAL_INBOX, $this->usr_total_inbox);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_DRAFT)) {
$criteria->add(UsersPeer::USR_TOTAL_DRAFT, $this->usr_total_draft);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_CANCELLED)) {
$criteria->add(UsersPeer::USR_TOTAL_CANCELLED, $this->usr_total_cancelled);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_PARTICIPATED)) {
$criteria->add(UsersPeer::USR_TOTAL_PARTICIPATED, $this->usr_total_participated);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_PAUSED)) {
$criteria->add(UsersPeer::USR_TOTAL_PAUSED, $this->usr_total_paused);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_COMPLETED)) {
$criteria->add(UsersPeer::USR_TOTAL_COMPLETED, $this->usr_total_completed);
}
if ($this->isColumnModified(UsersPeer::USR_TOTAL_UNASSIGNED)) {
$criteria->add(UsersPeer::USR_TOTAL_UNASSIGNED, $this->usr_total_unassigned);
}
return $criteria;
}
@@ -2024,6 +2416,20 @@ abstract class BaseUsers extends BaseObject implements Persistent
$copyObj->setUsrUx($this->usr_ux);
$copyObj->setUsrTotalInbox($this->usr_total_inbox);
$copyObj->setUsrTotalDraft($this->usr_total_draft);
$copyObj->setUsrTotalCancelled($this->usr_total_cancelled);
$copyObj->setUsrTotalParticipated($this->usr_total_participated);
$copyObj->setUsrTotalPaused($this->usr_total_paused);
$copyObj->setUsrTotalCompleted($this->usr_total_completed);
$copyObj->setUsrTotalUnassigned($this->usr_total_unassigned);
$copyObj->setNew(true);

53
workflow/engine/classes/model/om/BaseUsersPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseUsersPeer
const CLASS_DEFAULT = 'classes.model.Users';
/** The total number of columns. */
const NUM_COLUMNS = 26;
const NUM_COLUMNS = 33;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -109,6 +109,27 @@ abstract class BaseUsersPeer
/** the column name for the USR_UX field */
const USR_UX = 'USERS.USR_UX';
/** the column name for the USR_TOTAL_INBOX field */
const USR_TOTAL_INBOX = 'USERS.USR_TOTAL_INBOX';
/** the column name for the USR_TOTAL_DRAFT field */
const USR_TOTAL_DRAFT = 'USERS.USR_TOTAL_DRAFT';
/** the column name for the USR_TOTAL_CANCELLED field */
const USR_TOTAL_CANCELLED = 'USERS.USR_TOTAL_CANCELLED';
/** the column name for the USR_TOTAL_PARTICIPATED field */
const USR_TOTAL_PARTICIPATED = 'USERS.USR_TOTAL_PARTICIPATED';
/** the column name for the USR_TOTAL_PAUSED field */
const USR_TOTAL_PAUSED = 'USERS.USR_TOTAL_PAUSED';
/** the column name for the USR_TOTAL_COMPLETED field */
const USR_TOTAL_COMPLETED = 'USERS.USR_TOTAL_COMPLETED';
/** the column name for the USR_TOTAL_UNASSIGNED field */
const USR_TOTAL_UNASSIGNED = 'USERS.USR_TOTAL_UNASSIGNED';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -120,10 +141,10 @@ abstract class BaseUsersPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', ),
BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, ),
BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, )
BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', 'UsrTotalInbox', 'UsrTotalDraft', 'UsrTotalCancelled', 'UsrTotalParticipated', 'UsrTotalPaused', 'UsrTotalCompleted', 'UsrTotalUnassigned', ),
BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, UsersPeer::USR_TOTAL_INBOX, UsersPeer::USR_TOTAL_DRAFT, UsersPeer::USR_TOTAL_CANCELLED, UsersPeer::USR_TOTAL_PARTICIPATED, UsersPeer::USR_TOTAL_PAUSED, UsersPeer::USR_TOTAL_COMPLETED, UsersPeer::USR_TOTAL_UNASSIGNED, ),
BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', 'USR_TOTAL_INBOX', 'USR_TOTAL_DRAFT', 'USR_TOTAL_CANCELLED', 'USR_TOTAL_PARTICIPATED', 'USR_TOTAL_PAUSED', 'USR_TOTAL_COMPLETED', 'USR_TOTAL_UNASSIGNED', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, )
);
/**
@@ -133,10 +154,10 @@ abstract class BaseUsersPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrUsername' => 1, 'UsrPassword' => 2, 'UsrFirstname' => 3, 'UsrLastname' => 4, 'UsrEmail' => 5, 'UsrDueDate' => 6, 'UsrCreateDate' => 7, 'UsrUpdateDate' => 8, 'UsrStatus' => 9, 'UsrCountry' => 10, 'UsrCity' => 11, 'UsrLocation' => 12, 'UsrAddress' => 13, 'UsrPhone' => 14, 'UsrFax' => 15, 'UsrCellular' => 16, 'UsrZipCode' => 17, 'DepUid' => 18, 'UsrPosition' => 19, 'UsrResume' => 20, 'UsrBirthday' => 21, 'UsrRole' => 22, 'UsrReportsTo' => 23, 'UsrReplacedBy' => 24, 'UsrUx' => 25, ),
BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_USERNAME => 1, UsersPeer::USR_PASSWORD => 2, UsersPeer::USR_FIRSTNAME => 3, UsersPeer::USR_LASTNAME => 4, UsersPeer::USR_EMAIL => 5, UsersPeer::USR_DUE_DATE => 6, UsersPeer::USR_CREATE_DATE => 7, UsersPeer::USR_UPDATE_DATE => 8, UsersPeer::USR_STATUS => 9, UsersPeer::USR_COUNTRY => 10, UsersPeer::USR_CITY => 11, UsersPeer::USR_LOCATION => 12, UsersPeer::USR_ADDRESS => 13, UsersPeer::USR_PHONE => 14, UsersPeer::USR_FAX => 15, UsersPeer::USR_CELLULAR => 16, UsersPeer::USR_ZIP_CODE => 17, UsersPeer::DEP_UID => 18, UsersPeer::USR_POSITION => 19, UsersPeer::USR_RESUME => 20, UsersPeer::USR_BIRTHDAY => 21, UsersPeer::USR_ROLE => 22, UsersPeer::USR_REPORTS_TO => 23, UsersPeer::USR_REPLACED_BY => 24, UsersPeer::USR_UX => 25, ),
BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_USERNAME' => 1, 'USR_PASSWORD' => 2, 'USR_FIRSTNAME' => 3, 'USR_LASTNAME' => 4, 'USR_EMAIL' => 5, 'USR_DUE_DATE' => 6, 'USR_CREATE_DATE' => 7, 'USR_UPDATE_DATE' => 8, 'USR_STATUS' => 9, 'USR_COUNTRY' => 10, 'USR_CITY' => 11, 'USR_LOCATION' => 12, 'USR_ADDRESS' => 13, 'USR_PHONE' => 14, 'USR_FAX' => 15, 'USR_CELLULAR' => 16, 'USR_ZIP_CODE' => 17, 'DEP_UID' => 18, 'USR_POSITION' => 19, 'USR_RESUME' => 20, 'USR_BIRTHDAY' => 21, 'USR_ROLE' => 22, 'USR_REPORTS_TO' => 23, 'USR_REPLACED_BY' => 24, 'USR_UX' => 25, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, )
BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrUsername' => 1, 'UsrPassword' => 2, 'UsrFirstname' => 3, 'UsrLastname' => 4, 'UsrEmail' => 5, 'UsrDueDate' => 6, 'UsrCreateDate' => 7, 'UsrUpdateDate' => 8, 'UsrStatus' => 9, 'UsrCountry' => 10, 'UsrCity' => 11, 'UsrLocation' => 12, 'UsrAddress' => 13, 'UsrPhone' => 14, 'UsrFax' => 15, 'UsrCellular' => 16, 'UsrZipCode' => 17, 'DepUid' => 18, 'UsrPosition' => 19, 'UsrResume' => 20, 'UsrBirthday' => 21, 'UsrRole' => 22, 'UsrReportsTo' => 23, 'UsrReplacedBy' => 24, 'UsrUx' => 25, 'UsrTotalInbox' => 26, 'UsrTotalDraft' => 27, 'UsrTotalCancelled' => 28, 'UsrTotalParticipated' => 29, 'UsrTotalPaused' => 30, 'UsrTotalCompleted' => 31, 'UsrTotalUnassigned' => 32, ),
BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_USERNAME => 1, UsersPeer::USR_PASSWORD => 2, UsersPeer::USR_FIRSTNAME => 3, UsersPeer::USR_LASTNAME => 4, UsersPeer::USR_EMAIL => 5, UsersPeer::USR_DUE_DATE => 6, UsersPeer::USR_CREATE_DATE => 7, UsersPeer::USR_UPDATE_DATE => 8, UsersPeer::USR_STATUS => 9, UsersPeer::USR_COUNTRY => 10, UsersPeer::USR_CITY => 11, UsersPeer::USR_LOCATION => 12, UsersPeer::USR_ADDRESS => 13, UsersPeer::USR_PHONE => 14, UsersPeer::USR_FAX => 15, UsersPeer::USR_CELLULAR => 16, UsersPeer::USR_ZIP_CODE => 17, UsersPeer::DEP_UID => 18, UsersPeer::USR_POSITION => 19, UsersPeer::USR_RESUME => 20, UsersPeer::USR_BIRTHDAY => 21, UsersPeer::USR_ROLE => 22, UsersPeer::USR_REPORTS_TO => 23, UsersPeer::USR_REPLACED_BY => 24, UsersPeer::USR_UX => 25, UsersPeer::USR_TOTAL_INBOX => 26, UsersPeer::USR_TOTAL_DRAFT => 27, UsersPeer::USR_TOTAL_CANCELLED => 28, UsersPeer::USR_TOTAL_PARTICIPATED => 29, UsersPeer::USR_TOTAL_PAUSED => 30, UsersPeer::USR_TOTAL_COMPLETED => 31, UsersPeer::USR_TOTAL_UNASSIGNED => 32, ),
BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_USERNAME' => 1, 'USR_PASSWORD' => 2, 'USR_FIRSTNAME' => 3, 'USR_LASTNAME' => 4, 'USR_EMAIL' => 5, 'USR_DUE_DATE' => 6, 'USR_CREATE_DATE' => 7, 'USR_UPDATE_DATE' => 8, 'USR_STATUS' => 9, 'USR_COUNTRY' => 10, 'USR_CITY' => 11, 'USR_LOCATION' => 12, 'USR_ADDRESS' => 13, 'USR_PHONE' => 14, 'USR_FAX' => 15, 'USR_CELLULAR' => 16, 'USR_ZIP_CODE' => 17, 'DEP_UID' => 18, 'USR_POSITION' => 19, 'USR_RESUME' => 20, 'USR_BIRTHDAY' => 21, 'USR_ROLE' => 22, 'USR_REPORTS_TO' => 23, 'USR_REPLACED_BY' => 24, 'USR_UX' => 25, 'USR_TOTAL_INBOX' => 26, 'USR_TOTAL_DRAFT' => 27, 'USR_TOTAL_CANCELLED' => 28, 'USR_TOTAL_PARTICIPATED' => 29, 'USR_TOTAL_PAUSED' => 30, 'USR_TOTAL_COMPLETED' => 31, 'USR_TOTAL_UNASSIGNED' => 32, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, )
);
/**
@@ -289,6 +310,20 @@ abstract class BaseUsersPeer
$criteria->addSelectColumn(UsersPeer::USR_UX);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_INBOX);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_DRAFT);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_CANCELLED);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_PARTICIPATED);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_PAUSED);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_COMPLETED);
$criteria->addSelectColumn(UsersPeer::USR_TOTAL_UNASSIGNED);
}
const COUNT = 'COUNT(USERS.USR_UID)';

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

@@ -1468,6 +1468,13 @@
<column name="USR_REPORTS_TO" type="VARCHAR" size="32" default=""/>
<column name="USR_REPLACED_BY" type="VARCHAR" size="32" default=""/>
<column name="USR_UX" type="VARCHAR" size="128" default="NORMAL"/>
<column name="USR_TOTAL_INBOX" type="INTEGER" default="0"/>
<column name="USR_TOTAL_DRAFT" type="INTEGER" default="0"/>
<column name="USR_TOTAL_CANCELLED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_PARTICIPATED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_PAUSED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_COMPLETED" type="INTEGER" default="0"/>
<column name="USR_TOTAL_UNASSIGNED" type="INTEGER" default="0"/>
<validator column="USR_STATUS">
<rule name="validValues" value="ACTIVE|INACTIVE|VACATION|CLOSED" message="Please select a valid type."/>
<rule name="required" message="Type is required."/>
@@ -4009,8 +4016,8 @@
<parameter name="Comment" value="Participated last list"/>
</vendor>
<column name="APP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="DEL_INDEX" type="INTEGER" required="true" primaryKey="true" default="0"/>
<column name="USR_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<column name="TAS_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
@@ -4389,7 +4396,7 @@
<column name="EVN_UID" type="VARCHAR" size="32" required="true" />
<column name="MSGT_UID" type="VARCHAR" size="32" required="true" default="" />
<column name="MSGED_USR_UID" type="VARCHAR" size="32" required="true" default="" />
<column name="MSGED_VARIABLES" type="LONGVARCHAR" required="true" default="" />
<column name="MSGED_VARIABLES" type="LONGVARCHAR" required="true" />
<column name="MSGED_CORRELATION" type="VARCHAR" size="512" required="true" default="" />
</table>
@@ -4449,7 +4456,7 @@
<column name="PRJ_UID" type="VARCHAR" size="32" required="true" />
<column name="EVN_UID_THROW" type="VARCHAR" size="32" required="true" />
<column name="EVN_UID_CATCH" type="VARCHAR" size="32" required="true" />
<column name="MSGAPP_VARIABLES" type="LONGVARCHAR" required="true" default="" />
<column name="MSGAPP_VARIABLES" type="LONGVARCHAR" required="true" />
<column name="MSGAPP_CORRELATION" type="VARCHAR" size="512" required="true" default="" />
<column name="MSGAPP_THROW_DATE" type="TIMESTAMP" required="true" />
<column name="MSGAPP_CATCH_DATE" type="TIMESTAMP" required="false" />

12
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 3.0\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-02-24 12:12:47\n"
"PO-Revision-Date: 2015-03-06 19:05:43\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -15412,8 +15412,8 @@ msgstr "You have unsaved changes in popup! If you leave the page all the windows
# TRANSLATION
# LABEL/ID_INSTALL_USE_CURRENT_USER
#: LABEL/ID_INSTALL_USE_CURRENT_USER
msgid "Use the current user as a Database owner (It doesn't create new users in the Database )"
msgstr "Use the current user as a Database owner (It doesn't create new users in the Database )"
msgid "The MySQL user from the previous step will be the database owner. (Do not create a new user.)"
msgstr "The MySQL user from the previous step will be the database owner. (Do not create a new user.)"
# TRANSLATION
# LABEL/ID_ACCOUNT_OPTIONS
@@ -18319,6 +18319,12 @@ msgstr "Process Edited"
msgid "Event deleted"
msgstr "Event deleted"
# TRANSLATION
# LABEL/ID_DEL_THREAD_STATUS
#: LABEL/ID_DEL_THREAD_STATUS
msgid "Thread Status"
msgstr "Thread Status"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

54
workflow/engine/controllers/appProxy.php
View File

@@ -231,13 +231,27 @@ class AppProxy extends HttpProxyController
*/
function getSummary ($httpData)
{
$labels = array ();
$form = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG ); //este es el problema!!!!!
$labelsCaseProperties = array ();
$labelsCurrentTaskProperties = array ();
$labelTitleCurrentTasks = array ();
$formCaseProperties = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG );
$formCaseTitle = new Form( 'cases/cases_Resume_Current_Task_Title', PATH_XMLFORM, SYS_LANG );
$formCurrentTaskProperties = new Form( 'cases/cases_Resume_Current_Task', PATH_XMLFORM, SYS_LANG );
G::LoadClass( 'case' );
$case = new Cases();
foreach ($form->fields as $fieldName => $field) {
$labels[$fieldName] = $field->label;
foreach ($formCaseProperties->fields as $fieldName => $field) {
$labelsCaseProperties[$fieldName] = $field->label;
}
foreach ($formCaseTitle->fields as $fieldName => $field) {
$labelTitleCurrentTasks[$fieldName] = $field->label;
}
foreach ($formCurrentTaskProperties->fields as $fieldName => $field) {
$labelsCurrentTaskProperties[$fieldName] = $field->label;
}
if (isset( $_SESSION['_applicationFields'] ) && $_SESSION['_processData']) {
@@ -270,26 +284,26 @@ class AppProxy extends HttpProxyController
$taskData = $task->load( $applicationFields['TAS_UID'] );
$currentUser = $applicationFields['CURRENT_USER'] != '' ? $applicationFields['CURRENT_USER'] : '[' . G::LoadTranslation( 'ID_UNASSIGNED' ) . ']';
$data[] = array ('label' => $labels['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labels['TITLE1']);
$data[] = array ("label" => $labels["TITLE"], "value" => htmlentities($applicationFields["TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labels["TITLE1"]);
$data[] = array ('label' => $labels['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labels['TITLE1']);
$data[] = array ("label" => $labels["DESCRIPTION"], "value" => htmlentities($applicationFields["DESCRIPTION"], ENT_QUOTES, "UTF-8"), "section" => $labels["TITLE1"]);
$data[] = array ('label' => $labelsCaseProperties['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ("label" => $labelsCaseProperties["TITLE"], "value" => htmlentities($applicationFields["TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelsCaseProperties["TITLE1"]);
$data[] = array ('label' => $labelsCaseProperties['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ('label' => $labelsCaseProperties['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ('label' => $labelsCaseProperties['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ('label' => $labelsCaseProperties['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ('label' => $labelsCaseProperties['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ('label' => $labelsCaseProperties['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labelsCaseProperties['TITLE1']);
$data[] = array ("label" => $labelsCaseProperties["DESCRIPTION"], "value" => htmlentities($applicationFields["DESCRIPTION"], ENT_QUOTES, "UTF-8"), "section" => $labelsCaseProperties["TITLE1"]);
// note added by krlos pacha carlos[at]colosa[dot]com
//getting this field if it doesn't exist. Related 7994 bug
$taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG );
$data[] = array ("label" => $labels["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labels["TITLE2"]);
$data[] = array ('label' => $labels['CURRENT_USER'],'value' => $currentUser,'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labels['TITLE2']);
//$data[] = array('label'=>$labels['DYN_UID'] , 'value' => $processData['PRO_DYNAFORMS']['PROCESS'];, 'section'=>$labels['DYN_UID']);
$data[] = array ("label" => $labelsCurrentTaskProperties["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelTitleCurrentTasks["TITLE2"]);
$data[] = array ('label' => $labelsCurrentTaskProperties['CURRENT_USER'],'value' => $currentUser,'section' => $labelTitleCurrentTasks['TITLE2']);
$data[] = array ('label' => $labelsCurrentTaskProperties['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);
$data[] = array ('label' => $labelsCurrentTaskProperties['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);
$data[] = array ('label' => $labelsCurrentTaskProperties['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);
$data[] = array ('label' => $labelsCurrentTaskProperties['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']);
//$data[] = array('label'=>$labelsCurrentTaskProperties['DYN_UID'] , 'value' => $processData['PRO_DYNAFORMS']['PROCESS'];, 'section'=>$labelsCurrentTaskProperties['DYN_UID']);
return $data;
}
}

2
workflow/engine/controllers/designer.php
View File

@@ -26,7 +26,6 @@ class Designer extends Controller
$proUid = isset($httpData->prj_uid) ? $httpData->prj_uid : '';
$appUid = isset($httpData->app_uid) ? $httpData->app_uid : '';
$proReadOnly = isset($httpData->prj_readonly) ? $httpData->prj_readonly : 'false';
$stringBpmn = isset($httpData->stringBpmn) ? '<textarea id="stringBpmn" style="display:none">' . base64_decode($httpData->stringBpmn) . '</textarea>' : '';
$client = $this->getClientCredentials();
$authCode = $this->getAuthorizationCode($client);
$debug = false; //System::isDebugMode();
@@ -57,7 +56,6 @@ class Designer extends Controller
$this->setVar('prj_uid', $proUid);
$this->setVar('app_uid', $appUid);
$this->setVar('stringBpmn', $stringBpmn);
$this->setVar('prj_readonly', $proReadOnly);
$this->setVar('credentials', base64_encode(json_encode($clientToken)));
$this->setVar('isDebugMode', $debug);

2
workflow/engine/controllers/newSiteProxy.php
View File

@@ -37,6 +37,8 @@ class newSiteProxy extends HttpProxyController
), ($action === 'create') ? true : false );
$result['result']['admin']['password'] = ($pass === $pass1) ? true : false;
$result['result']['action'] = $action;
$_SESSION['NW_PASSWORD'] = $pass;
$_SESSION['NW_PASSWORD2'] = $pass1;
//$json = new Services_JSON();
//G::pr($result['result']['database']);G::pr($action);
$dbWf = $result['result']['database']['ao']['ao_db_wf']['status'];

6
workflow/engine/data/mssql/insert.sql
View File

@@ -5968,7 +5968,7 @@ SELECT 'LABEL','ID_DATA_CORRECT','en','The configuration is correct.','2015-02-2
UNION ALL
SELECT 'LABEL','ID_EXIST','en','Exist','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_NO_EXIST','en','Does not exist','2015-01-16'
SELECT 'LABEL','ID_NO_EXIST','en','Does not exist','2015-03-05'
UNION ALL
SELECT 'LABEL','ID_REPORT_DATABASE_NAME','en','Please enter the Report Database Name.','2014-01-15'
UNION ALL
@@ -6586,7 +6586,7 @@ SELECT 'LABEL','ID_FROM_EMAIL','en','From Mail','2014-04-30'
UNION ALL
SELECT 'LABEL','ID_UNSAVED_TRIGGERS_WINDOW','en','You have unsaved changes in popup! If you leave the page all the windows will be closed.','2014-10-21'
UNION ALL
SELECT 'LABEL','ID_INSTALL_USE_CURRENT_USER','en','Use the current user as a Database owner (It doesn''t create new users in the Database )','2014-05-07'
SELECT 'LABEL','ID_INSTALL_USE_CURRENT_USER','en','The MySQL user from the previous step will be the database owner. (Do not create a new user.)','2015-03-05'
UNION ALL
SELECT 'LABEL','ID_ACCOUNT_OPTIONS','en','Account Options','2014-05-16'
UNION ALL
@@ -7567,6 +7567,8 @@ SELECT 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Me
SELECT 'LABEL','ID_EDIT_PROCESS','en','Process Edited','2015-02-21'
UNION ALL
SELECT 'LABEL','ID_EVENT_DELETED','en','Event deleted','2015-02-21'
UNION ALL
SELECT 'LABEL','ID_DEL_THREAD_STATUS','en','Thread Status','2015-02-27'
;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

7
workflow/engine/data/mysql/insert.sql
View File

@@ -3707,7 +3707,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DIRECTORY_FILE_PERMISSION','en','File Permissions','2014-10-21') ,
( 'LABEL','ID_DATA_CORRECT','en','The configuration is correct.','2015-02-23') ,
( 'LABEL','ID_EXIST','en','Exist','2014-01-15') ,
( 'LABEL','ID_NO_EXIST','en','Does not exist','2015-01-16') ,
( 'LABEL','ID_NO_EXIST','en','Does not exist','2015-03-05') ,
( 'LABEL','ID_REPORT_DATABASE_NAME','en','Please enter the Report Database Name.','2014-01-15') ,
( 'LABEL','ID_WORKFLOW_DATABASE_NAME','en','Please enter the Workflow Database Name','2014-01-15') ,
( 'LABEL','ID_RBAC_DATABASE_NAME','en','Please enter the Rbac Database Name.','2014-01-15') ,
@@ -4020,7 +4020,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_GROUP_CANNOT_DELETE_WHILE_ASSIGNED_TO_TASK','en','Group cannot be deleted while it''s assigned to a task','2014-04-03') ,
( 'LABEL','ID_FROM_EMAIL','en','From Mail','2014-04-30') ,
( 'LABEL','ID_UNSAVED_TRIGGERS_WINDOW','en','You have unsaved changes in popup! If you leave the page all the windows will be closed.','2014-10-21') ,
( 'LABEL','ID_INSTALL_USE_CURRENT_USER','en','Use the current user as a Database owner (It doesn''t create new users in the Database )','2014-05-07') ,
( 'LABEL','ID_INSTALL_USE_CURRENT_USER','en','The MySQL user from the previous step will be the database owner. (Do not create a new user.)','2015-03-05') ,
( 'LABEL','ID_ACCOUNT_OPTIONS','en','Account Options','2014-05-16') ,
( 'LABEL','ID_USER_MUST_CHANGE_PASSWORD_AT_NEXT_LOGON','en','User must change password at next logon','2014-05-16') ,
( 'LABEL','ID_HIDE_DIRS','en','Hide Dirs','2014-05-26') ,
@@ -4516,7 +4516,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_VARIABLES_DO_NOT_MEET_DEFINITION','en','The variables do not meet with the definition of Message-Type-Variable','2015-02-20') ,
( 'LABEL','ID_MESSAGE_EVENT_DEFINITION_DOES_NOT_IS_REGISTERED','en','The Message-Event-Definition with {0}: {1} does not is registered.','2015-02-20') ,
( 'LABEL','ID_EDIT_PROCESS','en','Process Edited','2015-02-21') ,
( 'LABEL','ID_EVENT_DELETED','en','Event deleted','2015-02-21') ;
( 'LABEL','ID_EVENT_DELETED','en','Event deleted','2015-02-21') ,
( 'LABEL','ID_DEL_THREAD_STATUS','en','Thread Status','2015-02-27') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,

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

@@ -697,6 +697,13 @@ CREATE TABLE `USERS`
`USR_REPORTS_TO` VARCHAR(32) default '',
`USR_REPLACED_BY` VARCHAR(32) default '',
`USR_UX` VARCHAR(128) default 'NORMAL',
`USR_TOTAL_INBOX` INTEGER default 0,
`USR_TOTAL_DRAFT` INTEGER default 0,
`USR_TOTAL_CANCELLED` INTEGER default 0,
`USR_TOTAL_PARTICIPATED` INTEGER default 0,
`USR_TOTAL_PAUSED` INTEGER default 0,
`USR_TOTAL_COMPLETED` INTEGER default 0,
`USR_TOTAL_UNASSIGNED` INTEGER default 0,
PRIMARY KEY (`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users';
#-----------------------------------------------------------------------------
@@ -2199,7 +2206,7 @@ CREATE TABLE `LIST_INBOX`
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_STATUS` VARCHAR(32) default '' NOT NULL,
`APP_STATUS` VARCHAR(32) default '0',
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
@@ -2213,7 +2220,7 @@ CREATE TABLE `LIST_INBOX`
`DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`)
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list';
#-----------------------------------------------------------------------------
#-- LIST_PARTICIPATED_HISTORY
@@ -2257,8 +2264,8 @@ DROP TABLE IF EXISTS `LIST_PARTICIPATED_LAST`;
CREATE TABLE `LIST_PARTICIPATED_LAST`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`USR_UID` VARCHAR(32) default '' NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
@@ -2278,7 +2285,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
`DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`,`USR_UID`)
PRIMARY KEY (`APP_UID`,`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list';
#-----------------------------------------------------------------------------
#-- LIST_COMPLETED
@@ -2483,6 +2490,7 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE`
DROP TABLE IF EXISTS `EMAIL_SERVER`;
CREATE TABLE `EMAIL_SERVER`
(
`MESS_UID` VARCHAR(32) default '' NOT NULL,
@@ -2520,79 +2528,74 @@ CREATE TABLE `WEB_ENTRY_EVENT`
`WEE_WE_TAS_UID` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`WEE_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;
#-----------------------------------------------------------------------------
#-- MESSAGE_EVENT_DEFINITION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS MESSAGE_EVENT_DEFINITION;
DROP TABLE IF EXISTS `MESSAGE_EVENT_DEFINITION`;
CREATE TABLE MESSAGE_EVENT_DEFINITION
CREATE TABLE `MESSAGE_EVENT_DEFINITION`
(
MSGED_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
EVN_UID VARCHAR(32) NOT NULL,
MSGT_UID VARCHAR(32) NOT NULL DEFAULT '',
MSGED_USR_UID VARCHAR(32) NOT NULL DEFAULT '',
MSGED_VARIABLES MEDIUMTEXT NOT NULL DEFAULT '',
MSGED_CORRELATION VARCHAR(512) NOT NULL DEFAULT '',
PRIMARY KEY (MSGED_UID)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
`MSGED_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID` VARCHAR(32) NOT NULL,
`MSGT_UID` VARCHAR(32) default '' NOT NULL,
`MSGED_USR_UID` VARCHAR(32) default '' NOT NULL,
`MSGED_VARIABLES` MEDIUMTEXT NOT NULL,
`MSGED_CORRELATION` VARCHAR(512) default '' NOT NULL,
PRIMARY KEY (`MSGED_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_EVENT_RELATION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS MESSAGE_EVENT_RELATION;
DROP TABLE IF EXISTS `MESSAGE_EVENT_RELATION`;
CREATE TABLE MESSAGE_EVENT_RELATION
CREATE TABLE `MESSAGE_EVENT_RELATION`
(
MSGER_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
EVN_UID_THROW VARCHAR(32) NOT NULL,
EVN_UID_CATCH VARCHAR(32) NOT NULL,
PRIMARY KEY (MSGER_UID)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
`MSGER_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID_THROW` VARCHAR(32) NOT NULL,
`EVN_UID_CATCH` VARCHAR(32) NOT NULL,
PRIMARY KEY (`MSGER_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_EVENT_TASK_RELATION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS MESSAGE_EVENT_TASK_RELATION;
DROP TABLE IF EXISTS `MESSAGE_EVENT_TASK_RELATION`;
CREATE TABLE MESSAGE_EVENT_TASK_RELATION
CREATE TABLE `MESSAGE_EVENT_TASK_RELATION`
(
MSGETR_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
EVN_UID VARCHAR(32) NOT NULL,
TAS_UID VARCHAR(32) NOT NULL,
PRIMARY KEY (MSGETR_UID)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
`MSGETR_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID` VARCHAR(32) NOT NULL,
`TAS_UID` VARCHAR(32) NOT NULL,
PRIMARY KEY (`MSGETR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- MESSAGE_APPLICATION
#-----------------------------------------------------------------------------
DROP TABLE IF EXISTS MESSAGE_APPLICATION;
DROP TABLE IF EXISTS `MESSAGE_APPLICATION`;
CREATE TABLE MESSAGE_APPLICATION
CREATE TABLE `MESSAGE_APPLICATION`
(
MSGAPP_UID VARCHAR(32) NOT NULL,
APP_UID VARCHAR(32) NOT NULL,
PRJ_UID VARCHAR(32) NOT NULL,
EVN_UID_THROW VARCHAR(32) NOT NULL,
EVN_UID_CATCH VARCHAR(32) NOT NULL,
MSGAPP_VARIABLES MEDIUMTEXT NOT NULL DEFAULT '',
MSGAPP_CORRELATION VARCHAR(512) NOT NULL DEFAULT '',
MSGAPP_THROW_DATE DATETIME NOT NULL,
MSGAPP_CATCH_DATE DATETIME,
MSGAPP_STATUS VARCHAR(25) NOT NULL DEFAULT 'UNREAD',
PRIMARY KEY (MSGAPP_UID)
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
`MSGAPP_UID` VARCHAR(32) NOT NULL,
`APP_UID` VARCHAR(32) NOT NULL,
`PRJ_UID` VARCHAR(32) NOT NULL,
`EVN_UID_THROW` VARCHAR(32) NOT NULL,
`EVN_UID_CATCH` VARCHAR(32) NOT NULL,
`MSGAPP_VARIABLES` MEDIUMTEXT NOT NULL,
`MSGAPP_CORRELATION` VARCHAR(512) default '' NOT NULL,
`MSGAPP_THROW_DATE` DATETIME NOT NULL,
`MSGAPP_CATCH_DATE` DATETIME,
`MSGAPP_STATUS` VARCHAR(25) default 'UNREAD' NOT NULL,
PRIMARY KEY (`MSGAPP_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
# This restores the fkey checks, after having unset them earlier
SET FOREIGN_KEY_CHECKS = 1;

4
workflow/engine/js/cases/core/pmDynaform.js
View File

@@ -72,7 +72,9 @@ $(window).load(function () {
form.appendChild(arrayRequired);
var dyn_forward = document.getElementById("dyn_forward");
dyn_forward.onclick = function () {
form.submit();
if (window.project.getForms()[0].isValid()) {
form.submit();
}
return false;
};
if (triggerDebug === true) {

6
workflow/engine/methods/login/login.php
View File

@@ -60,6 +60,9 @@ $sFailedLogins = $_SESSION['FAILED_LOGINS'];
$usernamePrevious1 = $_SESSION["USERNAME_PREVIOUS1"];
$usernamePrevious2 = $_SESSION["USERNAME_PREVIOUS2"];
$pass = (isset($_SESSION['NW_PASSWORD'])) ? $_SESSION['NW_PASSWORD'] : '';
$pass1 = (isset($_SESSION['NW_PASSWORD2'])) ? $_SESSION['NW_PASSWORD2'] : '';
$aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
//$aFields['LOGIN_VERIFY_MSG'] = Bootstrap::loadTranslation('LOGIN_VERIFY_MSG');
@@ -135,6 +138,9 @@ $_SESSION['FAILED_LOGINS'] = $sFailedLogins;
$_SESSION["USERNAME_PREVIOUS1"] = $usernamePrevious1;
$_SESSION["USERNAME_PREVIOUS2"] = $usernamePrevious2;
$_SESSION['NW_PASSWORD'] = $pass;
$_SESSION['NW_PASSWORD2'] = $pass1;
/*----------------------------------********---------------------------------*/
if (!class_exists('pmLicenseManager')) {
G::LoadClass('pmLicenseManager');

3
workflow/engine/methods/processes/processes_Import_Bpmn.php
View File

@@ -15,7 +15,6 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
"PRO_CATEGORY" => "",
"PRO_CREATE_USER" => $_SESSION['USER_LOGGED']
);
$stringBpmn = base64_encode(file_get_contents($_FILES["PROCESS_FILENAME"]["tmp_name"]));
if ($createMode === "overwrite") {
$process = Process::getByProTitle($data["PRO_TITLE"]);
if ($process !== null) {
@@ -27,11 +26,11 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
$data["PRO_TITLE"] = Process::getNextTitle($data["PRO_TITLE"]);
}
$project = new \ProcessMaker\Project\Adapter\WorkflowBpmn($data);
copy($_FILES["PROCESS_FILENAME"]["tmp_name"], PATH_DOCUMENT . $project->getUid());
$result = array(
"success" => true,
"catchMessage" => "",
"prj_uid" => $project->getUid(),
"stringBpmn" => $stringBpmn,
"createMode" => $createMode
);
} catch (Exception $e) {

7
workflow/engine/methods/services/login_getStarted.php
View File

@@ -42,6 +42,12 @@ $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
$oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
*/
$userName = 'admin';
$userPass = 'The password introduced at the time of installing the application';
if(isset($_SESSION['NW_PASSWORD'])){
if($_SESSION['NW_PASSWORD'] != ''){
$userPass = $_SESSION['NW_PASSWORD'];
}
}
require_once 'classes/model/Users.php';
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME);
@@ -56,6 +62,7 @@ if ($oDataset->next()) {
$oTemplatePower->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js"));
$oTemplatePower->assign("name", $userName);
$oTemplatePower->assign("pass", $userPass);
$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );

88
workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
View File

@@ -240,10 +240,6 @@ class MessageEventDefinition
throw new \Exception(\G::LoadTranslation("ID_MESSAGE_EVENT_DEFINITION_VARIABLES_DO_NOT_MEET_DEFINITION"));
}
}
if (isset($arrayData["MSGED_USR_UID"])) {
$process->throwExceptionIfNotExistsUser($arrayData["MSGED_USR_UID"], $this->arrayFieldNameForException["messageEventDefinitionUserUid"]);
}
} catch (\Exception $e) {
throw $e;
}
@@ -295,27 +291,13 @@ class MessageEventDefinition
$arrayData["MSGED_VARIABLES"] = array();
}
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != "") {
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\UsersPeer::USR_UID);
$criteria->add(\UsersPeer::USR_UID, $arrayData["MSGED_USR_UID"], \Criteria::EQUAL);
//QUERY
$rsCriteria = \UsersPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if (!$rsCriteria->next()) {
$arrayData["MSGED_USR_UID"] = "";
}
}
$messageEventDefinitionUid = \ProcessMaker\Util\Common::generateUID();
$messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
$messageEventDefinition->setMsgedUid($messageEventDefinitionUid);
$messageEventDefinition->setPrjUid($projectUid);
$messageEventDefinition->setMsgedUsrUid("00000000000000000000000000000001"); //admin
if (isset($arrayData["MSGED_VARIABLES"])) {
$messageEventDefinition->setMsgedVariables(serialize($arrayData["MSGED_VARIABLES"]));
@@ -328,32 +310,6 @@ class MessageEventDefinition
$cnn->commit();
//Task - User
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != "") {
$bpmnEvent = \BpmnEventPeer::retrieveByPK($arrayData["EVN_UID"]);
//Event - START-MESSAGE-EVENT
if (!is_null($bpmnEvent) && $bpmnEvent->getEvnType() == "START" && $bpmnEvent->getEvnMarker() == "MESSAGECATCH") {
//Message-Event-Task-Relation - Get Task
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$arrayMessageEventTaskRelationData = $messageEventTaskRelation->getMessageEventTaskRelationWhere(
array(
\MessageEventTaskRelationPeer::PRJ_UID => $projectUid,
\MessageEventTaskRelationPeer::EVN_UID => $bpmnEvent->getEvnUid()
),
true
);
if (!is_null($arrayMessageEventTaskRelationData)) {
//Assign
$task = new \Tasks();
$result = $task->assignUser($arrayMessageEventTaskRelationData["TAS_UID"], $arrayData["MSGED_USR_UID"], 1);
}
}
}
//Return
return $this->getMessageEventDefinition($messageEventDefinitionUid);
} else {
@@ -431,48 +387,6 @@ class MessageEventDefinition
$cnn->commit();
//Task - User
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != $arrayMessageEventDefinitionData["MSGED_USR_UID"]) {
$bpmnEvent = \BpmnEventPeer::retrieveByPK($arrayMessageEventDefinitionData["EVN_UID"]);
//Event - START-MESSAGE-EVENT
if (!is_null($bpmnEvent) && $bpmnEvent->getEvnType() == "START" && $bpmnEvent->getEvnMarker() == "MESSAGECATCH") {
//Message-Event-Task-Relation - Get Task
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$arrayMessageEventTaskRelationData = $messageEventTaskRelation->getMessageEventTaskRelationWhere(
array(
\MessageEventTaskRelationPeer::PRJ_UID => $arrayMessageEventDefinitionData["PRJ_UID"],
\MessageEventTaskRelationPeer::EVN_UID => $bpmnEvent->getEvnUid()
),
true
);
if (!is_null($arrayMessageEventTaskRelationData)) {
//Unassign
$taskUser = new \TaskUser();
$criteria = new \Criteria("workflow");
$criteria->add(\TaskUserPeer::TAS_UID, $arrayMessageEventTaskRelationData["TAS_UID"]);
$rsCriteria = \TaskUserPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$result = $taskUser->remove($row["TAS_UID"], $row["USR_UID"], $row["TU_TYPE"], $row["TU_RELATION"]);
}
//Assign
$task = new \Tasks();
$result = $task->assignUser($arrayMessageEventTaskRelationData["TAS_UID"], $arrayData["MSGED_USR_UID"], 1);
}
}
}
//Return
$arrayData = $arrayDataBackup;

8
workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
View File

@@ -38,6 +38,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE);
$oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_FILENAME', 'C3.CON_VALUE');
@@ -101,7 +102,8 @@ class OutputDocument
'out_doc_pdf_security_enabled' => $aRow['OUT_DOC_PDF_SECURITY_ENABLED'],
'out_doc_pdf_security_open_password' => $aRow['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],
'out_doc_pdf_security_owner_password' => $aRow['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS'],
"out_doc_open_type" => $aRow["OUT_DOC_OPEN_TYPE"]);
}
$oDataset->next();
}
@@ -145,6 +147,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE);
$oCriteria->add(\OutputDocumentPeer::OUT_DOC_UID, $sOutputDocumentUID);
$oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE');
@@ -209,7 +212,8 @@ class OutputDocument
'out_doc_pdf_security_enabled' => $aRow['OUT_DOC_PDF_SECURITY_ENABLED'],
'out_doc_pdf_security_open_password' => $aRow['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],
'out_doc_pdf_security_owner_password' => $aRow['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS'],
"out_doc_open_type" => $aRow["OUT_DOC_OPEN_TYPE"]);
}
$oDataset->next();
}

4
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -487,9 +487,9 @@ class Variable
$row = $rsCriteria->getRow();
$variableDbConnectionUid = $row["VAR_DBCONNECTION"];
$variableSql = $row["VAR_SQL"];
$variableSql = strtoupper($row["VAR_SQL"]);
} else {
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName)));
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array("VAR_NAME", $variableName)));
}
//Verify data

28
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -112,6 +112,8 @@ class BpmnWorkflow extends Project\Bpmn
$arrayData["PRO_STATUS"] = $data["PRJ_STATUS"];
}
$arrayData["PRO_UPDATE_DATE"] = date("Y-m-d H:i:s");
$this->wp->update($arrayData);
}
@@ -602,7 +604,8 @@ class BpmnWorkflow extends Project\Bpmn
if ($elementType == "bpmnEvent" &&
in_array($key, array("end-message-event", "start-message-event", "intermediate-catch-message-event"))
) {
if ($key == "intermediate-catch-message-event") {
if (in_array($key, array("start-message-event", "intermediate-catch-message-event"))) {
//Task - User
//Assign to admin
$task = new \Tasks();
@@ -1091,6 +1094,10 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["participants"] = $bwp->getParticipants($configList);
$project["diagrams"][] = $diagram;
}
if (file_exists(PATH_DOCUMENT . $project["prj_uid"])) {
$project["prj_bpmn_file_upload"] = file_get_contents(PATH_DOCUMENT . $project["prj_uid"]);
unlink(PATH_DOCUMENT . $project["prj_uid"]);
}
return $project;
}
@@ -1659,6 +1666,8 @@ class BpmnWorkflow extends Project\Bpmn
* Diagram's Flows Handling
*/
$whiteList = array();
$defaultFlow = array();
$pos = 0;
foreach ($diagram["flows"] as $i => $flowData) {
$flowData = array_change_key_case($flowData, CASE_UPPER);
@@ -1686,6 +1695,12 @@ class BpmnWorkflow extends Project\Bpmn
$flowData["FLO_ELEMENT_DEST"] = $mappedUid;
}
}
//Save the default flow Uid's
if($flowData["FLO_TYPE"] == 'DEFAULT'){
$defaultFlow[$pos]['GAT_UID'] = $flowData["FLO_ELEMENT_ORIGIN"];
$defaultFlow[$pos]['GAT_DEFAULT_FLOW'] = $flowData["FLO_UID"];
$pos++;
}
//Update UIDs
foreach ($result as $value) {
@@ -1728,6 +1743,17 @@ class BpmnWorkflow extends Project\Bpmn
}
$bwp->mapBpmnFlowsToWorkflowRoutes();
//Update the Default gateway
$gateways = $bwp->getGateways();
foreach ($gateways as $gatewayData) {
foreach ($defaultFlow as $def) {
if($gatewayData["GAT_UID"] == $def["GAT_UID"]){
$gatewayData["GAT_DEFAULT_FLOW"] = $def["GAT_DEFAULT_FLOW"];
$bwp->updateGateway($gatewayData["GAT_UID"], $gatewayData);
}
}
}
return $result;
}

5
workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
View File

@@ -222,5 +222,10 @@ class OutputDocumentStructure
* @var string {@from body} {@min 0} {@max 150}
*/
public $out_doc_pdf_security_permissions;
/**
* @var int {@from body} {@choice 0,1}
*/
public $out_doc_open_type;
}

35
workflow/engine/templates/designer/index.html
View File

@@ -76,51 +76,32 @@
</head>
<body onresize="resizingFrame();">
{$stringBpmn}
<div class="ui-layout-north">
<!--<div class="ui-layout-north">-->
<section class="navBar" id="idNavBar">
<div class="head"></div>
<nav>
<ul>
<li><a href="#" ><span class="mafe-button-close" ></span></a></li>
<li><a href="#" ><span class="mafe-button-close" ></span></a></li>
<li><a href="#" class="mafe-button-save"></a></li>
<li><a href="#" class="mafe-button-export-process"></a></li>
<li><a class="mafe-button-export-bpmn-process"></a></li>
<li><a href="#" class="mafe-button-undo"></a> <a href="#" class="mafe-button-redo"></a></li>
<li></li>
<li><a href="#" title="" class="mafe-button-fullscreen"></a></li>
<li><a href="#" title="" class="mafe-button-fullscreen"></a></li>
</ul>
</nav>
</section>
</div>
<!--</div>-->
<div id="p-center-layout">
<div id="p-center-layout"/>
<!--BODY-->
<div class="ui-layout-center tab-content" id="div-layout-canvas">
<!--TODO INSERT DIV CANVAS-->
</div>
<div class="ui-layout-east" id="div-layout-properties">
<div class="ui-layout-center">
<div id="diagram-treecontainer"></div>
</div>
<div class="ui-layout-south">
<div style="font-size: 11px;" id="diagram-property-grid"> </div>
</div>
</div>
<!--END BODY-->
</div>
<div class="ui-layout-west">
</div>
<div class="bpmn_shapes">
<!--<div class="head"></div>-->
</div>
</div>
@@ -130,8 +111,8 @@
<div class="content_controls">
<div class="head"></div>
<ul>
<li>
<a href="#" class="mafe-menu-variable"></a>
<li>
<a href="#" class="mafe-menu-variable"></a>
<a href="#" class="btn_create mafe-menu-variable-create"><span></span></a>
</li>
<!--<li>

173
workflow/engine/templates/processes/main.js
View File

@@ -479,8 +479,6 @@ Ext.onReady(function(){
function newProcess(params)
{
if (winDesigner)
winDesigner.close();
params = typeof params == 'undefined' ? {type:'classicProject'} : params;
// TODO this variable have hardcoded labels, it must be changed on the future
@@ -589,20 +587,13 @@ function saveProcess()
if (projectType == 'classicProject') {
location.href = 'processes_Map?PRO_UID='+resp.result.PRO_UID;
} else {
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ){
if ( typeof(winDesigner) == "undefined" || winDesigner.closed ){
winDesigner = window.open(
"../designer?prj_uid="+resp.result.PRO_UID,
'winDesigner'
);
Ext.getCmp('newProjectWin').close();
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else {
location.href = '../designer?prj_uid='+resp.result.PRO_UID;
}
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
winDesigner = window.open("../designer?prj_uid=" + resp.result.PRO_UID, 'winDesigner');
Ext.getCmp('newProjectWin').close();
processesGrid.store.reload();
} else {
location.href = '../designer?prj_uid=' + resp.result.PRO_UID;
}
}
},
failure: function(obj, resp) {
@@ -653,14 +644,7 @@ editProcess = function(typeParam)
}
if ( ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) && (type == "bpmn") ) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
winDesigner = window.open(
url,
'winDesigner'
);
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
winDesigner = window.open(url, 'winDesigner');
} else {
location.href = url;
}
@@ -968,19 +952,12 @@ importProcessExistGroup = function()
var sNewProUid = resp_.sNewProUid;
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if ((navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1) ) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
winDesigner = window.open(
"../designer?prj_uid=" + sNewProUid,
'winDesigner'
);
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
winDesigner = window.open("../designer?prj_uid=" + sNewProUid, 'winDesigner');
w.close();
processesGrid.store.reload();
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid;
window.location.href = "../designer?prj_uid=" + sNewProUid;
}
} else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
@@ -1056,34 +1033,42 @@ importProcessExistProcess = function()
}, {
xtype : 'spacer',
height : 10
}, {
items : [
{
xtype : "radio",
boxLabel : _('IMPORT_PROCESS_OVERWRITING'),
name : "IMPORT_OPTION",
inputValue : '1',
tabIndex : 1
}
},
{
items: [
{
xtype: "radio",
name: "IMPORT_OPTION",
inputValue: "3",
boxLabel: _("IMPORT_PROCESS_NEW"),
tabIndex: 3,
checked: "checked"
}
]
}, {
items : [{
xtype : "radio",
boxLabel : _('IMPORT_PROCESS_DISABLE'),
tabIndex : 2,
name : "IMPORT_OPTION",
inputValue : '2',
checked : "checked"
}]
}, {
items: [{
xtype : "radio",
boxLabel : _('IMPORT_PROCESS_NEW'),
name : "IMPORT_OPTION",
inputValue : '3',
tabIndex : 3
}]
}, {
},
//{
// items: [
// {
// xtype: "radio",
// name: "IMPORT_OPTION",
// inputValue: "2",
// boxLabel: _("IMPORT_PROCESS_DISABLE"),
// tabIndex: 2
// }
// ]
//},
{
items: [
{
xtype: "radio",
name: "IMPORT_OPTION",
inputValue: "1",
boxLabel: _("IMPORT_PROCESS_OVERWRITING"),
tabIndex: 1
}
]
},
{
xtype : 'hidden',
name : 'ajaxAction',
value : 'uploadFileNewProcessExist'
@@ -1116,21 +1101,14 @@ importProcessExistProcess = function()
if (resp_.ExistGroupsInDatabase == 0) {
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if ( (navigator.userAgent.indexOf("MSIE")!=-1) || (navigator.userAgent.indexOf("Trident")!=-1)) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
winDesigner = window.open(
"../designer?prj_uid=" + sNewProUid,
'winDesigner'
);
Ext.getCmp('importProcessWindow').close();
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _('ID_FAILED'), _('PROCESS_ALREADY_OPENED'));
}
} else {
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
winDesigner = window.open("../designer?prj_uid=" + sNewProUid,'winDesigner');
Ext.getCmp('importProcessWindow').close();
w.close();
processesGrid.store.reload();
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid;
}
}
} else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
}
@@ -1176,11 +1154,6 @@ importProcessExistProcess = function()
importProcess = function()
{
if (winDesigner) {
winDesigner.close();
if (!winDesigner.closed)
return;
}
var processFileType = importProcessGlobal.processFileType;
var processFileTypeTitle = (processFileType == "pm") ? "" : " " + processFileType;
@@ -1276,21 +1249,13 @@ importProcess = function()
var sNewProUid = resp_.sNewProUid;
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
if (typeof(winDesigner) == "undefined" || winDesigner.closed){
winDesigner = window.open(
"../designer?prj_uid=" + sNewProUid,
"winDesigner"
);
w.close();
processesGrid.store.reload();
} else {
PMExt.error( _("ID_FAILED"), _("PROCESS_ALREADY_OPENED"));
}
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid;
}
if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
winDesigner = window.open("../designer?prj_uid=" + sNewProUid,"winDesigner");
w.close();
processesGrid.store.reload();
} else {
window.location.href = "../designer?prj_uid=" + sNewProUid;
}
} else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
}
@@ -1432,17 +1397,7 @@ importProcessBpmnSubmit = function () {
return;
}
Ext.getCmp('importProcessWindow').close();
var stringxml = document.createElement("input");
stringxml.type = "hidden";
stringxml.name = "stringBpmn";
stringxml.value = resp_.stringBpmn;
var form = document.createElement("form");
document.body.appendChild(form);
form.appendChild(stringxml);
form.style.display = "none";
form.action = "../designer?prj_uid=" + resp_.prj_uid;
form.method = "POST";
form.submit();
window.location.href = "../designer?prj_uid=" + resp_.prj_uid;
},
failure: function (o, resp) {
Ext.getCmp('importProcessWindow').close();
@@ -1537,4 +1492,4 @@ function enableDisableDebug()
Ext.EventManager.on(window, 'beforeunload', function () {
if (winDesigner)
winDesigner.close();
});
});

2
workflow/engine/templates/services/login_getStarted.html
View File

@@ -71,7 +71,7 @@
<p><span class="cLow">Welcome to ProcessMaker!</span></p>
<p><span class="cLow">To get started, log in using the following credentials. You can change them later:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> {name}</span><br>
<span class="cNeg">Password:</span><span class="cLow"> The password introduced at the time of installing the application</span>
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span>
<p><span class="cLow">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at&nbsp;<a target="_blank" href="http://www.processmaker.com/demos/">http://www.processmaker.com/demos/</a> </span></p>
<span class="cLow">Other Resources:</span><br/><br/>

4
workflow/engine/templates/setup/auditLog.js
View File

@@ -237,9 +237,11 @@ audit.application = {
handler: function ()
{
Ext.getCmp("cboAction").reset(),
Ext.getCmp("dateFrom").reset(),
Ext.getCmp("dateTo").reset(),
Ext.getCmp("fldDescription").reset()
Ext.getCmp("fldDescription").reset(),
pagingAudit.moveFirst();
}
},
"-",

2
workflow/engine/xmlform/cases/cases_Resume.xml
View File

@@ -30,5 +30,5 @@
</UPDATE_DATE>
<DESCRIPTION type="text" mode="view">
<en><![CDATA[Case Description]]></en>
</DESCRIPTION>
</DESCRIPTION>
</dynaForm>