Merge remote-tracking branch 'pm/3.1' into HOR-1500

This commit is contained in:
Ronald Q
2016-08-04 12:24:27 -04:00
115 changed files with 1416 additions and 1186 deletions

View File

@@ -447,6 +447,8 @@ class WebApplication
define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP); define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
\Bootstrap::registerSystemClasses(); \Bootstrap::registerSystemClasses();
\Bootstrap::initVendors();
\Bootstrap::LoadSystem( 'monologProvider' );
$arraySystemConfiguration = \System::getSystemConfiguration(); $arraySystemConfiguration = \System::getSystemConfiguration();

View File

@@ -845,7 +845,10 @@ class Bootstrap
$skinEngine = new SkinEngine('publish', 'blank', ''); $skinEngine = new SkinEngine('publish', 'blank', '');
$skinEngine->dispatch(); $skinEngine->dispatch();
} else { } else {
die($e->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }
} }
} }

View File

@@ -266,7 +266,10 @@ class DataBaseMaintenance
// Commented that is not assigned to a variable. // Commented that is not assigned to a variable.
// mysql_escape_string("';"); // mysql_escape_string("';");
if (! @mysql_query( $sql )) { if (! @mysql_query( $sql )) {
echo mysql_error() . "\n"; $ws = (defined("SYS_SYS"))? SYS_SYS : "Wokspace Undefined";
Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'mysql.log');
$varRes = mysql_error() . "\n";
G::outRes( $varRes );
return false; return false;
} }
return true; return true;
@@ -284,7 +287,10 @@ class DataBaseMaintenance
$tableName = str_replace( '.dump', '', basename( $backupFile ) ); $tableName = str_replace( '.dump', '', basename( $backupFile ) );
$sql = "LOAD DATA INFILE '$backupFile' INTO TABLE $tableName FIELDS TERMINATED BY '\t|\t' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\t\t\r\r\n'"; $sql = "LOAD DATA INFILE '$backupFile' INTO TABLE $tableName FIELDS TERMINATED BY '\t|\t' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\t\t\r\r\n'";
if (! @mysql_query( $sql )) { if (! @mysql_query( $sql )) {
print mysql_error() . "\n"; $ws = (defined("SYS_SYS"))? SYS_SYS : "Wokspace Undefined";
Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'mysql.log');
$varRes = mysql_error() . "\n";
G::outRes( $varRes );
return false; return false;
} }
return true; return true;

View File

@@ -5672,6 +5672,17 @@ class G
$clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean; $clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
return $clean; return $clean;
} }
/**
* Out the result
*
* @param string $sVar
*
* @return showRes($string)
*/
public function outRes ($sInfVar)
{
echo $sInfVar;
}
/** /**
* encryptOld * encryptOld
* *

View File

@@ -12,7 +12,6 @@ class PMException extends Exception
public function __construct ($message, $code = 0, $previous = null) public function __construct ($message, $code = 0, $previous = null)
{ {
//parent::__construct($message, 1, $previous);
parent::__construct( $message, 1 ); parent::__construct( $message, 1 );
} }
@@ -20,5 +19,10 @@ class PMException extends Exception
{ {
return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
} }
public function registerErrorLog($error, $token){
$ws = (defined("SYS_SYS"))? SYS_SYS : "Wokspace Undefined";
Bootstrap::registerMonolog('ExceptionCron', 400, $error->getMessage(), array('token'=>$token), $ws, 'exception.log');
}
} }

View File

@@ -873,7 +873,7 @@ class Phing {
// that isn't very compatible w/ other frontends (but // that isn't very compatible w/ other frontends (but
// there aren't any right now, so I'm not stressing) // there aren't any right now, so I'm not stressing)
print("Error importing $path\n"); print("Error importing $path\n");
print($e->getTraceAsString()."\n"); error_log( $e->getTraceAsString()."\n" );
} }
throw $e; throw $e;
} }

View File

@@ -135,7 +135,7 @@ class TaskHandler extends AbstractHandler {
} catch (BuildException $be) { } catch (BuildException $be) {
// swallow here, will be thrown again in // swallow here, will be thrown again in
// UnknownElement->maybeConfigure if the problem persists. // UnknownElement->maybeConfigure if the problem persists.
print("Swallowing exception: ".$be->getMessage() . "\n"); error_log( "Swallowing exception: ".$be->getMessage() . "\n" );
} }
// the task is not known of bat, try to load it on thy fly // the task is not known of bat, try to load it on thy fly

View File

@@ -255,8 +255,8 @@ class Column extends XMLElement {
try { try {
$this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs); $this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs);
} catch (EngineException $e) { } catch (EngineException $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
print $e->getTraceAsString(); error_log( $e->getTraceAsString() );
} }
} }
return $this->phpName; return $this->phpName;

View File

@@ -88,8 +88,8 @@ class NameFactory {
} }
$algorithm = new $name(); $algorithm = new $name();
} catch (BuildException $e) { } catch (BuildException $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
print $e->getTraceAsString(); error_log( $e->getTraceAsString() );
} }
$this->algorithms[$name] = $algorithm; $this->algorithms[$name] = $algorithm;
} }

View File

@@ -198,8 +198,8 @@ class Table extends XMLElement implements IDMethod {
$this->addIndex(new Index($this, array_slice($pk, $i, $size))); $this->addIndex(new Index($this, array_slice($pk, $i, $size)));
} }
} catch (EngineException $e) { } catch (EngineException $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
print $e->getTraceAsString(); error_log( $e->getTraceAsString() );
} }
} }
@@ -243,8 +243,8 @@ class Table extends XMLElement implements IDMethod {
// as test cases), so we'll assume that we needn't add an // as test cases), so we'll assume that we needn't add an
// entry to the system name list for these. // entry to the system name list for these.
} catch (EngineException $nameAlreadyInUse) { } catch (EngineException $nameAlreadyInUse) {
print $nameAlreadyInUse->getMessage() . "\n"; error_log( $nameAlreadyInUse->getMessage() . "\n" );
print $nameAlreadyInUse->getTraceAsString(); error_log( $nameAlreadyInUse->getTraceAsString() );
} }
} }
@@ -596,8 +596,8 @@ class Table extends XMLElement implements IDMethod {
try { try {
$this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs); $this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs);
} catch (EngineException $e) { } catch (EngineException $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
print $e->getTraceAsString(); error_log( $e->getTraceAsString() );
} }
} }
return $this->phpName; return $this->phpName;

View File

@@ -84,13 +84,13 @@ class XmlToData extends AbstractHandler {
try { try {
$this->parser->parse(); $this->parser->parse();
} catch (Exception $e) { } catch (Exception $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
$br->close(); $br->close();
} }
$br->close(); $br->close();
} catch (Exception $e) { } catch (Exception $e) {
print $e->getMessage() . "\n"; error_log( $e->getMessage() . "\n" );
print $e->getTraceAsString(); error_log( $e->getTraceAsString() );
} }
return $this->data; return $this->data;

View File

@@ -28,6 +28,9 @@
<column name="PER_UPDATE_DATE" type="TIMESTAMP" /> <column name="PER_UPDATE_DATE" type="TIMESTAMP" />
<column name="PER_STATUS" type="INTEGER" required="true" default="1" /> <column name="PER_STATUS" type="INTEGER" required="true" default="1" />
<column name="PER_SYSTEM" type="VARCHAR" size="32" required="true" default="00000000000000000000000000000002" /> <column name="PER_SYSTEM" type="VARCHAR" size="32" required="true" default="00000000000000000000000000000002" />
<index name="indexPermissionsCode">
<index-column name="PER_CODE"/>
</index>
</table> </table>
<table name="RBAC_ROLES"> <table name="RBAC_ROLES">
<vendor type="mysql"> <vendor type="mysql">
@@ -81,6 +84,10 @@
</vendor> </vendor>
<column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" /> <column name="ROL_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" /> <column name="PER_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default="" />
<index name="indexRolesPermissions">
<index-column name="ROL_UID"/>
<index-column name="PER_UID"/>
</index>
</table> </table>
<table name="RBAC_SYSTEMS"> <table name="RBAC_SYSTEMS">
<vendor type="mysql"> <vendor type="mysql">
@@ -108,6 +115,9 @@
<column name="SYS_CREATE_DATE" type="TIMESTAMP" /> <column name="SYS_CREATE_DATE" type="TIMESTAMP" />
<column name="SYS_UPDATE_DATE" type="TIMESTAMP" /> <column name="SYS_UPDATE_DATE" type="TIMESTAMP" />
<column name="SYS_STATUS" type="INTEGER" required="true" default="0" /> <column name="SYS_STATUS" type="INTEGER" required="true" default="0" />
<index name="indexSystemCode">
<index-column name="SYS_CODE"/>
</index>
</table> </table>
<table name="RBAC_USERS"> <table name="RBAC_USERS">
<vendor type="mysql"> <vendor type="mysql">

View File

@@ -4,7 +4,7 @@
SET FOREIGN_KEY_CHECKS = 0; SET FOREIGN_KEY_CHECKS = 0;
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- PERMISSIONS #-- RBAC_PERMISSIONS
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_PERMISSIONS`; DROP TABLE IF EXISTS `RBAC_PERMISSIONS`;
@@ -18,10 +18,11 @@ CREATE TABLE `RBAC_PERMISSIONS`
`PER_UPDATE_DATE` DATETIME, `PER_UPDATE_DATE` DATETIME,
`PER_STATUS` INTEGER default 1 NOT NULL, `PER_STATUS` INTEGER default 1 NOT NULL,
`PER_SYSTEM` VARCHAR(32) default '00000000000000000000000000000002' NOT NULL, `PER_SYSTEM` VARCHAR(32) default '00000000000000000000000000000002' NOT NULL,
PRIMARY KEY (`PER_UID`) PRIMARY KEY (`PER_UID`),
KEY `indexPermissionsCode`(`PER_CODE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- ROLES #-- RBAC_ROLES
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_ROLES`; DROP TABLE IF EXISTS `RBAC_ROLES`;
@@ -39,7 +40,7 @@ CREATE TABLE `RBAC_ROLES`
PRIMARY KEY (`ROL_UID`) PRIMARY KEY (`ROL_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Roles'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Roles';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- ROLES_PERMISSIONS #-- RBAC_ROLES_PERMISSIONS
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_ROLES_PERMISSIONS`; DROP TABLE IF EXISTS `RBAC_ROLES_PERMISSIONS`;
@@ -49,10 +50,11 @@ CREATE TABLE `RBAC_ROLES_PERMISSIONS`
( (
`ROL_UID` VARCHAR(32) default '' NOT NULL, `ROL_UID` VARCHAR(32) default '' NOT NULL,
`PER_UID` VARCHAR(32) default '' NOT NULL, `PER_UID` VARCHAR(32) default '' NOT NULL,
PRIMARY KEY (`ROL_UID`,`PER_UID`) PRIMARY KEY (`ROL_UID`,`PER_UID`),
KEY `indexRolesPermissions`(`ROL_UID`, `PER_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions of the roles'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Permissions of the roles';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- SYSTEMS #-- RBAC_SYSTEMS
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_SYSTEMS`; DROP TABLE IF EXISTS `RBAC_SYSTEMS`;
@@ -65,10 +67,11 @@ CREATE TABLE `RBAC_SYSTEMS`
`SYS_CREATE_DATE` DATETIME, `SYS_CREATE_DATE` DATETIME,
`SYS_UPDATE_DATE` DATETIME, `SYS_UPDATE_DATE` DATETIME,
`SYS_STATUS` INTEGER default 0 NOT NULL, `SYS_STATUS` INTEGER default 0 NOT NULL,
PRIMARY KEY (`SYS_UID`) PRIMARY KEY (`SYS_UID`),
KEY `indexSystemCode`(`SYS_CODE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Systems'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Systems';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- USERS #-- RBAC_USERS
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_USERS`; DROP TABLE IF EXISTS `RBAC_USERS`;
@@ -93,7 +96,7 @@ CREATE TABLE `RBAC_USERS`
PRIMARY KEY (`USR_UID`) PRIMARY KEY (`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- USERS_ROLES #-- RBAC_USERS_ROLES
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
DROP TABLE IF EXISTS `RBAC_USERS_ROLES`; DROP TABLE IF EXISTS `RBAC_USERS_ROLES`;

View File

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

View File

@@ -133,7 +133,9 @@ function change_hash($command, $opts)
$workspace->close(); $workspace->close();
CLI::logging(pakeColor::colorize("Changed...", "ERROR") . "\n"); CLI::logging(pakeColor::colorize("Changed...", "ERROR") . "\n");
} catch (Exception $e) { } catch (Exception $e) {
echo "> Error: ".CLI::error(G::getErrorMessage($e)) . "\n"; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( "> Error: " . CLI::error(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token))) . "\n" );
} }
} }
} }

View File

@@ -221,14 +221,6 @@ EOT
CLI::taskArg('workspace', true, true); CLI::taskArg('workspace', true, true);
CLI::taskRun("run_database_verify_migration_consistency"); CLI::taskRun("run_database_verify_migration_consistency");
CLI::taskName('migrate-counters');
CLI::taskDescription(<<<EOT
Migrate and regenerate if required, the list counters for each user.
EOT
);
CLI::taskArg('workspace', true, true);
CLI::taskRun("run_migrate_counters");
CLI::taskName('migrate-itee-to-dummytask'); CLI::taskName('migrate-itee-to-dummytask');
CLI::taskDescription(<<<EOT CLI::taskDescription(<<<EOT
Migrate the Intermediate throw Email Event to Dummy task Migrate the Intermediate throw Email Event to Dummy task

View File

@@ -9,7 +9,7 @@ class actionsByEmailCoreClass extends PMPlugin
public function setup() public function setup()
{ {
} }
public function getFieldsForPageSetup() public function getFieldsForPageSetup()
@@ -66,7 +66,9 @@ class actionsByEmailCoreClass extends PMPlugin
error_log('The parameter $data->USR_UID is empty, the routed task may be a self-service type, actions by email does not work with self-service task types.', 0); error_log('The parameter $data->USR_UID is empty, the routed task may be a self-service type, actions by email does not work with self-service task types.', 0);
} }
} catch(Exception $e) { } catch(Exception $e) {
echo $e->getMessage().' Please contact to your system administrator.'; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die; die;
} }
G::LoadClass('pmFunctions'); G::LoadClass('pmFunctions');

View File

@@ -1138,18 +1138,6 @@ class Cases
$this->appSolr->deleteApplicationSearchIndex($sAppUid); $this->appSolr->deleteApplicationSearchIndex($sAppUid);
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$criteria = new Criteria();
$criteria->addSelectColumn( ListInboxPeer::USR_UID );
$criteria->add( ListInboxPeer::APP_UID, $sAppUid, Criteria::EQUAL );
$dataset = ApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while($dataset->next()) {
$aRow = $dataset->getRow();
$users = new Users();
$users->refreshTotal($aRow['USR_UID'], 'remove', 'draft');
$users->refreshTotal($aRow['USR_UID'], 'remove', 'participated');
}
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->add(ListInboxPeer::APP_UID, $sAppUid); $oCriteria->add(ListInboxPeer::APP_UID, $sAppUid);
ListInboxPeer::doDelete($oCriteria); ListInboxPeer::doDelete($oCriteria);
@@ -1168,6 +1156,9 @@ class Cases
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->add(ListCompletedPeer::APP_UID, $sAppUid); $oCriteria->add(ListCompletedPeer::APP_UID, $sAppUid);
ListCompletedPeer::doDelete($oCriteria); ListCompletedPeer::doDelete($oCriteria);
$oCriteria = new Criteria('workflow');
$oCriteria->add(ListUnassignedPeer::APP_UID, $sAppUid);
ListUnassignedPeer::doDelete($oCriteria);
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
return $result; return $result;
} catch (exception $e) { } catch (exception $e) {
@@ -1956,7 +1947,6 @@ class Cases
public function CloseCurrentDelegation($sAppUid, $iDelIndex) public function CloseCurrentDelegation($sAppUid, $iDelIndex)
{ {
try { try {
$oApplication = ApplicationPeer::retrieveByPk($sAppUid);
$c = new Criteria(); $c = new Criteria();
$c->add(AppDelegationPeer::APP_UID, $sAppUid); $c->add(AppDelegationPeer::APP_UID, $sAppUid);
$c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex); $c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex);
@@ -1975,22 +1965,6 @@ class Cases
} }
throw (new PropelException('The row cannot be created!', new PropelException($msg))); throw (new PropelException('The row cannot be created!', new PropelException($msg)));
} }
$taskNext = TaskPeer::retrieveByPK($appDel->getTasUid());
if($taskNext->getTasType() !== 'SUBPROCESS'){
if($oApplication->getAppStatus() === 'DRAFT'){
$sUserUid = $appDel->getUsrUid();
/*----------------------------------********---------------------------------*/
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "draft");
/*----------------------------------********---------------------------------*/
}else{
$sUserUid = $appDel->getUsrUid();
/*----------------------------------********---------------------------------*/
$users = new Users();
$users->refreshTotal($sUserUid, "remove", "inbox");
/*----------------------------------********---------------------------------*/
}
}
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$inbox = new ListInbox(); $inbox = new ListInbox();
@@ -4258,9 +4232,6 @@ class Cases
throw new Exception(G::LoadTranslation('ID_THREAD_STATUS_DOES_NOT_EXIST_FOR_THE_APPLICATION.', [$appUID])); throw new Exception(G::LoadTranslation('ID_THREAD_STATUS_DOES_NOT_EXIST_FOR_THE_APPLICATION.', [$appUID]));
} }
$users = new Users();
$rowUsers = $users->load($userUID);
//Application //Application
$rowApplication['APP_STATUS'] = 'TO_DO'; $rowApplication['APP_STATUS'] = 'TO_DO';
$rowApplication['APP_UPDATE_DATE'] = date('Y-m-d H:i:s'); $rowApplication['APP_UPDATE_DATE'] = date('Y-m-d H:i:s');
@@ -4308,7 +4279,6 @@ class Cases
$resultSetListCanceled->next(); $resultSetListCanceled->next();
$rowListCanceled = $resultSetListCanceled->getRow(); $rowListCanceled = $resultSetListCanceled->getRow();
ListCanceledPeer::doDelete($criteriaListCanceled); ListCanceledPeer::doDelete($criteriaListCanceled);
$usrTotalCancelled = $rowUsers['USR_TOTAL_CANCELLED'] - 1;
//ListInbox //ListInbox
$rowListCanceled['DEL_PREVIOUS_USR_USERNAME'] = $rowListCanceled['DEL_CURRENT_USR_USERNAME']; $rowListCanceled['DEL_PREVIOUS_USR_USERNAME'] = $rowListCanceled['DEL_CURRENT_USR_USERNAME'];
@@ -4324,14 +4294,6 @@ class Cases
unset($rowListCanceled['APP_CANCELED_DATE']); unset($rowListCanceled['APP_CANCELED_DATE']);
$listInbox = new ListInbox(); $listInbox = new ListInbox();
$listInbox->create($rowListCanceled); $listInbox->create($rowListCanceled);
$usrTotalInbox = $rowUsers['USR_TOTAL_INBOX'] + 1;
//Users
$users->update([
'USR_UID' => $userUID,
'USR_TOTAL_INBOX' => $usrTotalInbox,
'USR_TOTAL_CANCELLED' => $usrTotalCancelled
]);
//ListParticipatedLast //ListParticipatedLast
$criteriaListParticipatedLast = new Criteria("workflow"); $criteriaListParticipatedLast = new Criteria("workflow");
@@ -5305,15 +5267,19 @@ class Cases
foreach ($arrayTask as $aTask) { foreach ($arrayTask as $aTask) {
//if the next is EOP dont send notification and continue with the next
if($aTask['TAS_UID'] === '-1'){
continue;
}
if (isset($aTask['DEL_INDEX'])) { if (isset($aTask['DEL_INDEX'])) {
$arrayData2 = $arrayData; $arrayData2 = $arrayData;
$appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']); $appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']);
if (!is_null($appDelegation)) { if (!is_null($appDelegation)) {
$oTask = new Task(); $oTaskUpd = new Task();
$aTask = $oTask->load($appDelegation->getTasUid()); $aTaskUpdate = $oTaskUpd->load($appDelegation->getTasUid());
$arrayData2['TAS_TITLE'] = $aTask['TAS_TITLE']; $arrayData2['TAS_TITLE'] = $aTaskUpdate['TAS_TITLE'];
$arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate(); $arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate();
} }
} else { } else {

View File

@@ -752,58 +752,26 @@ class Derivation
{ {
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
try { try {
$user = new Users(); if ($arrayNextDelegationData["TAS_UID"] != "-1") {
$regexpTaskTypeToExclude = "WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT";
if ($arrayNextDelegationData["TAS_UID"] == "-2") { if (!preg_match("/^(?:" . $regexpTaskTypeToExclude . ")$/", $taskNextDelegation->getTasType())) {
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]); if (!empty($delIndexNew) && empty($aSp)) {
$appDelegation = AppDelegationPeer::retrieveByPK($arrayApplicationData["APP_UID"], $delIndexNew);
$arrayApplicationData2 = $appDelegation->toArray(BasePeer::TYPE_FIELDNAME);
if ($application->getAppStatus() == "DRAFT") { $arrayApplicationData2["APP_STATUS"] = $arrayCurrentDelegationData["APP_STATUS"];
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
} else {
if ($arrayNextDelegationData["TAS_UID"] != "-1") {
$regexpTaskTypeToExclude = "WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT";
if (!preg_match("/^(?:" . $regexpTaskTypeToExclude . ")$/", $taskNextDelegation->getTasType())) { $taskCurrent = TaskPeer::retrieveByPK($arrayCurrentDelegationData["TAS_UID"]);
if (!empty($delIndexNew) && empty($aSp)) {
$appDelegation = AppDelegationPeer::retrieveByPK($arrayApplicationData["APP_UID"], $delIndexNew);
$arrayApplicationData2 = $appDelegation->toArray(BasePeer::TYPE_FIELDNAME);
$arrayApplicationData2["APP_STATUS"] = $arrayCurrentDelegationData["APP_STATUS"]; if ($taskCurrent->getTasType() == "INTERMEDIATE-CATCH-MESSAGE-EVENT") {
$removeList = false;
$taskCurrent = TaskPeer::retrieveByPK($arrayCurrentDelegationData["TAS_UID"]);
if ($taskCurrent->getTasType() == "INTERMEDIATE-CATCH-MESSAGE-EVENT") {
$removeList = false;
}
$arrayApplicationData2["REMOVED_LIST"] = $removeList;
$inbox = new ListInbox();
$inbox->newRow($arrayApplicationData2, $arrayApplicationData["CURRENT_USER_UID"], false, array(), (($arrayNextDelegationData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE")? true : false));
} else {
if (empty($aSp)) {
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]);
if ($application->getAppStatus() == "DRAFT") {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else {
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox");
}
}
} }
} else {
if ($removeList) {
$application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]);
if ($application->getAppStatus() == "DRAFT") { $arrayApplicationData2["REMOVED_LIST"] = $removeList;
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft");
} else { $inbox = new ListInbox();
//$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox"); $inbox->newRow($arrayApplicationData2, $arrayApplicationData["CURRENT_USER_UID"], false, array(), (($arrayNextDelegationData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE")? true : false));
}
}
} }
} }
} }

View File

@@ -4126,7 +4126,11 @@ class Processes
foreach ($arrayData as $value) { foreach ($arrayData as $value) {
$record = $value; $record = $value;
$result = $scriptTask->create($processUid, $record); try {
$result = $scriptTask->create($processUid, $record);
} catch (Exception $e) {
Bootstrap::registerMonolog('DataError', 400, $e->getMessage(), $record, SYS_SYS, 'processImporter.log');
}
} }
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
@@ -6114,4 +6118,3 @@ class ObjectCellection
} }
} }
} }

