manual merge of the upstream branch
This commit is contained in:
@@ -151,8 +151,16 @@ class AppDelegation extends BaseAppDelegation
|
||||
if ($this->validate()) {
|
||||
try {
|
||||
$res = $this->save();
|
||||
$inbox = new ListInbox();
|
||||
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
|
||||
|
||||
/*----------------------------------********---------------------------------*/
|
||||
$task = TaskPeer::retrieveByPK( $this->getTasUid() );
|
||||
$taskType = $task->getTasType();
|
||||
if($taskType == 'NORMAL'){
|
||||
$inbox = new ListInbox();
|
||||
$res = $this->toArray(BasePeer::TYPE_FIELDNAME);
|
||||
$inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
|
||||
}
|
||||
/*----------------------------------********---------------------------------*/
|
||||
} catch (PropelException $e) {
|
||||
throw ($e);
|
||||
}
|
||||
@@ -224,6 +232,10 @@ class AppDelegation extends BaseAppDelegation
|
||||
$c->addSelectColumn( AppDelegationPeer::PRO_UID );
|
||||
$c->addSelectColumn( AppDelegationPeer::TAS_UID );
|
||||
$c->addSelectColumn( AppDelegationPeer::USR_UID );
|
||||
$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
|
||||
$c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
|
||||
$c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
|
||||
$c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
|
||||
|
||||
$c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
|
||||
$c->add( AppDelegationPeer::APP_UID, $AppUid );
|
||||
@@ -236,8 +248,14 @@ class AppDelegation extends BaseAppDelegation
|
||||
|
||||
while (is_array($row)) {
|
||||
$case = array();
|
||||
$case['TAS_UID'] = $row['TAS_UID'];
|
||||
$case['USR_UID'] = $row['USR_UID'];
|
||||
$case['TAS_UID'] = $row['TAS_UID'];
|
||||
$case['USR_UID'] = $row['USR_UID'];
|
||||
$case['DEL_INDEX'] = $row['DEL_INDEX'];
|
||||
$case['TAS_UID'] = $row['TAS_UID'];
|
||||
$case['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE'];
|
||||
$case['DEL_INIT_DATE'] = $row['DEL_INIT_DATE'];
|
||||
$case['DEL_TASK_DUE_DATE'] = $row['DEL_TASK_DUE_DATE'];
|
||||
$case['DEL_FINISH_DATE'] = $row['DEL_FINISH_DATE'];
|
||||
$aCases[] = $case;
|
||||
$rs->next();
|
||||
$row = $rs->getRow();
|
||||
|
||||
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseBpmnFlow.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'BPMN_FLOW' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -58,7 +58,11 @@ class BpmnFlow extends BaseBpmnFlow
|
||||
$c = new Criteria('workflow');
|
||||
|
||||
foreach ($field as $key => $value) {
|
||||
$c->add($key, $value, Criteria::EQUAL);
|
||||
if (is_array($value)) {
|
||||
$c->add($key, $value[0], $value[1]);
|
||||
} else {
|
||||
$c->add($key, $value, Criteria::EQUAL);
|
||||
}
|
||||
}
|
||||
|
||||
return BpmnFlowPeer::doSelect($c);
|
||||
@@ -145,3 +149,4 @@ class BpmnFlow extends BaseBpmnFlow
|
||||
}*/
|
||||
|
||||
} // BpmnFlow
|
||||
|
||||
|
||||
2
workflow/engine/classes/model/BpmnLane.php
Normal file → Executable file
2
workflow/engine/classes/model/BpmnLane.php
Normal file → Executable file
@@ -78,7 +78,7 @@ class BpmnLane extends BaseBpmnLane {
|
||||
if (! is_null($prjUid)) {
|
||||
$c->add(BpmnLanePeer::PRJ_UID, $prjUid, Criteria::EQUAL);
|
||||
}
|
||||
|
||||
$c->addAscendingOrderByColumn(BpmnBoundPeer::BOU_REL_POSITION);
|
||||
$rs = BpmnLanePeer::doSelectRS($c);
|
||||
$rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
|
||||
@@ -53,6 +53,30 @@ class CaseScheduler extends BaseCaseScheduler
|
||||
throw ($e);
|
||||
}
|
||||
$con->commit();
|
||||
|
||||
//Add Audit Log
|
||||
$perform = $aData["SCH_OPTION"];
|
||||
|
||||
switch ($aData['SCH_OPTION']) {
|
||||
case '1':
|
||||
$perform = 'Daily';
|
||||
break;
|
||||
case '2':
|
||||
$perform = 'Weekly';
|
||||
break;
|
||||
case '3':
|
||||
$perform = 'Monthly';
|
||||
break;
|
||||
case '4':
|
||||
$perform = 'One time only';
|
||||
break;
|
||||
case '5':
|
||||
$perform = 'Every';
|
||||
break;
|
||||
|
||||
}
|
||||
G::auditLog("CreateCaseScheduler", "Scheduler Name: ".$aData['SCH_NAME'].", Task: ".$aData['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$aData['SCH_START_DATE'].", End Date: ".$aData['SCH_END_DATE'].", Execution time : ".$aData['SCH_START_TIME']);
|
||||
|
||||
return $result;
|
||||
} catch (Exception $e) {
|
||||
$con->rollback();
|
||||
@@ -70,6 +94,27 @@ class CaseScheduler extends BaseCaseScheduler
|
||||
if ($this->validate()) {
|
||||
$result = $this->save();
|
||||
$con->commit();
|
||||
|
||||
//Add Audit Log
|
||||
switch ($fields['SCH_OPTION']){
|
||||
case '1':
|
||||
$perform = 'Daily';
|
||||
break;
|
||||
case '2':
|
||||
$perform = 'Weekly';
|
||||
break;
|
||||
case '3':
|
||||
$perform = 'Monthly';
|
||||
break;
|
||||
case '4':
|
||||
$perform = 'One time only';
|
||||
break;
|
||||
case '5':
|
||||
$perform = 'Every';
|
||||
break;
|
||||
}
|
||||
G::auditLog("UpdateCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID'].", Perform this task: ".$perform.", Start Date: ".$fields['SCH_START_DATE'].", End Date: ".$fields['SCH_END_DATE'].", Execution time : ".$fields['SCH_START_TIME']);
|
||||
|
||||
return $result;
|
||||
} else {
|
||||
$con->rollback();
|
||||
@@ -87,8 +132,12 @@ class CaseScheduler extends BaseCaseScheduler
|
||||
try {
|
||||
$oCaseScheduler = CaseSchedulerPeer::retrieveByPK( $SchUid );
|
||||
if (! is_null( $oCaseScheduler )) {
|
||||
$fields = $this->Load( $SchUid );
|
||||
$iResult = $oCaseScheduler->delete();
|
||||
$con->commit();
|
||||
//Add Audit Log
|
||||
G::auditLog("DeleteCaseScheduler", "Scheduler Name: ".$fields['SCH_NAME'].", Task: ".$fields['TAS_UID']);
|
||||
|
||||
return $iResult;
|
||||
} else {
|
||||
throw (new Exception( 'This row doesn\'t exist!' ));
|
||||
|
||||
@@ -141,6 +141,9 @@ class DbSource extends BaseDbSource
|
||||
if ($this->validate()) {
|
||||
$result = $this->save();
|
||||
$con->commit();
|
||||
//Add Audit Log
|
||||
G::auditLog("UpdateDatabaseConnection", "Connection Uid: ".$fields['DBS_UID'].", Connection Engine: ".$fields['DBS_TYPE'].", Connection Encode: ".$fields['DBS_ENCODE'].", Connection Server: ".$fields['DBS_SERVER'].", Connection Database: ".$fields['DBS_DATABASE_NAME'].", Connection Port: ".$fields['DBS_PORT']);
|
||||
|
||||
return $result;
|
||||
} else {
|
||||
$con->rollback();
|
||||
@@ -156,6 +159,7 @@ class DbSource extends BaseDbSource
|
||||
{
|
||||
$con = Propel::getConnection(DbSourcePeer::DATABASE_NAME);
|
||||
try {
|
||||
$fields = $this->load($DbsUid, $ProUID);
|
||||
$con->begin();
|
||||
$this->setDbsUid($DbsUid);
|
||||
$this->setProUid($ProUID);
|
||||
@@ -167,6 +171,9 @@ class DbSource extends BaseDbSource
|
||||
}
|
||||
$result = $this->delete();
|
||||
$con->commit();
|
||||
//Add Audit Log
|
||||
G::auditLog("DeleteDatabaseConnection", "Connection Uid: ".$DbsUid.", Connection Engine: ".$fields['DBS_TYPE'].", Connection Database: ".$fields['DBS_DATABASE_NAME']);
|
||||
|
||||
return $result;
|
||||
} catch (exception $e) {
|
||||
$con->rollback();
|
||||
@@ -196,6 +203,9 @@ class DbSource extends BaseDbSource
|
||||
throw ($e);
|
||||
}
|
||||
$con->commit();
|
||||
//Add Audit Log
|
||||
G::auditLog("CreateDatabaseConnection", "Connection Uid: ".$aData['DBS_UID'].", Connection Engine: ".$aData['DBS_TYPE'].", Connection Encode: ".$aData['DBS_ENCODE'].", Connection Server: ".$aData['DBS_SERVER'].", Connection Database: ".$aData['DBS_DATABASE_NAME'].", Connection Port: ".$aData['DBS_PORT']);
|
||||
|
||||
return $this->getDbsUid();
|
||||
} catch (exception $e) {
|
||||
$con->rollback();
|
||||
|
||||
@@ -150,7 +150,7 @@ class Dynaform extends BaseDynaform
|
||||
* @return void
|
||||
*/
|
||||
|
||||
public function create ($aData)
|
||||
public function create ($aData, $pmTableUid='')
|
||||
{
|
||||
if (! isset( $aData['PRO_UID'] )) {
|
||||
throw (new PropelException( 'The dynaform cannot be created. The PRO_UID is empty.' ));
|
||||
@@ -194,6 +194,17 @@ class Dynaform extends BaseDynaform
|
||||
}
|
||||
|
||||
$con->commit();
|
||||
|
||||
//Add Audit Log
|
||||
$mode = isset($aData['MODE'])? $aData['MODE'] : 'Determined by Fields';
|
||||
$description = "";
|
||||
if($pmTableUid!=''){
|
||||
$pmTable = AdditionalTablesPeer::retrieveByPK( $pmTableUid );
|
||||
$addTabName = $pmTable->getAddTabName();
|
||||
$description = "Create from a PM Table: ".$addTabName.", ";
|
||||
}
|
||||
G::auditLog("CreateDynaform", $description."Dynaform Title: ".$aData['DYN_TITLE'].", Type: ".$aData['DYN_TYPE'].", Description: ".$aData['DYN_DESCRIPTION'].", Mode: ".$mode);
|
||||
|
||||
$sXml = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
|
||||
$sXml .= '<dynaForm type="' . $this->getDynType() . '" name="' . $this->getProUid() . '/' . $this->getDynUid() . '" width="500" enabletemplate="0" mode="" nextstepsave="prompt">' . "\n";
|
||||
$sXml .= '</dynaForm>';
|
||||
@@ -232,7 +243,7 @@ class Dynaform extends BaseDynaform
|
||||
|
||||
public function createFromPMTable ($aData, $pmTableUid)
|
||||
{
|
||||
$this->create( $aData );
|
||||
$this->create( $aData , $pmTableUid);
|
||||
$aData['DYN_UID'] = $this->getDynUid();
|
||||
//krumo(BasePeer::getFieldnames('Content'));
|
||||
$fields = array ();
|
||||
@@ -591,9 +602,17 @@ class Dynaform extends BaseDynaform
|
||||
try {
|
||||
$oPro = DynaformPeer::retrieveByPK( $ProUid );
|
||||
if (! is_null( $oPro )) {
|
||||
$title = $oPro->getDynTitle();
|
||||
$type = $oPro->getDynType();
|
||||
$description = $oPro->getDynDescription();
|
||||
|
||||
Content::removeContent( 'DYN_TITLE', '', $oPro->getDynUid() );
|
||||
Content::removeContent( 'DYN_DESCRIPTION', '', $oPro->getDynUid() );
|
||||
$iResult = $oPro->delete();
|
||||
|
||||
//Add Audit Log
|
||||
G::auditLog("DeleteDynaform", "Dynaform Title: ".$title.", Type: ".$type.", Description: ".$description);
|
||||
|
||||
if (file_exists( PATH_DYNAFORM . $oPro->getProUid() . PATH_SEP . $oPro->getDynUid() . '.xml' )) {
|
||||
unlink( PATH_DYNAFORM . $oPro->getProUid() . PATH_SEP . $oPro->getDynUid() . '.xml' );
|
||||
}
|
||||
|
||||
@@ -126,6 +126,34 @@ class InputDocument extends BaseInputDocument
|
||||
}
|
||||
$iResult = $oInputDocument->save();
|
||||
$oConnection->commit();
|
||||
//Add Audit Log
|
||||
switch ($aData['INP_DOC_FORM_NEEDED']){
|
||||
case 'VIRTUAL':
|
||||
$docType = 'Digital';
|
||||
break;
|
||||
case 'REAL':
|
||||
$docType = 'Printed';
|
||||
break;
|
||||
case 'VREAL':
|
||||
$docType = 'Digital/Printed';
|
||||
break;
|
||||
}
|
||||
if(isset($aData['INP_DOC_VERSIONING']) && $aData['INP_DOC_VERSIONING'] == 1){
|
||||
$enableVersion = 'Yes';
|
||||
}else{
|
||||
$enableVersion = 'No';
|
||||
}
|
||||
$description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType;
|
||||
if(!empty($aData['INP_DOC_DESCRIPTION'])){
|
||||
$description .= ", Description: ".$aData['INP_DOC_DESCRIPTION'];
|
||||
}
|
||||
if(!empty($aData['INP_DOC_DESTINATION_PATH'])){
|
||||
$description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH'];
|
||||
}
|
||||
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB";
|
||||
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'].", Maximum Input Document file size: ".$inputDocMaxFileSize;
|
||||
G::auditLog("CreateInputDocument", $description);
|
||||
|
||||
return $aData['INP_DOC_UID'];
|
||||
} else {
|
||||
$sMessage = '';
|
||||
@@ -165,6 +193,34 @@ class InputDocument extends BaseInputDocument
|
||||
}
|
||||
$iResult = $oInputDocument->save();
|
||||
$oConnection->commit();
|
||||
//Add Audit Log
|
||||
switch ($aData['INP_DOC_FORM_NEEDED']){
|
||||
case 'VIRTUAL':
|
||||
$docType = 'Digital';
|
||||
break;
|
||||
case 'REAL':
|
||||
$docType = 'Printed';
|
||||
break;
|
||||
case 'VREAL':
|
||||
$docType = 'Digital/Printed';
|
||||
break;
|
||||
}
|
||||
if(isset($aData['INP_DOC_VERSIONING']) && $aData['INP_DOC_VERSIONING'] == 1){
|
||||
$enableVersion = 'Yes';
|
||||
}else{
|
||||
$enableVersion = 'No';
|
||||
}
|
||||
$description = "Input Document Title: ".$aData['INP_DOC_TITLE'].", Input Document Uid: ".$aData['INP_DOC_UID'].", Document Type: ".$docType;
|
||||
if(!empty($aData['INP_DOC_DESCRIPTION'])){
|
||||
$description .= ", Description: ".$aData['INP_DOC_DESCRIPTION'];
|
||||
}
|
||||
if(!empty($aData['INP_DOC_DESTINATION_PATH'])){
|
||||
$description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH'];
|
||||
}
|
||||
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB";
|
||||
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'].", Maximum Input Document file size: ".$inputDocMaxFileSize;
|
||||
G::auditLog("UpdateInputDocument", $description);
|
||||
|
||||
return $iResult;
|
||||
} else {
|
||||
$sMessage = '';
|
||||
@@ -196,11 +252,18 @@ class InputDocument extends BaseInputDocument
|
||||
try {
|
||||
$oInputDocument = InputDocumentPeer::retrieveByPK( $sInpDocUid );
|
||||
if (! is_null( $oInputDocument )) {
|
||||
$nameInput = $this->getInpDocTitle();
|
||||
$descInput = $this->getInpDocDescription();
|
||||
$oConnection->begin();
|
||||
Content::removeContent( 'INP_DOC_TITLE', '', $oInputDocument->getInpDocUid() );
|
||||
Content::removeContent( 'INP_DOC_DESCRIPTION', '', $oInputDocument->getInpDocUid() );
|
||||
$iResult = $oInputDocument->delete();
|
||||
$oConnection->commit();
|
||||
//Add Audit Log
|
||||
$nameInput = $this->getInpDocTitle();
|
||||
$descInput = $this->getInpDocDescription();
|
||||
G::auditLog("DeleteInputDocument", "Input Document Name: ".$nameInput.", Input Document Uid: ".$sInpDocUid.", Description: ".$descInput);
|
||||
|
||||
return $iResult;
|
||||
} else {
|
||||
throw (new Exception( 'This row doesn\'t exist!' ));
|
||||
|
||||
308
workflow/engine/classes/model/ListCanceled.php
Normal file
308
workflow/engine/classes/model/ListCanceled.php
Normal file
File diff suppressed because it is too large
Load Diff
23
workflow/engine/classes/model/ListCanceledPeer.php
Normal file
23
workflow/engine/classes/model/ListCanceledPeer.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
// include base peer class
|
||||
require_once 'classes/model/om/BaseListCanceledPeer.php';
|
||||
|
||||
// include object class
|
||||
include_once 'classes/model/ListCanceled.php';
|
||||
|
||||
|
||||
/**
|
||||
* Skeleton subclass for performing query and update operations on the 'LIST_CANCELED' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
* long as it does not already exist in the output directory.
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
class ListCanceledPeer extends BaseListCanceledPeer {
|
||||
|
||||
} // ListCanceledPeer
|
||||
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseListCompleted.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_COMPLETED' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -248,6 +248,11 @@ class ListCompleted extends BaseListCompleted
|
||||
$criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME);
|
||||
$criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_USERNAME);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListCompletedPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$criteria->add( ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL );
|
||||
self::loadFilters($criteria, $filters);
|
||||
|
||||
@@ -279,3 +284,4 @@ class ListCompleted extends BaseListCompleted
|
||||
return $data;
|
||||
}
|
||||
} // ListCompleted
|
||||
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
|
||||
require_once 'classes/model/om/BaseListInbox.php';
|
||||
|
||||
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_INBOX' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -14,6 +13,7 @@ require_once 'classes/model/om/BaseListInbox.php';
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
|
||||
class ListInbox extends BaseListInbox
|
||||
{
|
||||
/**
|
||||
@@ -47,9 +47,11 @@ class ListInbox extends BaseListInbox
|
||||
|
||||
// remove and create participated last
|
||||
$listParticipatedLast = new ListParticipatedLast();
|
||||
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID']);
|
||||
$listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'],$data['DEL_INDEX']);
|
||||
$listParticipatedLast = new ListParticipatedLast();
|
||||
$listParticipatedLast->create($data);
|
||||
$listParticipatedLast->create($data);
|
||||
$listParticipatedLast = new ListParticipatedLast();
|
||||
$listParticipatedLast->refresh($data);
|
||||
|
||||
return $result;
|
||||
} catch(Exception $e) {
|
||||
@@ -78,14 +80,7 @@ class ListInbox extends BaseListInbox
|
||||
|
||||
// update participated history
|
||||
$listParticipatedHistory = new ListParticipatedHistory();
|
||||
$listParticipatedHistory->update($data);
|
||||
|
||||
$oRow = ListInboxPeer::retrieveByPK( $data['APP_UID'], $data['DEL_INDEX'] );
|
||||
$newData = $oRow->toArray( BasePeer::TYPE_FIELDNAME );
|
||||
|
||||
// update participated last
|
||||
$listParticipatedLast = new ListParticipatedLast();
|
||||
$listParticipatedLast->update($newData);
|
||||
$listParticipatedHistory->update($data);
|
||||
return $result;
|
||||
} else {
|
||||
$con->rollback();
|
||||
@@ -121,9 +116,35 @@ class ListInbox extends BaseListInbox
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove All List Inbox
|
||||
*
|
||||
* @param type $seqName
|
||||
* @return type
|
||||
* @throws type
|
||||
*
|
||||
*/
|
||||
public function removeAll ($app_uid)
|
||||
{
|
||||
$con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
|
||||
try {
|
||||
$this->setAppUid($app_uid);
|
||||
|
||||
$con->begin();
|
||||
$this->delete();
|
||||
$con->commit();
|
||||
} catch (Exception $e) {
|
||||
$con->rollback();
|
||||
throw ($e);
|
||||
}
|
||||
}
|
||||
|
||||
public function newRow ($data, $delPreviusUsrUid) {
|
||||
|
||||
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
|
||||
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
|
||||
if (isset($data['DEL_TASK_DUE_DATE'])) {
|
||||
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
|
||||
}
|
||||
|
||||
$criteria = new Criteria();
|
||||
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
|
||||
@@ -187,6 +208,10 @@ class ListInbox extends BaseListInbox
|
||||
$data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
|
||||
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
|
||||
}
|
||||
|
||||
if(!isset($data['APP_STATUS']) && $data['DEL_INDEX']>1){
|
||||
$data['APP_STATUS'] = 'TO_DO';
|
||||
}
|
||||
|
||||
self::create($data);
|
||||
}
|
||||
@@ -275,6 +300,7 @@ class ListInbox extends BaseListInbox
|
||||
$criteria->addSelectColumn(ListInboxPeer::TAS_UID);
|
||||
$criteria->addSelectColumn(ListInboxPeer::PRO_UID);
|
||||
$criteria->addSelectColumn(ListInboxPeer::APP_NUMBER);
|
||||
$criteria->addSelectColumn(ListInboxPeer::APP_STATUS);
|
||||
$criteria->addSelectColumn(ListInboxPeer::APP_TITLE);
|
||||
$criteria->addSelectColumn(ListInboxPeer::APP_PRO_TITLE);
|
||||
$criteria->addSelectColumn(ListInboxPeer::APP_TAS_TITLE);
|
||||
@@ -288,6 +314,11 @@ class ListInbox extends BaseListInbox
|
||||
$criteria->addSelectColumn(ListInboxPeer::DEL_DUE_DATE);
|
||||
$criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListInboxPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$criteria->add( ListInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
|
||||
self::loadFilters($criteria, $filters);
|
||||
|
||||
@@ -297,6 +328,12 @@ class ListInbox extends BaseListInbox
|
||||
$limit = isset($filters['limit']) ? $filters['limit'] : "25";
|
||||
$paged = isset($filters['paged']) ? $filters['paged'] : 1;
|
||||
|
||||
if ($filters['action'] == 'draft') {
|
||||
$criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL );
|
||||
} else {
|
||||
$criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL );
|
||||
}
|
||||
|
||||
if ($dir == "DESC") {
|
||||
$criteria->addDescendingOrderByColumn($sort);
|
||||
} else {
|
||||
@@ -317,7 +354,7 @@ class ListInbox extends BaseListInbox
|
||||
$aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
|
||||
$data[] = $aRow;
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseListMyInbox.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_MY_INBOX' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -236,6 +236,11 @@ class ListMyInbox extends BaseListMyInbox
|
||||
$criteria->addSelectColumn(ListMyInboxPeer::DEL_DUE_DATE);
|
||||
$criteria->addSelectColumn(ListMyInboxPeer::DEL_PRIORITY);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListMyInboxPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$criteria->add( ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL );
|
||||
self::loadFilters($criteria, $filters);
|
||||
|
||||
@@ -269,3 +274,4 @@ class ListMyInbox extends BaseListMyInbox
|
||||
return $data;
|
||||
}
|
||||
} // ListMyInbox
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseListParticipatedHistory.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_PARTICIPATED_HISTORY' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -195,6 +195,11 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
|
||||
$criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_DUE_DATE);
|
||||
$criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_PRIORITY);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListParticipatedHistoryPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$criteria->add( ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL );
|
||||
self::loadFilters($criteria, $filters);
|
||||
|
||||
@@ -228,3 +233,4 @@ class ListParticipatedHistory extends BaseListParticipatedHistory
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,14 +6,15 @@ require_once 'classes/model/om/BaseListParticipatedLast.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_PARTICIPATED_LAST' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
* long as it does not already exist in the output directory.
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
*/
|
||||
|
||||
class ListParticipatedLast extends BaseListParticipatedLast
|
||||
{
|
||||
/**
|
||||
@@ -24,7 +25,29 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
*
|
||||
*/
|
||||
public function create($data)
|
||||
{
|
||||
{
|
||||
$criteria = new Criteria();
|
||||
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
|
||||
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
||||
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
||||
$criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
|
||||
$dataset = UsersPeer::doSelectRS($criteria);
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$dataset->next();
|
||||
$aRow = $dataset->getRow();
|
||||
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
|
||||
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
|
||||
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
|
||||
|
||||
$criteria = new Criteria();
|
||||
$criteria->addSelectColumn(ApplicationPeer::APP_STATUS);
|
||||
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
|
||||
$dataset = UsersPeer::doSelectRS($criteria);
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$dataset->next();
|
||||
$aRow = $dataset->getRow();
|
||||
$data['APP_STATUS'] = $aRow['APP_STATUS'];
|
||||
|
||||
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
|
||||
try {
|
||||
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
|
||||
@@ -51,7 +74,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
* @throws type
|
||||
*/
|
||||
public function update($data)
|
||||
{
|
||||
{
|
||||
$data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN';
|
||||
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
|
||||
try {
|
||||
$con->begin();
|
||||
@@ -70,7 +94,34 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
throw ($e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh List Participated Last
|
||||
*
|
||||
* @param type $seqName
|
||||
* @return type
|
||||
* @throws type
|
||||
*
|
||||
*/
|
||||
public function refresh ($data)
|
||||
{
|
||||
$data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS'];
|
||||
$criteria = new Criteria();
|
||||
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
|
||||
$criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
|
||||
$criteria->addSelectColumn(UsersPeer::USR_LASTNAME);
|
||||
$criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL );
|
||||
$dataset = UsersPeer::doSelectRS($criteria);
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
$dataset->next();
|
||||
$aRow = $dataset->getRow();
|
||||
|
||||
$data['DEL_CURRENT_USR_UID'] = $data['USR_UID'];
|
||||
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
|
||||
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
|
||||
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
|
||||
$this->update($data);
|
||||
|
||||
}
|
||||
/**
|
||||
* Remove List Participated History
|
||||
*
|
||||
@@ -79,11 +130,12 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
* @throws type
|
||||
*
|
||||
*/
|
||||
public function remove ($app_uid, $usr_uid)
|
||||
public function remove ($app_uid, $usr_uid, $del_index)
|
||||
{
|
||||
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
|
||||
try {
|
||||
$this->setAppUid($app_uid);
|
||||
$this->setDelIndex($del_index);
|
||||
$this->setUsrUid($usr_uid);
|
||||
|
||||
$con->begin();
|
||||
@@ -118,8 +170,8 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
|
||||
if ($search != '') {
|
||||
$criteria->add(
|
||||
$criteria->getNewCriterion( 'CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE )->
|
||||
addOr( $criteria->getNewCriterion( 'CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE )->
|
||||
$criteria->getNewCriterion( ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE )->
|
||||
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE )->
|
||||
addOr( $criteria->getNewCriterion( ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::LIKE ) ) ) );
|
||||
}
|
||||
|
||||
@@ -175,6 +227,7 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
$criteria = new Criteria();
|
||||
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::PRO_UID);
|
||||
@@ -182,15 +235,24 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TITLE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_PRO_TITLE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DELEGATE_DATE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INIT_DATE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY);
|
||||
$criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListParticipatedLastPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$criteria->add( ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL );
|
||||
self::loadFilters($criteria, $filters);
|
||||
@@ -225,3 +287,4 @@ class ListParticipatedLast extends BaseListParticipatedLast
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
326
workflow/engine/classes/model/ListPaused.php
Normal file
326
workflow/engine/classes/model/ListPaused.php
Normal file
File diff suppressed because it is too large
Load Diff
23
workflow/engine/classes/model/ListPausedPeer.php
Normal file
23
workflow/engine/classes/model/ListPausedPeer.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<?php
|
||||
|
||||
// include base peer class
|
||||
require_once 'classes/model/om/BaseListPausedPeer.php';
|
||||
|
||||
// include object class
|
||||
include_once 'classes/model/ListPaused.php';
|
||||
|
||||
|
||||
/**
|
||||
* Skeleton subclass for performing query and update operations on the 'LIST_PAUSED' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
* long as it does not already exist in the output directory.
|
||||
*
|
||||
* @package classes.model
|
||||
*/
|
||||
class ListPausedPeer extends BaseListPausedPeer {
|
||||
|
||||
} // ListPausedPeer
|
||||
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseListUnassigned.php';
|
||||
/**
|
||||
* Skeleton subclass for representing a row from the 'LIST_UNASSIGNED' table.
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
* You should add additional methods to this class to meet the
|
||||
* application requirements. This class will only be generated as
|
||||
@@ -263,6 +263,11 @@ class ListUnassigned extends BaseListUnassigned
|
||||
$criteria->addSelectColumn(ListUnassignedPeer::DEL_DUE_DATE);
|
||||
$criteria->addSelectColumn(ListUnassignedPeer::DEL_PRIORITY);
|
||||
|
||||
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
|
||||
|
||||
$criteria->addJoin(ListUnassignedPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
|
||||
$criteria->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
|
||||
|
||||
$aConditions = array();
|
||||
$aConditions[] = array(ListUnassignedPeer::UNA_UID, ListUnassignedGroupPeer::UNA_UID);
|
||||
$aConditions[] = array(ListUnassignedGroupPeer::USR_UID, "'" . $usr_uid . "'");
|
||||
@@ -312,4 +317,3 @@ class ListUnassigned extends BaseListUnassigned
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
5
workflow/engine/classes/model/MessageApplication.php
Normal file
5
workflow/engine/classes/model/MessageApplication.php
Normal file
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageApplication extends BaseMessageApplication
|
||||
{
|
||||
}
|
||||
|
||||
5
workflow/engine/classes/model/MessageApplicationPeer.php
Normal file
5
workflow/engine/classes/model/MessageApplicationPeer.php
Normal file
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageApplicationPeer extends BaseMessageApplicationPeer
|
||||
{
|
||||
}
|
||||
|
||||
5
workflow/engine/classes/model/MessageEventDefinition.php
Normal file
5
workflow/engine/classes/model/MessageEventDefinition.php
Normal file
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventDefinition extends BaseMessageEventDefinition
|
||||
{
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventDefinitionPeer extends BaseMessageEventDefinitionPeer
|
||||
{
|
||||
}
|
||||
|
||||
5
workflow/engine/classes/model/MessageEventRelation.php
Normal file
5
workflow/engine/classes/model/MessageEventRelation.php
Normal file
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventRelation extends BaseMessageEventRelation
|
||||
{
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventRelationPeer extends BaseMessageEventRelationPeer
|
||||
{
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventTaskRelation extends BaseMessageEventTaskRelation
|
||||
{
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class MessageEventTaskRelationPeer extends BaseMessageEventTaskRelationPeer
|
||||
{
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -182,7 +182,7 @@ class Process extends BaseProcess
|
||||
$this->setProCategory( $aData['PRO_CATEGORY'] );
|
||||
$this->setProSubCategory( '' );
|
||||
$this->setProIndustry( '' );
|
||||
$this->setProCreateDate( 'now' );
|
||||
$this->setProCreateDate( date("Y-m-d H:i:s") );
|
||||
$this->setProCreateUser( $aData['USR_UID'] );
|
||||
$this->setProHeight( 5000 );
|
||||
$this->setProWidth( 10000 );
|
||||
@@ -326,6 +326,8 @@ class Process extends BaseProcess
|
||||
}
|
||||
|
||||
$aFields['PRO_DYNAFORMS'] = @unserialize( $aFields['PRO_DYNAFORMS'] );
|
||||
//Check if is BPMN process
|
||||
$aFields['PRO_BPMN'] = $this->isBpmnProcess($ProUid);
|
||||
|
||||
return $aFields;
|
||||
} else {
|
||||
@@ -1009,5 +1011,21 @@ class Process extends BaseProcess
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Check is the Process is BPMN.
|
||||
*
|
||||
* @param string $ProUid the uid of the Prolication
|
||||
* @return int 1 if is BPMN process or 0 if a Normal process
|
||||
*/
|
||||
public function isBpmnProcess($proUid){
|
||||
$c = new Criteria("workflow");
|
||||
$c->add(BpmnProcessPeer::PRJ_UID, $proUid);
|
||||
$res = BpmnProcessPeer::doSelect($c);
|
||||
if( sizeof($res) == 0 ){
|
||||
return 0;
|
||||
}else{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -155,7 +155,7 @@ class Triggers extends BaseTriggers
|
||||
} else {
|
||||
$this->setTriUid($aData['TRI_UID'] );
|
||||
}
|
||||
|
||||
$triggerUid = $this->getTriUid();
|
||||
$this->setProUid($aData['PRO_UID']);
|
||||
$this->setTriType("SCRIPT");
|
||||
|
||||
@@ -183,6 +183,13 @@ class Triggers extends BaseTriggers
|
||||
}
|
||||
$result=$this->save();
|
||||
$con->commit();
|
||||
//Add Audit Log
|
||||
$description = "Trigger Name: ".$aData['TRI_TITLE'].", Trigger Uid: ".$triggerUid;
|
||||
if (isset ( $aData['TRI_DESCRIPTION'] )) {
|
||||
$description .= ", Description: ".$aData['TRI_DESCRIPTION'];
|
||||
}
|
||||
G::auditLog("CreateTrigger", $description);
|
||||
|
||||
return $result;
|
||||
} else {
|
||||
$con->rollback();
|
||||
@@ -233,10 +240,14 @@ class Triggers extends BaseTriggers
|
||||
$con->begin();
|
||||
$oTri = TriggersPeer::retrieveByPK( $TriUid );
|
||||
if (!is_null($oTri)) {
|
||||
Content::removeContent( 'TRI_TITLE', '', $this->getTriUid());
|
||||
Content::removeContent( 'TRI_DESCRIPTION', '', $this->getTriUid());
|
||||
Content::removeContent("TRI_TITLE", "", $TriUid);
|
||||
Content::removeContent("TRI_DESCRIPTION", "", $TriUid);
|
||||
|
||||
$result = $oTri->delete();
|
||||
$con->commit();
|
||||
|
||||
//Add Audit Log
|
||||
G::auditLog("DeleteTrigger", "Trigger Name: " . $oTri->getTriTitle() . ", Trigger Uid: " . $TriUid . ", Description: " . $oTri->getTriDescription());
|
||||
}
|
||||
return $result;
|
||||
} catch (Exception $e) {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
require_once 'propel/map/MapBuilder.php';
|
||||
include_once 'creole/CreoleTypes.php';
|
||||
|
||||
|
||||
/**
|
||||
* This class adds structure of 'ADDONS_STORE' table to 'workflow' DatabaseMap object.
|
||||
*
|
||||
@@ -17,9 +18,10 @@ include_once 'creole/CreoleTypes.php';
|
||||
*/
|
||||
class AddonsStoreMapBuilder
|
||||
{
|
||||
|
||||
/**
|
||||
* The (dot-path) name of this class
|
||||
*/
|
||||
*/
|
||||
const CLASS_NAME = 'classes.model.map.AddonsStoreMapBuilder';
|
||||
|
||||
/**
|
||||
@@ -43,7 +45,6 @@ class AddonsStoreMapBuilder
|
||||
*
|
||||
* @return the databasemap
|
||||
*/
|
||||
|
||||
public function getDatabaseMap()
|
||||
{
|
||||
return $this->dbMap;
|
||||
@@ -55,13 +56,11 @@ class AddonsStoreMapBuilder
|
||||
* @return void
|
||||
* @throws PropelException
|
||||
*/
|
||||
|
||||
public function doBuild()
|
||||
{
|
||||
$this->dbMap = Propel::getDatabaseMap('workflow');
|
||||
|
||||
$tMap = $this->dbMap->addTable('ADDONS_STORE');
|
||||
|
||||
$tMap->setPhpName('AddonsStore');
|
||||
|
||||
$tMap->setUseIdGenerator(false);
|
||||
@@ -75,6 +74,7 @@ class AddonsStoreMapBuilder
|
||||
$tMap->addColumn('STORE_TYPE', 'StoreType', 'string', CreoleTypes::VARCHAR, true, 255);
|
||||
|
||||
$tMap->addColumn('STORE_LAST_UPDATED', 'StoreLastUpdated', 'int', CreoleTypes::TIMESTAMP, false, null);
|
||||
}
|
||||
}
|
||||
|
||||
} // doBuild()
|
||||
|
||||
} // AddonsStoreMapBuilder
|
||||
|
||||
@@ -79,9 +79,9 @@ class EmailServerMapBuilder
|
||||
|
||||
$tMap->addColumn('MESS_PASSWORD', 'MessPassword', 'string', CreoleTypes::VARCHAR, true, 256);
|
||||
|
||||
$tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, true, 256);
|
||||
$tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, false, 256);
|
||||
|
||||
$tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, true, 256);
|
||||
$tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, false, 256);
|
||||
|
||||
$tMap->addColumn('SMTPSECURE', 'Smtpsecure', 'string', CreoleTypes::VARCHAR, true, 3);
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user