View File

@@ -1997,20 +1997,6 @@ class workspaceTools
$list->doDeleteAll(); $list->doDeleteAll();
} }
//Update //User
$criteriaSet = new Criteria("workflow");
$criteriaSet->add(UsersPeer::USR_TOTAL_INBOX, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_DRAFT, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_CANCELLED, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_PARTICIPATED, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_PAUSED, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_COMPLETED, 0);
$criteriaSet->add(UsersPeer::USR_TOTAL_UNASSIGNED, 0);
$criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(UsersPeer::USR_UID, null, Criteria::ISNOTNULL);
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$this->regenerateListCompleted($lang); $this->regenerateListCompleted($lang);
$this->regenerateListCanceled($lang); $this->regenerateListCanceled($lang);
$this->regenerateListMyInbox(); // this list require no translation $this->regenerateListMyInbox(); // this list require no translation
@@ -2019,7 +2005,6 @@ class workspaceTools
$this->regenerateListParticipatedLast(); // this list require no translation $this->regenerateListParticipatedLast(); // this list require no translation
$this->regenerateListPaused(); // this list require no translation $this->regenerateListPaused(); // this list require no translation
$this->regenerateListUnassigned(); // this list require no translation $this->regenerateListUnassigned(); // this list require no translation
$this->migrateCounters();
} }
if (!$flagReinsert) { if (!$flagReinsert) {
$this->listFirstExecution("insert"); $this->listFirstExecution("insert");
@@ -2513,98 +2498,6 @@ class workspaceTools
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
public function migrateCounters()
{
$this->initPropel(true);
// Updating the COMPLETE, DRAFT, INBOX, CANCELLED, PARTICIPATED counters
$query = '
UPDATE '.$this->dbName.'.USERS UA
INNER JOIN
(SELECT
U.USR_UID,
IFNULL(APP_INBOX, 0) USR_TOTAL_INBOX,
IFNULL(APP_DRAFT, 0) USR_TOTAL_DRAFT,
IFNULL(NEW_USR_TOTAL_CANCELED, 0) USR_TOTAL_CANCELLED,
IFNULL(NEW_USR_TOTAL_PARTICIPATED_LAST, 0) USR_TOTAL_PARTICIPATED,
0 USR_TOTAL_PAUSED,
IFNULL(NEW_USR_TOTAL_COMPLETED, 0) USR_TOTAL_COMPLETED,
0 USR_TOTAL_UNASSIGNED
FROM
'.$this->dbName.'.USERS U
LEFT JOIN
(SELECT
USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_PARTICIPATED_LAST
FROM
'.$this->dbName.'.LIST_PARTICIPATED_LAST
GROUP BY USR_UID) LPL ON U.USR_UID = LPL.USR_UID
LEFT JOIN
(SELECT
USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_COMPLETED
FROM
'.$this->dbName.'.LIST_COMPLETED
GROUP BY USR_UID) LCO ON U.USR_UID = LCO.USR_UID
LEFT JOIN
(SELECT
USR_UID, COUNT(DISTINCT APP_UID) APP_INBOX
FROM
'.$this->dbName.'.APP_CACHE_VIEW
WHERE
APP_STATUS = \'TO_DO\'
AND APP_THREAD_STATUS = \'OPEN\'
AND DEL_THREAD_STATUS = \'OPEN\'
AND DEL_FINISH_DATE IS NULL
GROUP BY USR_UID) APP_IN ON U.USR_UID = APP_IN.USR_UID
LEFT JOIN
(SELECT
USR_UID, COUNT(DISTINCT APP_UID) APP_DRAFT
FROM
'.$this->dbName.'.APP_CACHE_VIEW
WHERE
APP_STATUS = \'DRAFT\'
AND APP_THREAD_STATUS = \'OPEN\'
AND DEL_THREAD_STATUS = \'OPEN\'
GROUP BY USR_UID) APP_D ON U.USR_UID = APP_D.USR_UID
LEFT JOIN
(SELECT
USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_CANCELED
FROM
'.$this->dbName.'.LIST_CANCELED
GROUP BY USR_UID) LCA ON U.USR_UID = LCA.USR_UID
) UC
ON UA.USR_UID = UC.USR_UID
SET
UA.USR_TOTAL_INBOX = UC.USR_TOTAL_INBOX,
UA.USR_TOTAL_DRAFT = UC.USR_TOTAL_DRAFT,
UA.USR_TOTAL_CANCELLED = UC.USR_TOTAL_CANCELLED,
UA.USR_TOTAL_PARTICIPATED = UC.USR_TOTAL_PARTICIPATED,
UA.USR_TOTAL_COMPLETED = UC.USR_TOTAL_COMPLETED';
$con = Propel::getConnection("workflow");
$stmt = $con->createStatement();
$stmt->executeQuery($query);
// Updating PAUSED and UNASSIGNED Cases
$aTypes = array(
'paused',
'selfservice'
);
$users = new Users();
$criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_UID);
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while($dataset->next()) {
$aRow = $dataset->getRow();
$oAppCache = new AppCacheView();
$aCount = $oAppCache->getAllCounters($aTypes, $aRow['USR_UID'], false);
$newData = array(
'USR_UID' => $aRow['USR_UID'],
'USR_TOTAL_PAUSED' => $aCount['paused'],
'USR_TOTAL_UNASSIGNED' => $aCount['selfservice']
);
$users->update($newData);
}
}
/** /**
* This function checks if List tables are going to migrated * This function checks if List tables are going to migrated
* *

View File

@@ -322,7 +322,10 @@ class AppEvent extends BaseAppEvent
return $c; return $c;
} catch (Exception $oError) { } catch (Exception $oError) {
$log[] = ' Error execute event : ' . $oError->getMessage(); $log[] = ' Error execute event : ' . $oError->getMessage();
die( $oError->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oError, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
return $oError->getMessage(); return $oError->getMessage();
} }
} }

View File

@@ -97,9 +97,6 @@ class ListCanceled extends BaseListCanceled {
$oListInbox = new ListInbox(); $oListInbox = new ListInbox();
$oListInbox->removeAll($data['APP_UID']); $oListInbox->removeAll($data['APP_UID']);
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'canceled');
//Update - WHERE //Update - WHERE
$criteriaWhere = new Criteria("workflow"); $criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
@@ -306,5 +303,18 @@ class ListCanceled extends BaseListCanceled {
return $data; return $data;
} }
/**
* Returns the number of cases of a user
* @param $usrUid
* @return int
*/
public function getCountList($usrUid)
{
$criteria = new Criteria();
$criteria->add(ListCanceledPeer::USR_UID, $usrUid, Criteria::EQUAL);
$total = ListCanceledPeer::doCount($criteria);
return (int)$total;
}
} // ListCanceled } // ListCanceled

View File

@@ -97,34 +97,6 @@ class ListCompleted extends BaseListCompleted
$criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
$users = new Users();
if($data['USR_UID'] != ''){
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
}
if ($data['DEL_PREVIOUS'] != 0) {
$criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$dataset = TaskPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
if ($aRow['TAS_TYPE'] != 'SUBPROCESS') {
//$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
}
} else {
$criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
//$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
//$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try { try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -320,5 +292,18 @@ class ListCompleted extends BaseListCompleted
return $data; return $data;
} }
/**
* Returns the number of cases of a user
* @param $usrUid
* @return int
*/
public function getCountList($usrUid)
{
$criteria = new Criteria();
$criteria->add(ListCompletedPeer::USR_UID, $usrUid, Criteria::EQUAL);
$total = ListCompletedPeer::doCount($criteria);
return (int)$total;
}
} // ListCompleted } // ListCompleted

View File

@@ -63,8 +63,6 @@ class ListInbox extends BaseListInbox
$oCriteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']); $oCriteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']);
$oCriteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']); $oCriteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']);
ListParticipatedLastPeer::doDelete($oCriteria); ListParticipatedLastPeer::doDelete($oCriteria);
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'removed', 'participated');
} }
$listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast = new ListParticipatedLast();
@@ -110,17 +108,12 @@ class ListInbox extends BaseListInbox
$data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']);
} }
if ($isSelfService) { if ($isSelfService) {
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
$listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'], $data['DEL_INDEX']); $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'], $data['DEL_INDEX']);
//Update //Update
//Update - SET //Update - SET
$criteriaSet = new Criteria("workflow"); $criteriaSet = new Criteria("workflow");
$criteriaSet->add(ListParticipatedLastPeer::USR_UID, $data["USR_UID"]); $criteriaSet->add(ListParticipatedLastPeer::USR_UID, $data["USR_UID"]);
//Update - WHERE //Update - WHERE
$criteriaWhere = new Criteria("workflow"); $criteriaWhere = new Criteria("workflow");
$criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL);
@@ -132,8 +125,6 @@ class ListInbox extends BaseListInbox
//Update //Update
$listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast = new ListParticipatedLast();
$listParticipatedLast->refresh($data); $listParticipatedLast->refresh($data);
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated');
} else { } else {
if (isset($data["APP_UID"]) && isset($data["USER_UID"]) && isset($data["DEL_INDEX"]) && isset($data["APP_TITLE"])) { if (isset($data["APP_UID"]) && isset($data["USER_UID"]) && isset($data["DEL_INDEX"]) && isset($data["APP_TITLE"])) {
//Update //Update
@@ -311,7 +302,6 @@ class ListInbox extends BaseListInbox
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
} }
$users = new Users();
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT); $criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT);
$criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL );
@@ -320,47 +310,11 @@ class ListInbox extends BaseListInbox
if ($dataset->next()) { if ($dataset->next()) {
$aSub = $dataset->getRow(); $aSub = $dataset->getRow();
if ($aSub['DEL_INDEX_PARENT'] == $data['DEL_PREVIOUS'] && !$isSelfService) { if ($aSub['DEL_INDEX_PARENT'] == $data['DEL_PREVIOUS'] && !$isSelfService) {
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
self::create($data, $isSelfService); self::create($data, $isSelfService);
return 1; return 1;
} }
} }
if (!$isInitSubprocess) {
if ($data['APP_STATUS'] == 'DRAFT') {
$users->refreshTotal($data['USR_UID'], 'add', 'draft');
} else {
$oRow = ApplicationPeer::retrieveByPK($data['APP_UID']);
$aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
if ($removeList) {
if ($data['DEL_INDEX'] == 2 || $aFields['APP_STATUS'] == 'DRAFT') {
$criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
if ($dataset->next()) {
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
} else {
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
}
} else {
//$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
}
}
if (!$isSelfService) {
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
}
} else {
if($data['USR_UID'] !=''){
$users->refreshTotal($data['USR_UID'], 'add', 'inbox');
}
if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') {
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft');
} else {
//$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox');
}
}
if ($data['USR_UID'] != '') { if ($data['USR_UID'] != '') {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME);
@@ -598,5 +552,24 @@ class ListInbox extends BaseListInbox
return isset($aRow[$fieldName]) ? $aRow[$fieldName] : NULL; return isset($aRow[$fieldName]) ? $aRow[$fieldName] : NULL;
} }
/**
* Returns the number of cases of a user
* @param $usrUid
* @param string $appStatus
* @return int
*/
public function getCountList($usrUid, $appStatus = 'DRAFT')
{
$criteria = new Criteria();
$criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL);
if ($appStatus == 'TO_DO') {
$criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL);
} else {
$criteria->add(ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL);
}
$total = ListInboxPeer::doCount($criteria);
return (int)$total;
}
} }

View File

@@ -50,9 +50,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$data['DEL_CURRENT_TAS_TITLE'] = $data['APP_TAS_TITLE']; $data['DEL_CURRENT_TAS_TITLE'] = $data['APP_TAS_TITLE'];
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'participated');
} }
} else { } else {
$getData['USR_UID'] = $data['USR_UID_CURRENT']; $getData['USR_UID'] = $data['USR_UID_CURRENT'];
@@ -170,17 +167,13 @@ class ListParticipatedLast extends BaseListParticipatedLast
public function remove ($app_uid, $usr_uid, $del_index) public function remove ($app_uid, $usr_uid, $del_index)
{ {
try { try {
$flagDelete = false;
if (!is_null(ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid, $del_index))) { if (!is_null(ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid, $del_index))) {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
$criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index); $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
$result = ListParticipatedLastPeer::doDelete($criteria); $result = ListParticipatedLastPeer::doDelete($criteria);
$flagDelete = true;
} else { } else {
$criteria = new Criteria("workflow"); $criteria = new Criteria("workflow");
$criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
@@ -190,14 +183,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
$criteria2 = clone $criteria; $criteria2 = clone $criteria;
$result = ListParticipatedLastPeer::doDelete($criteria2); $result = ListParticipatedLastPeer::doDelete($criteria2);
$flagDelete = true;
} }
} }
if ($flagDelete) {
$user = new Users();
$user->refreshTotal($usr_uid, "removed", "participated");
}
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }
@@ -405,5 +392,18 @@ class ListParticipatedLast extends BaseListParticipatedLast
} }
BasePeer::doUpdate($criteriaWhere, $criteriaSet, $con); BasePeer::doUpdate($criteriaWhere, $criteriaSet, $con);
} }
/**
* Returns the number of cases of a user
* @param $usrUid
* @return int
*/
public function getCountList($usrUid)
{
$criteria = new Criteria();
$criteria->add(ListParticipatedLastPeer::USR_UID, $usrUid, Criteria::EQUAL);
$total = ListParticipatedLastPeer::doCount($criteria);
return (int)$total;
}
} }

View File

@@ -112,9 +112,6 @@ class ListPaused extends BaseListPaused {
$oListInbox = new ListInbox(); $oListInbox = new ListInbox();
$oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']);
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'paused');
$con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME );
try { try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -171,9 +168,6 @@ class ListPaused extends BaseListPaused {
*/ */
public function remove ($app_uid, $del_index, $data_inbox) public function remove ($app_uid, $del_index, $data_inbox)
{ {
$users = new Users();
$users->refreshTotal($data_inbox['USR_UID'], 'removed', 'paused');
$oRow = ApplicationPeer::retrieveByPK($app_uid); $oRow = ApplicationPeer::retrieveByPK($app_uid);
$aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
$data_inbox['APP_STATUS'] = $aFields['APP_STATUS']; $data_inbox['APP_STATUS'] = $aFields['APP_STATUS'];
@@ -328,5 +322,18 @@ class ListPaused extends BaseListPaused {
return $data; return $data;
} }
/**
* Returns the number of cases of a user
* @param $usrUid
* @return int
*/
public function getCountList($usrUid)
{
$criteria = new Criteria();
$criteria->add(ListPausedPeer::USR_UID, $usrUid, Criteria::EQUAL);
$total = ListPausedPeer::doCount($criteria);
return (int)$total;
}
} // ListPaused } // ListPaused

View File

@@ -460,5 +460,45 @@ class ListUnassigned extends BaseListUnassigned
return $tasks; return $tasks;
} }
/**
* Returns the number of cases of a user
* @param $userUid
* @return int
*/
public function getCountList($userUid)
{
$criteria = new Criteria('workflow');
$tasks = $this->getSelfServiceTasks($userUid);
$arrayAppAssignSelfServiceValueData = $this->getSelfServiceCasesByEvaluate($userUid);
if (!empty($arrayAppAssignSelfServiceValueData)) {
//Self Service Value Based Assignment
$criterionAux = null;
foreach ($arrayAppAssignSelfServiceValueData as $value) {
if (is_null($criterionAux)) {
$criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd(
$criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd(
$criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL));
} else {
$criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd(
$criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd(
$criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL))->addOr(
$criterionAux
);
}
}
$criteria->add(
$criterionAux->addOr($criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN))
);
} else {
//Self Service
$criteria->add(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN);
}
$total = ListUnassignedPeer::doCount($criteria);
return (int)$total;
}
} }

View File

@@ -192,7 +192,9 @@ class Translation extends BaseTranslation
$res['rowsJS'] = count( $translationJS ); $res['rowsJS'] = count( $translationJS );
return $res; return $res;
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} }
@@ -239,7 +241,9 @@ class Translation extends BaseTranslation
$res['rowsMafeJS'] = count( $translation ); $res['rowsMafeJS'] = count( $translation );
return $res; return $res;
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} }
@@ -362,7 +366,9 @@ class Translation extends BaseTranslation
$res['rowsJS'] = count( $translationJS ); $res['rowsJS'] = count( $translationJS );
return $res; return $res;
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} }

View File

@@ -445,62 +445,17 @@ class Users extends BaseUsers
return $aFields; return $aFields;
} }
public function refreshTotal ($userId, $type = 'add', $list = "inbox", $total = 1) /**
* @Deprecated
* @param $userId
* @param string $type
* @param string $list
* @param int $total
* @throws Exception
*/
public function refreshTotal($userId, $type = 'add', $list = "inbox", $total = 1)
{ {
if ($userId == "") { throw new Exception("This method (refreshTotal) is no longer in use. Please remove reference.");
return;
}
$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;
} }
public function userLanguaje ($usrUid = "") public function userLanguaje ($usrUid = "")

View File

@@ -117,20 +117,6 @@ class UsersMapBuilder
$tMap->addColumn('USR_UX', 'UsrUx', 'string', CreoleTypes::VARCHAR, false, 128); $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->addColumn('USR_COST_BY_HOUR', 'UsrCostByHour', 'double', CreoleTypes::DECIMAL, false, 7,2); $tMap->addColumn('USR_COST_BY_HOUR', 'UsrCostByHour', 'double', CreoleTypes::DECIMAL, false, 7,2);
$tMap->addColumn('USR_UNIT_COST', 'UsrUnitCost', 'string', CreoleTypes::VARCHAR, false, 50); $tMap->addColumn('USR_UNIT_COST', 'UsrUnitCost', 'string', CreoleTypes::VARCHAR, false, 50);

View File

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

View File

@@ -183,48 +183,6 @@ abstract class BaseUsers extends BaseObject implements Persistent
*/ */
protected $usr_ux = 'NORMAL'; 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;
/** /**
* The value for the usr_cost_by_hour field. * The value for the usr_cost_by_hour field.
* @var double * @var double
@@ -645,83 +603,6 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->usr_ux; 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;
}
/** /**
* Get the [usr_cost_by_hour] column value. * Get the [usr_cost_by_hour] column value.
* *
@@ -1388,160 +1269,6 @@ abstract class BaseUsers extends BaseObject implements Persistent
} // setUsrUx() } // 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()
/** /**
* Set the value of [usr_cost_by_hour] column. * Set the value of [usr_cost_by_hour] column.
* *
@@ -1737,38 +1464,24 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->usr_ux = $rs->getString($startcol + 25); $this->usr_ux = $rs->getString($startcol + 25);
$this->usr_total_inbox = $rs->getInt($startcol + 26); $this->usr_cost_by_hour = $rs->getFloat($startcol + 26);
$this->usr_total_draft = $rs->getInt($startcol + 27); $this->usr_unit_cost = $rs->getString($startcol + 27);
$this->usr_total_cancelled = $rs->getInt($startcol + 28); $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 28);
$this->usr_total_participated = $rs->getInt($startcol + 29); $this->usr_bookmark_start_cases = $rs->getString($startcol + 29);
$this->usr_total_paused = $rs->getInt($startcol + 30); $this->usr_time_zone = $rs->getString($startcol + 30);
$this->usr_total_completed = $rs->getInt($startcol + 31); $this->usr_default_lang = $rs->getString($startcol + 31);
$this->usr_total_unassigned = $rs->getInt($startcol + 32);
$this->usr_cost_by_hour = $rs->getFloat($startcol + 33);
$this->usr_unit_cost = $rs->getString($startcol + 34);
$this->usr_pmdrive_folder_uid = $rs->getString($startcol + 35);
$this->usr_bookmark_start_cases = $rs->getString($startcol + 36);
$this->usr_time_zone = $rs->getString($startcol + 37);
$this->usr_default_lang = $rs->getString($startcol + 38);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 39; // 39 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 32; // 32 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Users object", $e); throw new PropelException("Error populating Users object", $e);
@@ -2051,42 +1764,21 @@ abstract class BaseUsers extends BaseObject implements Persistent
return $this->getUsrUx(); return $this->getUsrUx();
break; break;
case 26: 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;
case 33:
return $this->getUsrCostByHour(); return $this->getUsrCostByHour();
break; break;
case 34: case 27:
return $this->getUsrUnitCost(); return $this->getUsrUnitCost();
break; break;
case 35: case 28:
return $this->getUsrPmdriveFolderUid(); return $this->getUsrPmdriveFolderUid();
break; break;
case 36: case 29:
return $this->getUsrBookmarkStartCases(); return $this->getUsrBookmarkStartCases();
break; break;
case 37: case 30:
return $this->getUsrTimeZone(); return $this->getUsrTimeZone();
break; break;
case 38: case 31:
return $this->getUsrDefaultLang(); return $this->getUsrDefaultLang();
break; break;
default: default:
@@ -2135,19 +1827,12 @@ abstract class BaseUsers extends BaseObject implements Persistent
$keys[23] => $this->getUsrReportsTo(), $keys[23] => $this->getUsrReportsTo(),
$keys[24] => $this->getUsrReplacedBy(), $keys[24] => $this->getUsrReplacedBy(),
$keys[25] => $this->getUsrUx(), $keys[25] => $this->getUsrUx(),
$keys[26] => $this->getUsrTotalInbox(), $keys[26] => $this->getUsrCostByHour(),
$keys[27] => $this->getUsrTotalDraft(), $keys[27] => $this->getUsrUnitCost(),
$keys[28] => $this->getUsrTotalCancelled(), $keys[28] => $this->getUsrPmdriveFolderUid(),
$keys[29] => $this->getUsrTotalParticipated(), $keys[29] => $this->getUsrBookmarkStartCases(),
$keys[30] => $this->getUsrTotalPaused(), $keys[30] => $this->getUsrTimeZone(),
$keys[31] => $this->getUsrTotalCompleted(), $keys[31] => $this->getUsrDefaultLang(),
$keys[32] => $this->getUsrTotalUnassigned(),
$keys[33] => $this->getUsrCostByHour(),
$keys[34] => $this->getUsrUnitCost(),
$keys[35] => $this->getUsrPmdriveFolderUid(),
$keys[36] => $this->getUsrBookmarkStartCases(),
$keys[37] => $this->getUsrTimeZone(),
$keys[38] => $this->getUsrDefaultLang(),
); );
return $result; return $result;
} }
@@ -2258,42 +1943,21 @@ abstract class BaseUsers extends BaseObject implements Persistent
$this->setUsrUx($value); $this->setUsrUx($value);
break; break;
case 26: 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;
case 33:
$this->setUsrCostByHour($value); $this->setUsrCostByHour($value);
break; break;
case 34: case 27:
$this->setUsrUnitCost($value); $this->setUsrUnitCost($value);
break; break;
case 35: case 28:
$this->setUsrPmdriveFolderUid($value); $this->setUsrPmdriveFolderUid($value);
break; break;
case 36: case 29:
$this->setUsrBookmarkStartCases($value); $this->setUsrBookmarkStartCases($value);
break; break;
case 37: case 30:
$this->setUsrTimeZone($value); $this->setUsrTimeZone($value);
break; break;
case 38: case 31:
$this->setUsrDefaultLang($value); $this->setUsrDefaultLang($value);
break; break;
} // switch() } // switch()
@@ -2424,55 +2088,27 @@ abstract class BaseUsers extends BaseObject implements Persistent
} }
if (array_key_exists($keys[26], $arr)) { if (array_key_exists($keys[26], $arr)) {
$this->setUsrTotalInbox($arr[$keys[26]]); $this->setUsrCostByHour($arr[$keys[26]]);
} }
if (array_key_exists($keys[27], $arr)) { if (array_key_exists($keys[27], $arr)) {
$this->setUsrTotalDraft($arr[$keys[27]]); $this->setUsrUnitCost($arr[$keys[27]]);
} }
if (array_key_exists($keys[28], $arr)) { if (array_key_exists($keys[28], $arr)) {
$this->setUsrTotalCancelled($arr[$keys[28]]); $this->setUsrPmdriveFolderUid($arr[$keys[28]]);
} }
if (array_key_exists($keys[29], $arr)) { if (array_key_exists($keys[29], $arr)) {
$this->setUsrTotalParticipated($arr[$keys[29]]); $this->setUsrBookmarkStartCases($arr[$keys[29]]);
} }
if (array_key_exists($keys[30], $arr)) { if (array_key_exists($keys[30], $arr)) {
$this->setUsrTotalPaused($arr[$keys[30]]); $this->setUsrTimeZone($arr[$keys[30]]);
} }
if (array_key_exists($keys[31], $arr)) { if (array_key_exists($keys[31], $arr)) {
$this->setUsrTotalCompleted($arr[$keys[31]]); $this->setUsrDefaultLang($arr[$keys[31]]);
}
if (array_key_exists($keys[32], $arr)) {
$this->setUsrTotalUnassigned($arr[$keys[32]]);
}
if (array_key_exists($keys[33], $arr)) {
$this->setUsrCostByHour($arr[$keys[33]]);
}
if (array_key_exists($keys[34], $arr)) {
$this->setUsrUnitCost($arr[$keys[34]]);
}
if (array_key_exists($keys[35], $arr)) {
$this->setUsrPmdriveFolderUid($arr[$keys[35]]);
}
if (array_key_exists($keys[36], $arr)) {
$this->setUsrBookmarkStartCases($arr[$keys[36]]);
}
if (array_key_exists($keys[37], $arr)) {
$this->setUsrTimeZone($arr[$keys[37]]);
}
if (array_key_exists($keys[38], $arr)) {
$this->setUsrDefaultLang($arr[$keys[38]]);
} }
} }
@@ -2590,34 +2226,6 @@ abstract class BaseUsers extends BaseObject implements Persistent
$criteria->add(UsersPeer::USR_UX, $this->usr_ux); $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);
}
if ($this->isColumnModified(UsersPeer::USR_COST_BY_HOUR)) { if ($this->isColumnModified(UsersPeer::USR_COST_BY_HOUR)) {
$criteria->add(UsersPeer::USR_COST_BY_HOUR, $this->usr_cost_by_hour); $criteria->add(UsersPeer::USR_COST_BY_HOUR, $this->usr_cost_by_hour);
} }
@@ -2746,20 +2354,6 @@ abstract class BaseUsers extends BaseObject implements Persistent
$copyObj->setUsrUx($this->usr_ux); $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->setUsrCostByHour($this->usr_cost_by_hour); $copyObj->setUsrCostByHour($this->usr_cost_by_hour);
$copyObj->setUsrUnitCost($this->usr_unit_cost); $copyObj->setUsrUnitCost($this->usr_unit_cost);

View File

@@ -25,7 +25,7 @@ abstract class BaseUsersPeer
const CLASS_DEFAULT = 'classes.model.Users'; const CLASS_DEFAULT = 'classes.model.Users';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 39; const NUM_COLUMNS = 32;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -109,27 +109,6 @@ abstract class BaseUsersPeer
/** the column name for the USR_UX field */ /** the column name for the USR_UX field */
const USR_UX = 'USERS.USR_UX'; 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 column name for the USR_COST_BY_HOUR field */ /** the column name for the USR_COST_BY_HOUR field */
const USR_COST_BY_HOUR = 'USERS.USR_COST_BY_HOUR'; const USR_COST_BY_HOUR = 'USERS.USR_COST_BY_HOUR';
@@ -159,10 +138,10 @@ abstract class BaseUsersPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('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', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', ), 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', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', ),
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, UsersPeer::USR_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, ), 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_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, ),
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', 'USR_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', ), 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_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', ),
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, 33, 34, 35, 36, 37, 38, ) 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, )
); );
/** /**
@@ -172,10 +151,10 @@ abstract class BaseUsersPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('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, 'UsrCostByHour' => 33, 'UsrUnitCost' => 34, 'UsrPmdriveFolderUid' => 35, 'UsrBookmarkStartCases' => 36, 'UsrTimeZone' => 37, 'UsrDefaultLang' => 38, ), 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, 'UsrCostByHour' => 26, 'UsrUnitCost' => 27, 'UsrPmdriveFolderUid' => 28, 'UsrBookmarkStartCases' => 29, 'UsrTimeZone' => 30, 'UsrDefaultLang' => 31, ),
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, UsersPeer::USR_COST_BY_HOUR => 33, UsersPeer::USR_UNIT_COST => 34, UsersPeer::USR_PMDRIVE_FOLDER_UID => 35, UsersPeer::USR_BOOKMARK_START_CASES => 36, UsersPeer::USR_TIME_ZONE => 37, UsersPeer::USR_DEFAULT_LANG => 38, ), 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_COST_BY_HOUR => 26, UsersPeer::USR_UNIT_COST => 27, UsersPeer::USR_PMDRIVE_FOLDER_UID => 28, UsersPeer::USR_BOOKMARK_START_CASES => 29, UsersPeer::USR_TIME_ZONE => 30, UsersPeer::USR_DEFAULT_LANG => 31, ),
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, 'USR_COST_BY_HOUR' => 33, 'USR_UNIT_COST' => 34, 'USR_PMDRIVE_FOLDER_UID' => 35, 'USR_BOOKMARK_START_CASES' => 36, 'USR_TIME_ZONE' => 37, 'USR_DEFAULT_LANG' => 38, ), 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_COST_BY_HOUR' => 26, 'USR_UNIT_COST' => 27, 'USR_PMDRIVE_FOLDER_UID' => 28, 'USR_BOOKMARK_START_CASES' => 29, 'USR_TIME_ZONE' => 30, 'USR_DEFAULT_LANG' => 31, ),
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, 33, 34, 35, 36, 37, 38, ) 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, )
); );
/** /**
@@ -328,20 +307,6 @@ abstract class BaseUsersPeer
$criteria->addSelectColumn(UsersPeer::USR_UX); $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);
$criteria->addSelectColumn(UsersPeer::USR_COST_BY_HOUR); $criteria->addSelectColumn(UsersPeer::USR_COST_BY_HOUR);
$criteria->addSelectColumn(UsersPeer::USR_UNIT_COST); $criteria->addSelectColumn(UsersPeer::USR_UNIT_COST);

View File

@@ -913,7 +913,7 @@
<column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/> <column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/> <column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<column name="PRO_ITEE" type="INTEGER" required="true" default="0"/> <column name="PRO_ITEE" type="INTEGER" required="true" default="0"/>
<column name="PRO_ACTION_DONE" type="LONGVARCHAR" default="" /> <column name="PRO_ACTION_DONE" type="LONGVARCHAR" />
<validator column="PRO_TIMEUNIT"> <validator column="PRO_TIMEUNIT">
<rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/> <rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
</validator> </validator>
@@ -1004,6 +1004,10 @@
<rule name="validValues" value="ACTIVE|INACTIVE" message="Please select a valid status."/> <rule name="validValues" value="ACTIVE|INACTIVE" message="Please select a valid status."/>
<rule name="required" message="Report table status is required."/> <rule name="required" message="Report table status is required."/>
</validator> </validator>
<index name="indexProcessStatus">
<index-column name="PRO_UID"/>
<index-column name="REP_TAB_STATUS"/>
</index>
</table> </table>
<table name="REPORT_VAR"> <table name="REPORT_VAR">
<vendor type="mysql"> <vendor type="mysql">
@@ -1536,13 +1540,6 @@
<column name="USR_REPORTS_TO" type="VARCHAR" size="32" default=""/> <column name="USR_REPORTS_TO" type="VARCHAR" size="32" default=""/>
<column name="USR_REPLACED_BY" 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_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"/>
<column name="USR_COST_BY_HOUR" type="DECIMAL" size="7,2" required="false" default="0"/> <column name="USR_COST_BY_HOUR" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="USR_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/> <column name="USR_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<column name="USR_PMDRIVE_FOLDER_UID" type="VARCHAR" size="32" default="" required="false"/> <column name="USR_PMDRIVE_FOLDER_UID" type="VARCHAR" size="32" default="" required="false"/>
@@ -2163,6 +2160,9 @@
<validator column="SA_STATUS"> <validator column="SA_STATUS">
<rule name="validValues" value="ACTIVE|FINISHED|CANCELLED" message="Please select a valid value for SA_STATUS."/> <rule name="validValues" value="ACTIVE|FINISHED|CANCELLED" message="Please select a valid value for SA_STATUS."/>
</validator> </validator>
<index name="indexParent">
<index-column name="APP_PARENT"/>
</index>
</table> </table>
<table name="LOGIN_LOG"> <table name="LOGIN_LOG">
<vendor type="mysql"> <vendor type="mysql">
@@ -2275,6 +2275,9 @@
<column name="ADD_TAB_TYPE" type="VARCHAR" size="32" required="false" default=""/> <column name="ADD_TAB_TYPE" type="VARCHAR" size="32" required="false" default=""/>
<column name="ADD_TAB_GRID" type="VARCHAR" size="256" required="false" default=""/> <column name="ADD_TAB_GRID" type="VARCHAR" size="256" required="false" default=""/>
<column name="ADD_TAB_TAG" type="VARCHAR" size="256" required="false" default=""/> <column name="ADD_TAB_TAG" type="VARCHAR" size="256" required="false" default=""/>
<index name="indexAdditionalProcess">
<index-column name="PRO_UID"/>
</index>
</table> </table>
<table name="FIELDS"> <table name="FIELDS">
<vendor type="mysql"> <vendor type="mysql">
@@ -2419,6 +2422,11 @@
<parameter name="Comment" value=""/> <parameter name="Comment" value=""/>
</vendor> </vendor>
</index> </index>
<index name="indexStatusActionProcess">
<index-column name="EVN_STATUS"/>
<index-column name="EVN_ACTION"/>
<index-column name="PRO_UID"/>
</index>
</table> </table>
<!--.--> <!--.-->
<table name="GATEWAY"> <table name="GATEWAY">
@@ -4002,6 +4010,9 @@
<column name="ADDON_DOWNLOAD_URL" type="VARCHAR" size="2048" required="false" /> <column name="ADDON_DOWNLOAD_URL" type="VARCHAR" size="2048" required="false" />
<column name="ADDON_DOWNLOAD_PROGRESS" type="FLOAT" required="false" /> <column name="ADDON_DOWNLOAD_PROGRESS" type="FLOAT" required="false" />
<column name="ADDON_DOWNLOAD_MD5" type="VARCHAR" size="32" required="false" /> <column name="ADDON_DOWNLOAD_MD5" type="VARCHAR" size="32" required="false" />
<index name="indexAddonsType">
<index-column name="ADDON_TYPE"/>
</index>
</table> </table>
<table name="LICENSE_MANAGER"> <table name="LICENSE_MANAGER">
@@ -4251,6 +4262,15 @@
<column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/> <column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_CURRENT_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/> <column name="DEL_CURRENT_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
<column name="DEL_CURRENT_USR_LASTNAME" type="VARCHAR" size="50" default=""/> <column name="DEL_CURRENT_USR_LASTNAME" type="VARCHAR" size="50" default=""/>
<index name="usrListCompleted">
<index-column name="USR_UID"/>
<vendor type="mysql">
<parameter name="Table" value="LIST_COMPLETED"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="usrListCompleted"/>
<parameter name="Seq_in_index" value="1"/>
</vendor>
</index>
</table> </table>
<table name="LIST_PAUSED"> <table name="LIST_PAUSED">
<vendor type="mysql"> <vendor type="mysql">
@@ -4789,6 +4809,13 @@
<parameter name="Default" value=""/> <parameter name="Default" value=""/>
</vendor> </vendor>
</column> </column>
<index name="indexAbeProcess">
<index-column name="PRO_UID"/>
</index>
<index name="indexAbeProcessTask">
<index-column name="PRO_UID"/>
<index-column name="TAS_UID"/>
</index>
</table> </table>
<table name="ABE_REQUESTS"> <table name="ABE_REQUESTS">

View File

@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ProcessMaker (Branch 3.1)\n" "Project-Id-Version: ProcessMaker (Branch 3.1)\n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2016-07-11 20:25:46\n" "PO-Revision-Date: 2016-07-29 18:36:34\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n" "Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -472,8 +472,8 @@ msgstr "Assign Screen"
# TRANSLATION # TRANSLATION
# LABEL/ID_ASSIGN_TASK # LABEL/ID_ASSIGN_TASK
#: LABEL/ID_ASSIGN_TASK #: LABEL/ID_ASSIGN_TASK
msgid "Assign Task" msgid "Assign Task/Event"
msgstr "Assign Task" msgstr "Assign Task/Event"
# TRANSLATION # TRANSLATION
# LABEL/ID_UPLOAD # LABEL/ID_UPLOAD
@@ -2602,8 +2602,8 @@ msgstr "Session"
# TRANSLATION # TRANSLATION
# LABEL/ID_NEXT_TASK # LABEL/ID_NEXT_TASK
#: LABEL/ID_NEXT_TASK #: LABEL/ID_NEXT_TASK
msgid "Next Task" msgid "Next Task/Event"
msgstr "Next Task" msgstr "Next Task/Event"
# TRANSLATION # TRANSLATION
# LABEL/ID_PERMISSIONS_FOR_THE_ROL # LABEL/ID_PERMISSIONS_FOR_THE_ROL
@@ -17596,8 +17596,8 @@ msgstr "The process \"{0}\" has the following unwanted code (this code should be
# TRANSLATION # TRANSLATION
# LABEL/ID_LECA # LABEL/ID_LECA
#: LABEL/ID_LECA #: LABEL/ID_LECA
msgid "Your license has expired, please contact your administrator." msgid "Your license has expired. Please contact your administrator."
msgstr "Your license has expired, please contact your administrator." msgstr "Your license has expired. Please contact your administrator."
# TRANSLATION # TRANSLATION
# LABEL/ID_NLIC # LABEL/ID_NLIC
@@ -20752,7 +20752,7 @@ msgstr "There are no items."
# TRANSLATION # TRANSLATION
# LABEL/ID_MAFE_545106eebc5cfec4095c8903a3e5bea9 # LABEL/ID_MAFE_545106eebc5cfec4095c8903a3e5bea9
#: LABEL/ID_MAFE_545106eebc5cfec4095c8903a3e5bea9 #: LABEL/ID_MAFE_545106eebc5cfec4095c8903a3e5bea9
msgid "[LABEL/ID_MAFE_545106eebc5cfec4095c8903a3e5bea9] Next Task" msgid "Next Task"
msgstr "Next Task" msgstr "Next Task"
# TRANSLATION # TRANSLATION
@@ -27503,6 +27503,102 @@ msgstr "This is a Message of Error"
msgid "Can't connect start event to subprocess" msgid "Can't connect start event to subprocess"
msgstr "Can't connect start event to subprocess" msgstr "Can't connect start event to subprocess"
# TRANSLATION
# LABEL/ID_EEPLUGIN_IMPORT_PLUGIN_NOT_IS_ENTERPRISE
#: LABEL/ID_EEPLUGIN_IMPORT_PLUGIN_NOT_IS_ENTERPRISE
msgid "The plugin \"{0}\" not is a Enterprise Edition Plugin"
msgstr "The plugin \"{0}\" not is a Enterprise Edition Plugin"
# TRANSLATION
# LABEL/ID_PMPLUGIN_IMPORT_PLUGIN_IS_ENTERPRISE
#: LABEL/ID_PMPLUGIN_IMPORT_PLUGIN_IS_ENTERPRISE
msgid "The plugin \"{0}\" is a Enterprise Edition Plugin, please install the Enterprise Plugins Manager to use this plugin"
msgstr "The plugin \"{0}\" is a Enterprise Edition Plugin, please install the Enterprise Plugins Manager to use this plugin"
# TRANSLATION
# LABEL/ID_USER_GROUP_NOT_CORRESPOND
#: LABEL/ID_USER_GROUP_NOT_CORRESPOND
msgid "This id: {0} not correspond to a {1}"
msgstr "This id: {0} not correspond to a {1}"
# TRANSLATION
# LABEL/ID_PROCESS_CANNOT_BE_UPDATED_THERE_ARE_TASKS_WITH_ACTIVE_CASES
#: LABEL/ID_PROCESS_CANNOT_BE_UPDATED_THERE_ARE_TASKS_WITH_ACTIVE_CASES
msgid "The process cannot be updated because there are tasks with active cases which are not presented in the new definition of the process, please verify that there are not active cases in those tasks before trying to import the process again."
msgstr "The process cannot be updated because there are tasks with active cases which are not presented in the new definition of the process, please verify that there are not active cases in those tasks before trying to import the process again."
# TRANSLATION
# LABEL/ID_MILLISECONDS
#: LABEL/ID_MILLISECONDS
msgid "Milliseconds"
msgstr "Milliseconds"
# TRANSLATION
# LABEL/ID_FIELD_NOT_FOUND
#: LABEL/ID_FIELD_NOT_FOUND
msgid "Field not found"
msgstr "Field not found"
# TRANSLATION
# LABEL/ID_OUTPUT_DOCUMENT_INVALID_EXTENSION
#: LABEL/ID_OUTPUT_DOCUMENT_INVALID_EXTENSION
msgid "Invalid extension"
msgstr "Invalid extension"
# TRANSLATION
# LABEL/ID_OUTPUT_DOCUMENT_CONFIG_NOT_SUPPORT_EXTENSION
#: LABEL/ID_OUTPUT_DOCUMENT_CONFIG_NOT_SUPPORT_EXTENSION
msgid "The document in its configuration does not support this extension"
msgstr "The document in its configuration does not support this extension"
# TRANSLATION
# LABEL/ID_NOT_EXISTS_FILE
#: LABEL/ID_NOT_EXISTS_FILE
msgid "File does not exists"
msgstr "File does not exists"
# TRANSLATION
# LABEL/ID_EXCEPTION_LOG_INTERFAZ
#: LABEL/ID_EXCEPTION_LOG_INTERFAZ
msgid "An internal error occurred #{0}. Please contact your system administrator for more information."
msgstr "An internal error occurred #{0}. Please contact your system administrator for more information."
# TRANSLATION
# LABEL/ID_CASE_OUTPUT_DOCUMENT_DOES_NOT_EXIST
#: LABEL/ID_CASE_OUTPUT_DOCUMENT_DOES_NOT_EXIST
msgid "This output document with {0}: {1} does not exist."
msgstr "This output document with {0}: {1} does not exist."
# TRANSLATION
# LABEL/ID_MAFE_a9f2bfaa472c55e0975d15c0ba59d24d
#: LABEL/ID_MAFE_a9f2bfaa472c55e0975d15c0ba59d24d
msgid "Before Output Document"
msgstr "Before Output Document"
# TRANSLATION
# LABEL/ID_MAFE_41e80c3ce414de15ab19d996f7072429
#: LABEL/ID_MAFE_41e80c3ce414de15ab19d996f7072429
msgid "fileupload"
msgstr "fileupload"
# TRANSLATION
# LABEL/ID_MAFE_c72d7ee8a23bae4c80e8cc4521f89f7a
#: LABEL/ID_MAFE_c72d7ee8a23bae4c80e8cc4521f89f7a
msgid "Steps for task"
msgstr "Steps for task"
# TRANSLATION
# LABEL/ID_MAFE_d0aac4ce1ac97df2b4c6e456bbe3a061
#: LABEL/ID_MAFE_d0aac4ce1ac97df2b4c6e456bbe3a061
msgid "Expand all"
msgstr "Expand all"
# TRANSLATION
# LABEL/ID_MAFE_ab3cc3868af33a9eb61a93bd0adec2a0
#: LABEL/ID_MAFE_ab3cc3868af33a9eb61a93bd0adec2a0
msgid "Collapse all"
msgstr "Collapse all"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml # additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME #: text - ADD_TAB_NAME

View File

@@ -1235,7 +1235,10 @@ class adminProxy extends HttpProxyController
break; break;
} }
} catch (Exception $oException) { } catch (Exception $oException) {
die($oException->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }
exit(); exit();
} }

View File

@@ -460,7 +460,7 @@ CREATE TABLE `PROCESS`
`PRO_COST` DECIMAL(7,2) default 0, `PRO_COST` DECIMAL(7,2) default 0,
`PRO_UNIT_COST` VARCHAR(50) default '', `PRO_UNIT_COST` VARCHAR(50) default '',
`PRO_ITEE` INTEGER default 0 NOT NULL, `PRO_ITEE` INTEGER default 0 NOT NULL,
`PRO_ACTION_DONE` MEDIUMTEXT default '', `PRO_ACTION_DONE` MEDIUMTEXT,
PRIMARY KEY (`PRO_UID`) PRIMARY KEY (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -493,7 +493,8 @@ CREATE TABLE `REPORT_TABLE`
`REP_TAB_CONNECTION` VARCHAR(32) default '' NOT NULL, `REP_TAB_CONNECTION` VARCHAR(32) default '' NOT NULL,
`REP_TAB_CREATE_DATE` DATETIME NOT NULL, `REP_TAB_CREATE_DATE` DATETIME NOT NULL,
`REP_TAB_STATUS` CHAR(8) default 'ACTIVE' NOT NULL, `REP_TAB_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
PRIMARY KEY (`REP_TAB_UID`) PRIMARY KEY (`REP_TAB_UID`),
KEY `indexProcessStatus`(`PRO_UID`, `REP_TAB_STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- REPORT_VAR #-- REPORT_VAR
@@ -743,13 +744,6 @@ CREATE TABLE `USERS`
`USR_REPORTS_TO` VARCHAR(32) default '', `USR_REPORTS_TO` VARCHAR(32) default '',
`USR_REPLACED_BY` VARCHAR(32) default '', `USR_REPLACED_BY` VARCHAR(32) default '',
`USR_UX` VARCHAR(128) default 'NORMAL', `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,
`USR_COST_BY_HOUR` DECIMAL(7,2) default 0, `USR_COST_BY_HOUR` DECIMAL(7,2) default 0,
`USR_UNIT_COST` VARCHAR(50) default '', `USR_UNIT_COST` VARCHAR(50) default '',
`USR_PMDRIVE_FOLDER_UID` VARCHAR(32) default '', `USR_PMDRIVE_FOLDER_UID` VARCHAR(32) default '',
@@ -1005,7 +999,8 @@ CREATE TABLE `SUB_APPLICATION`
`SA_VALUES_IN` MEDIUMTEXT, `SA_VALUES_IN` MEDIUMTEXT,
`SA_INIT_DATE` DATETIME, `SA_INIT_DATE` DATETIME,
`SA_FINISH_DATE` DATETIME, `SA_FINISH_DATE` DATETIME,
PRIMARY KEY (`APP_UID`,`APP_PARENT`,`DEL_INDEX_PARENT`,`DEL_THREAD_PARENT`) PRIMARY KEY (`APP_UID`,`APP_PARENT`,`DEL_INDEX_PARENT`,`DEL_THREAD_PARENT`),
KEY `indexParent`(`APP_PARENT`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- LOGIN_LOG #-- LOGIN_LOG
@@ -1067,7 +1062,8 @@ CREATE TABLE `ADDITIONAL_TABLES`
`ADD_TAB_TYPE` VARCHAR(32) default '', `ADD_TAB_TYPE` VARCHAR(32) default '',
`ADD_TAB_GRID` VARCHAR(256) default '', `ADD_TAB_GRID` VARCHAR(256) default '',
`ADD_TAB_TAG` VARCHAR(256) default '', `ADD_TAB_TAG` VARCHAR(256) default '',
PRIMARY KEY (`ADD_TAB_UID`) PRIMARY KEY (`ADD_TAB_UID`),
KEY `indexAdditionalProcess`(`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- FIELDS #-- FIELDS
@@ -1145,7 +1141,8 @@ CREATE TABLE `EVENT`
`EVN_TYPE` VARCHAR(32) default '', `EVN_TYPE` VARCHAR(32) default '',
`TAS_EVN_UID` VARCHAR(32) default '', `TAS_EVN_UID` VARCHAR(32) default '',
PRIMARY KEY (`EVN_UID`), PRIMARY KEY (`EVN_UID`),
KEY `indexEventTable`(`EVN_UID`) KEY `indexEventTable`(`EVN_UID`),
KEY `indexStatusActionProcess`(`EVN_STATUS`, `EVN_ACTION`, `PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- GATEWAY #-- GATEWAY
@@ -2230,7 +2227,8 @@ CREATE TABLE `ADDONS_MANAGER`
`ADDON_DOWNLOAD_URL` VARCHAR(2048), `ADDON_DOWNLOAD_URL` VARCHAR(2048),
`ADDON_DOWNLOAD_PROGRESS` FLOAT, `ADDON_DOWNLOAD_PROGRESS` FLOAT,
`ADDON_DOWNLOAD_MD5` VARCHAR(32), `ADDON_DOWNLOAD_MD5` VARCHAR(32),
PRIMARY KEY (`ADDON_ID`,`STORE_ID`) PRIMARY KEY (`ADDON_ID`,`STORE_ID`),
KEY `indexAddonsType`(`ADDON_TYPE`)
)ENGINE=InnoDB ; )ENGINE=InnoDB ;
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- LICENSE_MANAGER #-- LICENSE_MANAGER
@@ -2393,7 +2391,8 @@ CREATE TABLE `LIST_COMPLETED`
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '', `DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',
`DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '', `DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '',
`DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '', `DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '',
PRIMARY KEY (`APP_UID`) PRIMARY KEY (`APP_UID`),
KEY `usrListCompleted`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Completed list'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Completed list';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- LIST_PAUSED #-- LIST_PAUSED
@@ -2705,7 +2704,9 @@ CREATE TABLE `ABE_CONFIGURATION`
`ABE_SUBJECT_FIELD` VARCHAR(100) default '', `ABE_SUBJECT_FIELD` VARCHAR(100) default '',
`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0, `ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
`ABE_CUSTOM_GRID` MEDIUMTEXT, `ABE_CUSTOM_GRID` MEDIUMTEXT,
PRIMARY KEY (`ABE_UID`) PRIMARY KEY (`ABE_UID`),
KEY `indexAbeProcess`(`PRO_UID`),
KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The plugin table for actionsByEmail'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The plugin table for actionsByEmail';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- ABE_REQUESTS #-- ABE_REQUESTS

View File

@@ -136,7 +136,10 @@ try {
$response = isset( $aAuth[$authUID] ) ? 'false' : 'true'; $response = isset( $aAuth[$authUID] ) ? 'false' : 'true';
echo '{success: ' . $response . '}'; echo '{success: ' . $response . '}';
} catch (Exception $ex) { } catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}'; $token = strtotime("now");
PMException::registerErrorLog($ex, $token);
$varRes = '{success: false, error: ' . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . '}';
G::outRes( $varRes );
} }
break; break;
case 'deleteAuthSource': case 'deleteAuthSource':
@@ -145,7 +148,10 @@ try {
$RBAC->removeAuthSource( $_POST['auth_uid'] ); $RBAC->removeAuthSource( $_POST['auth_uid'] );
echo '{success: true}'; echo '{success: true}';
} catch (Exception $ex) { } catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}'; $token = strtotime("now");
PMException::registerErrorLog($ex, $token);
$varRes = '{success: false, error: ' . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . '}';
G::outRes( $varRes );
} }
break; break;
case 'authSourcesNew': case 'authSourcesNew':

View File

@@ -13,7 +13,9 @@ try {
G::header("Location: cases_Scheduler_List?PRO_UID=" . $prossesUid); G::header("Location: cases_Scheduler_List?PRO_UID=" . $prossesUid);
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
exit(0); exit(0);
} }

View File

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

View File

@@ -91,7 +91,10 @@ try {
$G_PUBLISH->AddContent( 'dynaform', 'xmlform', $aDyn['PRO_UID'] . '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' ); $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $aDyn['PRO_UID'] . '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }
?> ?>

View File

@@ -117,6 +117,9 @@ try {
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -143,7 +143,10 @@ try {
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }
?> ?>
<div id="publisherContent[10]" style="display: none"></div> <div id="publisherContent[10]" style="display: none"></div>

View File

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

View File

@@ -136,6 +136,9 @@ try {
G::RenderPage( 'publishBlank', 'blank' ); G::RenderPage( 'publishBlank', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -82,6 +82,9 @@ try {
G::RenderPage( 'publishBlank', 'blank' ); G::RenderPage( 'publishBlank', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -95,6 +95,9 @@ try {
G::RenderPage( 'publishBlank', 'blank' ); G::RenderPage( 'publishBlank', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -69,6 +69,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage );
G::RenderPage( 'publish' ); G::RenderPage( 'publish' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -722,7 +722,9 @@ try {
break; break;
} }
} catch (Exception $e) { } catch (Exception $e) {
echo G::json_encode($e->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::json_encode( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) ) );
} }
/** /**

View File

@@ -70,6 +70,8 @@ try {
$result['data'] = $rows; $result['data'] = $rows;
print G::json_encode( $result ); print G::json_encode( $result );
} catch (Exception $e) { } catch (Exception $e) {
print G::json_encode ($e->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::json_encode( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) ) );
} }

View File

@@ -136,5 +136,8 @@ try {
die('OK'); die('OK');
} catch (Exception $e) { } catch (Exception $e) {
die($e->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -121,9 +121,9 @@ try {
$enable = 'enable'; $enable = 'enable';
}else{ }else{
$enable = 'disable'; $enable = 'disable';
} }
G::auditLog("ConditionsEditorDynaform", "Dynaform Title: " .$aDYN['DYNAFORM_NAME']. ", Condition Editor: [Function: ".$_POST['function']. ", Fields: ".$_POST['fields_selected']. ", Conditions: ".$_POST['condition']. ", Events: ".$_POST['events']. ", Event Owner: ".$_POST['event_owner_selected']. ", Status: ".$enable."]"); G::auditLog("ConditionsEditorDynaform", "Dynaform Title: " .$aDYN['DYNAFORM_NAME']. ", Condition Editor: [Function: ".$_POST['function']. ", Fields: ".$_POST['fields_selected']. ", Conditions: ".$_POST['condition']. ", Events: ".$_POST['events']. ", Event Owner: ".$_POST['event_owner_selected']. ", Status: ".$enable."]");
break; break;
case 'delete': case 'delete':
require_once 'classes/model/FieldCondition.php'; require_once 'classes/model/FieldCondition.php';
@@ -134,7 +134,9 @@ try {
break; break;
} }
} catch (Exception $e) { } catch (Exception $e) {
print ($e->getMessage()) ; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
/* /*

View File

@@ -343,9 +343,16 @@ try {
} else { } else {
$result["addons"] = array(); $result["addons"] = array();
} }
echo G::json_encode($result); G::outRes( G::json_encode($result) );
} catch (Exception $e) { } catch (Exception $e) {
echo G::json_encode(array("success" => false, "errors" => $e->getMessage())); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes(
G::json_encode(array(
"success" => false,
"errors" => G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token))
))
);
} }

View File

@@ -186,5 +186,5 @@ if ($status == 0) {
$response["success"] = false; $response["success"] = false;
} }
echo G::json_encode($response); G::outRes( G::json_encode($response) );

View File

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

View File

@@ -63,6 +63,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'inputdocs/inputdocs_Edit', '', $aFields, '../inputdocs/inputdocs_Save' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'inputdocs/inputdocs_Edit', '', $aFields, '../inputdocs/inputdocs_Save' );
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

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

View File

@@ -18,6 +18,8 @@ try {
echo "Nothing to do"; echo "Nothing to do";
} }
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }

View File

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

View File

@@ -48,6 +48,10 @@ $status = array(
array("pending", G::LoadTranslation('ID_PENDING')) array("pending", G::LoadTranslation('ID_PENDING'))
); );
$pluginRegistry = PMPluginRegistry::getSingleton();
$statusER = $pluginRegistry->getStatusPlugin('externalRegistration');
$flagER = (preg_match('/^enabled$/', $statusER))? 1 : 0;
$processes = getProcessArray($userUid); $processes = getProcessArray($userUid);
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
@@ -58,6 +62,7 @@ $oHeadPublisher->addContent('mails/emailList'); //adding a html file .html.
//sending the columns to display in grid //sending the columns to display in grid
$oHeadPublisher->assign('statusValues', $status); $oHeadPublisher->assign('statusValues', $status);
$oHeadPublisher->assign('processValues', $processes); $oHeadPublisher->assign('processValues', $processes);
$oHeadPublisher->assign('flagER', $flagER);
function getProcessArray($userUid) { function getProcessArray($userUid) {
global $oAppCache; global $oAppCache;

View File

@@ -17,12 +17,16 @@ switch($req){
$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : 'ASC'; $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : 'ASC';
$dateFrom = isset( $_POST["dateFrom"] ) ? substr( $_POST["dateFrom"], 0, 10 ) : ""; $dateFrom = isset( $_POST["dateFrom"] ) ? substr( $_POST["dateFrom"], 0, 10 ) : "";
$dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : ""; $dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : "";
$filterBy = (isset($_REQUEST['filterBy']))? $_REQUEST['filterBy'] : 'ALL';
$response = new stdclass(); $response = new stdclass();
$response->status = 'OK'; $response->status = 'OK';
$delimiter = DBAdapter::getStringDelimiter();
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID); $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
if ($emailStatus != '') { if ($emailStatus != '') {
$criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus); $criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus);
} }
@@ -30,6 +34,34 @@ switch($req){
$criteria->add( ApplicationPeer::PRO_UID, $proUid); $criteria->add( ApplicationPeer::PRO_UID, $proUid);
} }
$arrayType = [];
$pluginRegistry = PMPluginRegistry::getSingleton();
$statusEr = $pluginRegistry->getStatusPlugin('externalRegistration');
$flagEr = (preg_match('/^enabled$/', $statusEr))? 1 : 0;
if ($flagEr == 0) {
$arrayType[] = 'EXTERNAL_REGISTRATION';
}
switch ($filterBy) {
case 'CASES':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, ['TEST', 'EXTERNAL_REGISTRATION'], Criteria::NOT_IN);
break;
case 'TEST':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, 'TEST', Criteria::EQUAL);
break;
case 'EXTERNAL-REGISTRATION':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, 'EXTERNAL_REGISTRATION', Criteria::EQUAL);
break;
default:
if (!empty($arrayType)) {
$criteria->add(AppMessagePeer::APP_MSG_TYPE, $arrayType, Criteria::NOT_IN);
}
break;
}
if ($dateFrom != "") { if ($dateFrom != "") {
if ($dateTo != "") { if ($dateTo != "") {
if ($dateFrom == $dateTo) { if ($dateFrom == $dateTo) {
@@ -92,6 +124,23 @@ switch($req){
$criteria->add( ApplicationPeer::PRO_UID, $proUid); $criteria->add( ApplicationPeer::PRO_UID, $proUid);
} }
switch ($filterBy) {
case 'CASES':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, ['TEST', 'EXTERNAL_REGISTRATION'], Criteria::NOT_IN);
break;
case 'TEST':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, 'TEST', Criteria::EQUAL);
break;
case 'EXTERNAL-REGISTRATION':
$criteria->add(AppMessagePeer::APP_MSG_TYPE, 'EXTERNAL_REGISTRATION', Criteria::EQUAL);
break;
default:
if (!empty($arrayType)) {
$criteria->add(AppMessagePeer::APP_MSG_TYPE, $arrayType, Criteria::NOT_IN);
}
break;
}
if ($dateFrom != "") { if ($dateFrom != "") {
if ($dateTo != "") { if ($dateTo != "") {
if ($dateFrom == $dateTo) { if ($dateFrom == $dateTo) {
@@ -126,8 +175,11 @@ switch($req){
$criteria->setLimit($limit); $criteria->setLimit($limit);
$criteria->setOffset($start); $criteria->setOffset($start);
} }
$criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID); $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID);
$criteria->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID); $criteria->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID);
$result = AppMessagePeer::doSelectRS($criteria); $result = AppMessagePeer::doSelectRS($criteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = Array(); $data = Array();
@@ -139,26 +191,51 @@ switch($req){
$row = $result->getRow(); $row = $result->getRow();
$row['APP_MSG_FROM'] =htmlentities($row['APP_MSG_FROM'], ENT_QUOTES, "UTF-8"); $row['APP_MSG_FROM'] =htmlentities($row['APP_MSG_FROM'], ENT_QUOTES, "UTF-8");
$row['APP_MSG_STATUS'] = ucfirst ( $row['APP_MSG_STATUS']); $row['APP_MSG_STATUS'] = ucfirst ( $row['APP_MSG_STATUS']);
if ($row['DEL_INDEX'] != 0) {
$index = $row['DEL_INDEX']; switch ($filterBy) {
case 'CASES':
if ($row['DEL_INDEX'] != 0) {
$index = $row['DEL_INDEX'];
}
$criteria = new Criteria();
$criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE);
$criteria->add(AppCacheViewPeer::APP_UID, $row['APP_UID'], Criteria::EQUAL);
$criteria->add(AppCacheViewPeer::DEL_INDEX, $index, Criteria::EQUAL);
$resultCacheView = AppCacheViewPeer::doSelectRS($criteria);
$resultCacheView->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$row['APP_TITLE'] = '-';
while ($resultCacheView->next()) {
$rowCacheView = $resultCacheView->getRow();
$row['APP_TITLE'] = $rowCacheView['APP_TITLE'];
$row['TAS_TITLE'] = $rowCacheView['APP_TAS_TITLE'];
}
if ($row['DEL_INDEX'] == 0) {
$row['TAS_TITLE'] = $tasTitleDefault;
}
break;
case 'TEST':
$row['PRO_UID'] = '';
$row['APP_NUMBER'] = '';
$row['PRO_TITLE'] = '';
$row['APP_TITLE'] = '';
$row['TAS_TITLE'] = '';
break;
case 'EXTERNAL-REGISTRATION':
$row['PRO_UID'] = '';
$row['APP_NUMBER'] = '';
$row['PRO_TITLE'] = '';
$row['APP_TITLE'] = '';
$row['TAS_TITLE'] = '';
break;
} }
$criteria = new Criteria();
$criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE);
$criteria->add(AppCacheViewPeer::APP_UID, $row['APP_UID']);
$criteria->add(AppCacheViewPeer::DEL_INDEX, $index);
$resultCacheView = AppCacheViewPeer::doSelectRS($criteria);
$resultCacheView->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$row['APP_TITLE'] = '-';
while ($resultCacheView->next()) {
$rowCacheView = $resultCacheView->getRow();
$row['APP_TITLE'] = $rowCacheView['APP_TITLE'];
$row['TAS_TITLE'] = $rowCacheView['APP_TAS_TITLE'];
}
if ($row['DEL_INDEX'] == 0) {
$row['TAS_TITLE'] = $tasTitleDefault;
}
$data[] = $row; $data[] = $row;
} }
$response = array(); $response = array();

View File

@@ -61,29 +61,29 @@ try {
switch ($type) { switch ($type) {
case 'HTML': case 'HTML':
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$fcontent = ''; $fcontent = '';
$proUid = ''; $proUid = '';
$filename = ''; $filename = '';
$title = ''; $title = '';
require_once 'classes/model/OutputDocument.php'; require_once 'classes/model/OutputDocument.php';
$oOutputDocument = new OutputDocument(); $oOutputDocument = new OutputDocument();
if (isset( $_REQUEST['OUT_DOC_UID'] )) { if (isset( $_REQUEST['OUT_DOC_UID'] )) {
$aFields = $oOutputDocument->load( $_REQUEST['OUT_DOC_UID'] ); $aFields = $oOutputDocument->load( $_REQUEST['OUT_DOC_UID'] );
$fcontent = $aFields['OUT_DOC_TEMPLATE']; $fcontent = $aFields['OUT_DOC_TEMPLATE'];
$proUid = $aFields['PRO_UID']; $proUid = $aFields['PRO_UID'];
$filename = $aFields['OUT_DOC_FILENAME']; $filename = $aFields['OUT_DOC_FILENAME'];
$title = $aFields['OUT_DOC_TITLE']; $title = $aFields['OUT_DOC_TITLE'];
} }
$aData = Array ( $aData = Array (
'PRO_UID' => $proUid, 'PRO_UID' => $proUid,
'OUT_DOC_TEMPLATE' => $fcontent, 'OUT_DOC_TEMPLATE' => $fcontent,
'FILENAME' => $filename, 'FILENAME' => $filename,
'OUT_DOC_UID'=> $_REQUEST['OUT_DOC_UID'], 'OUT_DOC_UID'=> $_REQUEST['OUT_DOC_UID'],
'OUT_DOC_TITLE'=> $title, 'OUT_DOC_TITLE'=> $title,
); );
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Edit', '', $aData ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Edit', '', $aData );
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
die(); die();
break; break;
@@ -98,8 +98,8 @@ try {
$extension = 'pdf'; $extension = 'pdf';
} }
// The ereg_replace function has been DEPRECATED as of PHP 5.3.0. // The ereg_replace function has been DEPRECATED as of PHP 5.3.0.
// $downFileName = ereg_replace('[^A-Za-z0-9_]', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; // $downFileName = ereg_replace('[^A-Za-z0-9_]', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension;
$downFileName = preg_replace( '/[^A-Za-z0-9_]/i', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension; $downFileName = preg_replace( '/[^A-Za-z0-9_]/i', '_', $aFields['OUT_DOC_TITLE'] ) . '.' . $extension;
$filename = PATH_DYNAFORM . $aFields['PRO_UID'] . PATH_SEP . $aFields['OUT_DOC_UID'] . '.' . $extension; $filename = PATH_DYNAFORM . $aFields['PRO_UID'] . PATH_SEP . $aFields['OUT_DOC_UID'] . '.' . $extension;
if (file_exists( $filename )) { if (file_exists( $filename )) {
@@ -115,6 +115,9 @@ try {
} }
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
} PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
}

View File

@@ -72,6 +72,9 @@ try {
} }
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -63,15 +63,15 @@ try {
break; break;
case 'JRXML': case 'JRXML':
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Properties', '', $aFields, '../outputdocs/outputdocs_Save' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Properties', '', $aFields, '../outputdocs/outputdocs_Save' );
/* /*
// $G_PUBLISH->AddContent('xmlform', 'xmlform', 'outputdocs/outputdocsDynaformList', '', $aFields , '../outputdocs/outputdocs_Save'); // $G_PUBLISH->AddContent('xmlform', 'xmlform', 'outputdocs/outputdocsDynaformList', '', $aFields , '../outputdocs/outputdocs_Save');
require_once 'classes/model/Process.php'; require_once 'classes/model/Process.php';
G::LoadClass( 'processMap'); G::LoadClass( 'processMap');
$sProcessUID = $aFields['PRO_UID']; $sProcessUID = $aFields['PRO_UID'];
$oProcess = new Process(); $oProcess = new Process();
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$aFields = $oProcess->load($sProcessUID); $aFields = $oProcess->load($sProcessUID);
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/dynaforms_ShortList', $oProcessMap->getDynaformsCriteria($sProcessUID), $aFields); $G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/dynaforms_ShortList', $oProcessMap->getDynaformsCriteria($sProcessUID), $aFields);
*/ */
break; break;
case 'ACROFORM': case 'ACROFORM':
@@ -80,6 +80,9 @@ try {
} }
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
} PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
}

View File

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

View File

@@ -28,6 +28,10 @@ try {
print "<font face='Arial' size='2' >File uploaded.</font>"; print "<font face='Arial' size='2' >File uploaded.</font>";
} catch (Exception $e) { } catch (Exception $e) {
print "<font face='Arial' size='2' color='red' >Error: " . $e->getMessage() . "</font>"; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
$varRes = "<font face='Arial' size='2' color='red' >Error: " . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "</font>";
G::outRes( $varRes );
die;
} }

View File

@@ -118,7 +118,8 @@ if (isset( $_REQUEST['action'] )) {
G::auditLog("CreateCategory", "Category Name: ".$catName); G::auditLog("CreateCategory", "Category Name: ".$catName);
echo '{success: true}'; echo '{success: true}';
} catch (Exception $ex) { } catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}'; $varEcho = '{success: false, error: ' . $ex->getMessage() . '}';
G::outRes( $varEcho );
} }
break; break;
case 'checkEditCategoryName': case 'checkEditCategoryName':
@@ -149,7 +150,8 @@ if (isset( $_REQUEST['action'] )) {
g::auditLog("UpdateCategory", "Category Name: ".$catName." Category ID: (".$catUID.") "); g::auditLog("UpdateCategory", "Category Name: ".$catName." Category ID: (".$catUID.") ");
echo '{success: true}'; echo '{success: true}';
} catch (Exception $ex) { } catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}'; $varEcho = '{success: false, error: ' . $ex->getMessage() . '}';
G::outRes( $varEcho );
} }
break; break;
case 'canDeleteCategory': case 'canDeleteCategory':
@@ -169,7 +171,8 @@ if (isset( $_REQUEST['action'] )) {
$catName = $cat->loadByCategoryId( $catUID ); $catName = $cat->loadByCategoryId( $catUID );
$cat->delete(); $cat->delete();
G::auditLog("DeleteCategory", "Category Name: ".$catName." Category ID: (".$catUID.") "); G::auditLog("DeleteCategory", "Category Name: ".$catName." Category ID: (".$catUID.") ");
echo '{success: true}'; $varEcho = '{success: true}';
G::outRes( $varEcho );
} catch (Exception $ex) { } catch (Exception $ex) {
echo '{success: false, error: ' . $ex->getMessage() . '}'; echo '{success: false, error: ' . $ex->getMessage() . '}';
} }

View File

@@ -288,7 +288,10 @@ switch ($request) {
$confParams = array('lang' => $lang, 'status' => 'failed'); $confParams = array('lang' => $lang, 'status' => 'failed');
$appCacheViewEngine = $oServerConf->setProperty('APP_CACHE_VIEW_ENGINE', $confParams); $appCacheViewEngine = $oServerConf->setProperty('APP_CACHE_VIEW_ENGINE', $confParams);
echo '{success: false, msg:"' . $e->getMessage() . '"}'; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
$varRes = '{success: false, msg:"' . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . '"}';
G::outRes( $varRes );
} }
break; break;
case 'recreate-root': case 'recreate-root':

View File

@@ -182,7 +182,9 @@ switch ($request) {
// print (FAILED . ',' . $smtp->error['error']) ; // print (FAILED . ',' . $smtp->error['error']) ;
} }
} catch (Exception $e) { } catch (Exception $e) {
print (FAILED . ',' . $e->getMessage()) ; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} else { } else {
print (SUCCESSFUL . ', No authentication required!') ; print (SUCCESSFUL . ', No authentication required!') ;
@@ -214,7 +216,9 @@ switch ($request) {
print (FAILED . ',' . $resp->msg) ; print (FAILED . ',' . $resp->msg) ;
} }
} catch (Exception $e) { } catch (Exception $e) {
print (FAILED . ',' . $e->getMessage()) ; $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} else { } else {

View File

@@ -163,7 +163,9 @@ try {
$trn->removeTranslationEnvironment( $locale ); $trn->removeTranslationEnvironment( $locale );
echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' ); echo G::LoadTranslation( 'ID_LANGUAGE_DELETED_SUCCESSFULLY' );
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(); $token = strtotime("now");
PMException::registerErrorLog($e, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }
} else { } else {
echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) ); echo str_replace( '{0}', $aRow[0], G::LoadTranslation( 'ID_LANGUAGE_CANT_DELETE' ) );
@@ -177,6 +179,8 @@ try {
break; break;
} }
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
} }

View File

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

View File

@@ -100,6 +100,9 @@ try { //ini_set('display_errors','1');
} }
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -20,12 +20,12 @@ BEGIN
SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT CONTENT.CON_VALUE into @APP_TITLE FROM CONTENT WHERE NEW.APP_UID=CON_ID AND CON_CATEGORY='APP_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT APPLICATION.APP_TITLE into @APP_TITLE FROM APPLICATION WHERE NEW.APP_UID=APPLICATION.APP_UID LIMIT 1;
IF ( @APP_TITLE IS NULL ) THEN IF ( @APP_TITLE IS NULL ) THEN
SET @APP_TITLE = ''; SET @APP_TITLE = '';
END IF; END IF;
SELECT CONTENT.CON_VALUE into @APP_PRO_TITLE FROM CONTENT WHERE NEW.PRO_UID=CON_ID AND CON_CATEGORY='PRO_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT PROCESS.PRO_TITLE into @APP_PRO_TITLE FROM PROCESS WHERE NEW.PRO_UID=PROCESS.PRO_UID LIMIT 1;
SELECT CONTENT.CON_VALUE into @APP_TAS_TITLE FROM CONTENT WHERE NEW.TAS_UID=CON_ID AND CON_CATEGORY='TAS_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT TASK.TAS_TITLE into @APP_TAS_TITLE FROM TASK WHERE NEW.TAS_UID=TASK.TAS_UID LIMIT 1;
SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1; SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1;
IF ( @APP_CURRENT_USER IS NULL ) THEN IF ( @APP_CURRENT_USER IS NULL ) THEN
SET @APP_CURRENT_USER = ''; SET @APP_CURRENT_USER = '';

View File

@@ -20,12 +20,12 @@ BEGIN
SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_CREATE_DATE into @APP_CREATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1; SELECT APPLICATION.APP_UPDATE_DATE into @APP_UPDATE_DATE FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
SELECT CONTENT.CON_VALUE into @APP_TITLE FROM CONTENT WHERE NEW.APP_UID=CON_ID AND CON_CATEGORY='APP_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT APPLICATION.APP_TITLE into @APP_TITLE FROM APPLICATION WHERE NEW.APP_UID=APPLICATION.APP_UID LIMIT 1;
IF ( @APP_TITLE IS NULL ) THEN IF ( @APP_TITLE IS NULL ) THEN
SET @APP_TITLE = ''; SET @APP_TITLE = '';
END IF; END IF;
SELECT CONTENT.CON_VALUE into @APP_PRO_TITLE FROM CONTENT WHERE NEW.PRO_UID=CON_ID AND CON_CATEGORY='PRO_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT PROCESS.PRO_TITLE into @APP_PRO_TITLE FROM PROCESS WHERE NEW.PRO_UID=PROCESS.PRO_UID LIMIT 1;
SELECT CONTENT.CON_VALUE into @APP_TAS_TITLE FROM CONTENT WHERE NEW.TAS_UID=CON_ID AND CON_CATEGORY='TAS_TITLE' and CON_LANG = '{lang}' LIMIT 1; SELECT TASK.TAS_TITLE into @APP_TAS_TITLE FROM TASK WHERE NEW.TAS_UID=TASK.TAS_UID LIMIT 1;
SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1; SELECT CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME) INTO @APP_CURRENT_USER FROM USERS WHERE USR_UID = NEW.USR_UID LIMIT 1;
IF ( @APP_CURRENT_USER IS NULL ) THEN IF ( @APP_CURRENT_USER IS NULL ) THEN
SET @APP_CURRENT_USER = ''; SET @APP_CURRENT_USER = '';

View File

@@ -192,12 +192,12 @@ function newSkin ($baseSkin = 'classic')
$response['success'] = true; $response['success'] = true;
$response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESS_CREATE' ); $response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESS_CREATE' );
G::auditLog("CreateSkin", "Skin Name: ".$skinName); G::auditLog("CreateSkin", "Skin Name: ".$skinName);
print_r( G::json_encode( $response ) ); G::outRes( G::json_encode( $response ) );
} catch (Exception $e) { } catch (Exception $e) {
$response['success'] = false; $response['success'] = false;
$response['message'] = $e->getMessage(); $response['message'] = $e->getMessage();
$response['error'] = $e->getMessage(); $response['error'] = $e->getMessage();
print_r( G::json_encode( $response ) ); G::outRes( G::json_encode( $response ) );
} }
} }
@@ -308,12 +308,12 @@ function importSkin ()
$response['success'] = true; $response['success'] = true;
$response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESSFUL_IMPORTED' ); $response['message'] = G::LoadTranslation( 'ID_SKIN_SUCCESSFUL_IMPORTED' );
G::auditLog("ImportSkin", "Skin Name: ".$skinName); G::auditLog("ImportSkin", "Skin Name: ".$skinName);
print_r( G::json_encode( $response ) ); G::outRes( G::json_encode( $response ) );
} catch (Exception $e) { } catch (Exception $e) {
$response['success'] = false; $response['success'] = false;
$response['message'] = $e->getMessage(); $response['message'] = $e->getMessage();
$response['error'] = $e->getMessage(); $response['error'] = $e->getMessage();
print_r( G::json_encode( $response ) ); G::outRes( G::json_encode( $response ) );
} }
} }

View File

@@ -43,6 +43,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/conditions_Edit', '', $aFields, '../steps/conditions_Save' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'steps/conditions_Edit', '', $aFields, '../steps/conditions_Save' );
G::RenderPage( 'publish-raw', 'raw' ); G::RenderPage( 'publish-raw', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -48,6 +48,9 @@ try {
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $value['TAS_UID'] ); $oProcessMap->getStepsCriteria( $value['TAS_UID'] );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

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

View File

@@ -44,6 +44,9 @@ try {
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] ); $oProcessMap->getStepsCriteria( $_POST['TASK'] );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -43,5 +43,8 @@ try {
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] ); $oProcessMap->getStepsCriteria( $_POST['TASK'] );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -42,6 +42,9 @@ try {
$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/steps_availableBB', $oProcessMap->getAvailableBBCriteria( $_GET['PROCESS'], $_GET['TASK'] ), $_GET ); $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/steps_availableBB', $oProcessMap->getAvailableBBCriteria( $_GET['PROCESS'], $_GET['TASK'] ), $_GET );
G::RenderPage( 'publish-raw', 'raw' ); G::RenderPage( 'publish-raw', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -46,6 +46,9 @@ try {
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['sTask'] ); $oProcessMap->getStepsCriteria( $_POST['sTask'] );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

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

View File

@@ -43,5 +43,8 @@ try {
$oProcessMap = new ProcessMap(); $oProcessMap = new ProcessMap();
$oProcessMap->getStepsCriteria( $_POST['TASK'] ); $oProcessMap->getStepsCriteria( $_POST['TASK'] );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

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

View File

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

View File

@@ -46,6 +46,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/tracker_ConditionsEdit', '', $aFields, '../tracker/tracker_ConditionsSave' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/tracker_ConditionsEdit', '', $aFields, '../tracker/tracker_ConditionsSave' );
G::RenderPage( 'publish-raw', 'raw' ); G::RenderPage( 'publish-raw', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -53,6 +53,9 @@ try {
$resultProcess = $infoProcess->load($value['PRO_UID']); $resultProcess = $infoProcess->load($value['PRO_UID']);
G::auditLog('CaseTrackers','Save Condition Case Tracker Object ('.$value['CTO_UID'].', condition: '.$value['CTO_CONDITION'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); G::auditLog('CaseTrackers','Save Condition Case Tracker Object ('.$value['CTO_UID'].', condition: '.$value['CTO_CONDITION'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -56,7 +56,7 @@ try {
$array['TITLE'] = G::LoadTranslation( 'ID_TITLE' ); $array['TITLE'] = G::LoadTranslation( 'ID_TITLE' );
else else
$array['TITLE'] = ''; $array['TITLE'] = '';
// $array['PROCESS'] = G::LoadTranslation('ID_PROCESS'); // $array['PROCESS'] = G::LoadTranslation('ID_PROCESS');
$array['DATELABEL'] = G::LoadTranslation( 'DATE_LABEL' ); $array['DATELABEL'] = G::LoadTranslation( 'DATE_LABEL' );
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
@@ -65,37 +65,40 @@ try {
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }
?> ?>
<script> <script>
try{ try{
oFields = document.getElementsByTagName('input'); oFields = document.getElementsByTagName('input');
for(i=0; i<oFields.length; i++){ for(i=0; i<oFields.length; i++){
if(oFields[i].type == 'button' || oFields[i].type == 'submit') if(oFields[i].type == 'button' || oFields[i].type == 'submit')
oFields[i].style.display="none"; oFields[i].style.display="none";
else else
oFields[i].disabled="true"; oFields[i].disabled="true";
} }
oFields = document.getElementsByTagName('textarea'); oFields = document.getElementsByTagName('textarea');
for(i=0; i<oFields.length; i++){ for(i=0; i<oFields.length; i++){
oFields[i].disabled="true"; oFields[i].disabled="true";
} }
oFields = document.getElementsByTagName('select'); oFields = document.getElementsByTagName('select');
for(i=0; i<oFields.length; i++){ for(i=0; i<oFields.length; i++){
oFields[i].disabled="true"; oFields[i].disabled="true";
} }
oFields = document.getElementsByTagName('td'); oFields = document.getElementsByTagName('td');
for(i=0; i<oFields.length; i++){ for(i=0; i<oFields.length; i++){
if(oFields[i].className == 'withoutLabel' ){ if(oFields[i].className == 'withoutLabel' ){
oFields[i].style.display="none"; oFields[i].style.display="none";
break; break;
} }
} }
window.print(); window.print();
} catch(e){} } catch(e){}
</script> </script>

View File

@@ -163,6 +163,9 @@ try {
G::RenderPage( 'publish' ); G::RenderPage( 'publish' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -164,6 +164,9 @@ try {
G::SendTemporalMessage( 'ID_CHANGES_SAVED', 'info', 'labels' ); G::SendTemporalMessage( 'ID_CHANGES_SAVED', 'info', 'labels' );
G::header( 'location: myInfo' ); G::header( 'location: myInfo' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -440,7 +440,6 @@ try {
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL); $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
$oCriteria->addSelectColumn(UsersPeer::USR_ROLE); $oCriteria->addSelectColumn(UsersPeer::USR_ROLE);
$oCriteria->addSelectColumn(UsersPeer::USR_TOTAL_PARTICIPATED);
$oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE); $oCriteria->addSelectColumn(UsersPeer::USR_DUE_DATE);
$oCriteria->addSelectColumn(UsersPeer::USR_STATUS); $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
$oCriteria->addSelectColumn(UsersPeer::USR_UX); $oCriteria->addSelectColumn(UsersPeer::USR_UX);
@@ -482,6 +481,8 @@ try {
$uxList = adminProxy::getUxTypesList(); $uxList = adminProxy::getUxTypesList();
$oRoles = new Roles(); $oRoles = new Roles();
$oParticipated = new ListParticipatedLast();
$oAppCache = new AppCacheView();
$rows = Array(); $rows = Array();
$uRole = Array(); $uRole = Array();
while ($oDataset->next()) { while ($oDataset->next()) {
@@ -490,15 +491,23 @@ try {
try { try {
$uRole = $oRoles->loadByCode($row['USR_ROLE']); $uRole = $oRoles->loadByCode($row['USR_ROLE']);
} catch (exception $oError) { } catch (exception $oError) {
$uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' ); $uRole['ROL_NAME'] = G::loadTranslation('ID_DELETED');
} }
/*----------------------------------********---------------------------------*/
if (true) {
$total = $oParticipated->getCountList($row['USR_UID']);
} else {
/*----------------------------------********---------------------------------*/
$total = $oAppCache->getListCounters('sent', $row['USR_UID'], false);
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
$row['USR_ROLE_ID'] = $row['USR_ROLE']; $row['USR_ROLE_ID'] = $row['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE']; $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1; $row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aLogin[$row['USR_UID']]) : ''; $row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? \ProcessMaker\Util\DateTime::convertUtcToTimeZone($aLogin[$row['USR_UID']]) : '';
$row['TOTAL_CASES'] = isset($row['USR_TOTAL_PARTICIPATED']) ? $row['USR_TOTAL_PARTICIPATED'] : 0; $row['TOTAL_CASES'] = $total;
$row['DEP_TITLE'] = isset($aDepart[$row['USR_UID']]) ? $aDepart[$row['USR_UID']] : ''; $row['DEP_TITLE'] = isset($aDepart[$row['USR_UID']]) ? $aDepart[$row['USR_UID']] : '';
$row['USR_UX'] = isset($uxList[$row['USR_UX']]) ? $uxList[$row['USR_UX']] : $uxList['NORMAL']; $row['USR_UX'] = isset($uxList[$row['USR_UX']]) ? $uxList[$row['USR_UX']] : $uxList['NORMAL'];
$row['USR_AUTH_SOURCE'] = isset($aAuthSources[$row['USR_UID']]) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)'; $row['USR_AUTH_SOURCE'] = isset($aAuthSources[$row['USR_UID']]) ? $aAuthSources[$row['USR_UID']] : 'ProcessMaker (MYSQL)';
@@ -584,5 +593,8 @@ try {
break; break;
} }
} catch (Exception $oException) { } catch (Exception $oException) {
die($oException->getMessage()); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -65,6 +65,9 @@ try {
$oUser->update( $aFields ); $oUser->update( $aFields );
G::header( 'location: users_List' ); G::header( 'location: users_List' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -82,6 +82,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_ReassignShowInfo', '', $aMessage ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_ReassignShowInfo', '', $aMessage );
G::RenderPage( 'publish' ); G::RenderPage( 'publish' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -150,6 +150,9 @@ try {
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -48,6 +48,9 @@ try {
$G_PUBLISH->AddContent( 'view', 'users/users_Tree' ); $G_PUBLISH->AddContent( 'view', 'users/users_Tree' );
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (exception $oException) { } catch (exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

@@ -112,6 +112,9 @@ try {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save' );
G::RenderPage( 'publish', 'blank' ); G::RenderPage( 'publish', 'blank' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

View File

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

View File

@@ -106,6 +106,9 @@ try {
} }
G::RenderPage( 'publish', 'raw' ); G::RenderPage( 'publish', 'raw' );
} catch (Exception $oException) { } catch (Exception $oException) {
die( $oException->getMessage() ); $token = strtotime("now");
PMException::registerErrorLog($oException, $token);
G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
die;
} }

Some files were not shown because too many files have changed in this diff Show More