fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #769 from Jennydmz/master

Browse Source 
CODE STYLE.
This commit is contained in:
ferOnti
2012-10-17 08:52:43 -07:00
parent 013fa84e40 7deb103424
commit c1213e4602
7 changed files with 619 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
workflow/engine/methods/processes/ajaxListener.php
View File

@@ -20,10 +20,10 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/**
*
* @author Erik Amaru Ortiz <erik@colosa.com>
* @date Jan 10th, 2010
*/
@@ -36,14 +36,17 @@ $ajax->$action($_REQUEST);
class Ajax
{
function categoriesList ()
{
require_once "classes/model/ProcessCategory.php";
$processCategory = new ProcessCategory;
$processCategory = new ProcessCategory();
$defaultOption = Array ();
$defaultOption[] = Array('CATEGORY_UID'=>'<reset>', 'CATEGORY_NAME'=>G::LoadTranslation('ID_ALL'));
$defaultOption[] = Array('CATEGORY_UID'=>'', 'CATEGORY_NAME'=>G::LoadTranslation('ID_PROCESS_NO_CATEGORY'));
$defaultOption[] = Array ('CATEGORY_UID' => '<reset>','CATEGORY_NAME' => G::LoadTranslation( 'ID_ALL' )
);
$defaultOption[] = Array ('CATEGORY_UID' => '','CATEGORY_NAME' => G::LoadTranslation( 'ID_PROCESS_NO_CATEGORY' )
);
$response->rows = array_merge( $defaultOption, $processCategory->getAll( 'array' ) );
@@ -54,9 +57,10 @@ class Ajax
{
require_once "classes/model/ProcessCategory.php";
$processCategory = new ProcessCategory;
$processCategory = new ProcessCategory();
$defaultOption = Array ();
$defaultOption[] = Array('CATEGORY_UID'=>'', 'CATEGORY_NAME'=>G::LoadTranslation('ID_PROCESS_NO_CATEGORY'));
$defaultOption[] = Array ('CATEGORY_UID' => '','CATEGORY_NAME' => G::LoadTranslation( 'ID_PROCESS_NO_CATEGORY' )
);
$response->rows = array_merge( $defaultOption, $processCategory->getAll( 'array' ) );
@@ -73,11 +77,7 @@ class Ajax
if (! isset( $_POST['PRO_UID'] )) {
if (Process::existsByProTitle( $_POST['PRO_TITLE'] )) {
$result = array(
'success' => false,
'msg' => 'Process Save Error',
'errors' => array(
'PRO_TITLE' => G::LoadTranslation('ID_PROCESSTITLE_ALREADY_EXISTS', SYS_LANG, $_POST)
$result = array ('success' => false,'msg' => 'Process Save Error','errors' => array ('PRO_TITLE' => G::LoadTranslation( 'ID_PROCESSTITLE_ALREADY_EXISTS', SYS_LANG, $_POST )
)
);
print G::json_encode( $result );
@@ -150,20 +150,14 @@ class Ajax
{
require_once 'classes/model/Users.php';
G::LoadClass( 'configuration' );
$conf = new Configurations;
$conf = new Configurations();
$search = isset( $params['search'] ) ? $params['search'] : null;
$users = Users::getAll( $params['start'], $params['limit'], $search );
foreach ($users->data as $i => $user) {
$users->data[$i]['USER'] = $conf->getEnvSetting(
'format',
Array(
'userName'=>$user['USR_USERNAME'],
'firstName'=>$user['USR_FIRSTNAME'],
'lastName'=>$user['USR_LASTNAME']
)
);
$users->data[$i]['USER'] = $conf->getEnvSetting( 'format', Array ('userName' => $user['USR_USERNAME'],'firstName' => $user['USR_FIRSTNAME'],'lastName' => $user['USR_LASTNAME']
) );
}
print G::json_encode( $users );
}
@@ -188,17 +182,21 @@ class Ajax
foreach ($UIDS as $UID) {
if ($_POST['TU_RELATION'] == 1)
$oTaskUser->create(array('TAS_UID' => $param['TAS_UID'], 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 1));
$oTaskUser->create( array ('TAS_UID' => $param['TAS_UID'],'USR_UID' => $UID,'TU_TYPE' => $TU_TYPE,'TU_RELATION' => 1
) );
else
$oTaskUser->create(array('TAS_UID' => $param['TAS_UID'], 'USR_UID' => $UID, 'TU_TYPE' => $TU_TYPE, 'TU_RELATION' => 2));
$oTaskUser->create( array ('TAS_UID' => $param['TAS_UID'],'USR_UID' => $UID,'TU_TYPE' => $TU_TYPE,'TU_RELATION' => 2
) );
}
$task = TaskPeer::retrieveByPk( $param['TAS_UID'] );
$result->success = true;
if (count( $UIDS ) > 1)
$result->msg = __('ID_ACTORS_ASSIGNED_SUCESSFULLY', SYS_LANG, Array(count($UIDS), $task->getTasTitle()));
$result->msg = __( 'ID_ACTORS_ASSIGNED_SUCESSFULLY', SYS_LANG, Array (count( $UIDS ),$task->getTasTitle()
) );
else
$result->msg = __('ID_ACTOR_ASSIGNED_SUCESSFULLY', SYS_LANG, Array('tas_title'=>$task->getTasTitle()));
$result->msg = __( 'ID_ACTOR_ASSIGNED_SUCESSFULLY', SYS_LANG, Array ('tas_title' => $task->getTasTitle()
) );
} catch (Exception $e) {
$result->success = false;
$result->msg = $e->getMessage();
@@ -241,8 +239,8 @@ class Ajax
require_once 'classes/model/TaskUser.php';
G::LoadClass( 'configuration' );
$usersTaskList = Array ();
$task = new TaskUser;
$conf = new Configurations;
$task = new TaskUser();
$conf = new Configurations();
$TU_TYPE = 1;
$usersTask = $task->getUsersTask( $param['TAS_UID'], $TU_TYPE );
@@ -268,7 +266,8 @@ class Ajax
print G::json_encode( $result );
}
function getProcessDetail($param){
function getProcessDetail ($param)
{
require_once 'classes/model/Process.php';
$PRO_UID = $param['PRO_UID'];
@@ -279,7 +278,6 @@ class Ajax
$tasksList = $tasks->getAllTasks( $PRO_UID );
$rootNode->id = $process->getProUid();
$rootNode->type = 'process';
$rootNode->typeLabel = G::LoadTranslation( 'ID_PROCESS' );
@@ -288,7 +286,7 @@ class Ajax
$rootNode->iconCls = 'ss_sprite ss_application';
$rootNode->expanded = true;
foreach ($tasksList as $task) {
$node = new stdClass;
$node = new stdClass();
$node->id = $task['TAS_UID'];
$node->type = 'task';
$node->typeLabel = G::LoadTranslation( 'ID_TASK' );
@@ -310,7 +308,7 @@ class Ajax
require_once 'classes/model/CalendarDefinition.php';
G::LoadClass( 'processMap' );
$oProcessMap = new processMap(new DBConnection);
$oProcessMap = new processMap( new DBConnection() );
$process = $oProcessMap->editProcessNew( $param['UID'] );
$category = ProcessCategoryPeer::retrieveByPk( $process['PRO_CATEGORY'] );
$categoryName = is_object( $category ) ? $category->getCategoryName() : '';
@@ -361,8 +359,12 @@ class Ajax
$process['PRO_UID'] = $param['UID'];
switch ($param['property']) {
case 'Title': $fieldName = 'PRO_TITLE'; break;
case 'Description': $fieldName = 'PRO_DESCRIPTION'; break;
case 'Title':
$fieldName = 'PRO_TITLE';
break;
case 'Description':
$fieldName = 'PRO_DESCRIPTION';
break;
case 'Debug':
$fieldName = 'PRO_DEBUG';
$param['value'] = $param['value'] == 'true' ? '1' : '0';
@@ -394,9 +396,15 @@ class Ajax
$task['TAS_UID'] = $param['UID'];
switch ($param['property']) {
case 'Title': $fieldName = 'TAS_TITLE'; break;
case 'Description': $fieldName = 'TAS_DESCRIPTION'; break;
case 'Variable for case priority': $fieldName = 'TAS_PRIORITY_VARIABLE'; break;
case 'Title':
$fieldName = 'TAS_TITLE';
break;
case 'Description':
$fieldName = 'TAS_DESCRIPTION';
break;
case 'Variable for case priority':
$fieldName = 'TAS_PRIORITY_VARIABLE';
break;
case 'Starting Task':
$fieldName = 'TAS_START';
$param['value'] = strtoupper( $param['value'] );
@@ -420,9 +428,10 @@ class Ajax
{
require_once "classes/model/ProcessCategory.php";
$processCategory = new ProcessCategory;
$processCategory = new ProcessCategory();
$defaultOption = Array ();
$defaultOption[] = Array('CATEGORY_UID'=>'', 'CATEGORY_NAME'=>'');
$defaultOption[] = Array ('CATEGORY_UID' => '','CATEGORY_NAME' => ''
);
$response->rows = array_merge( $defaultOption, $processCategory->getAll( 'array' ) );
@@ -434,7 +443,8 @@ class Ajax
G::LoadClass( 'calendar' );
$calendar = new CalendarDefinition();
$calendarObj = $calendar->getCalendarList( true, true );
$calendarObj['array'][0] = Array('CALENDAR_UID'=>'', 'CALENDAR_NAME'=>'');
$calendarObj['array'][0] = Array ('CALENDAR_UID' => '','CALENDAR_NAME' => ''
);
$response->rows = $calendarObj['array'];
@@ -444,7 +454,7 @@ class Ajax
function getPMVariables ($param)
{
G::LoadClass( 'processMap' );
$oProcessMap = new processMap(new DBConnection);
$oProcessMap = new processMap( new DBConnection() );
$response->rows = getDynaformsVars( $param['PRO_UID'] );
foreach ($response->rows as $i => $var) {
$response->rows[$i]['sName'] = "@@{$var['sName']}";

14
workflow/engine/methods/processes/downloadPML.php
View File

@@ -16,6 +16,7 @@
$downloadUrl = PML_DOWNLOAD_URL . '?id=' . $ObjUid . (isset( $_GET['s'] ) ? '&s=' . $_GET['s'] : '');
//print "<hr>$downloadUrl<hr>";die;
G::LoadClass( 'processes' );
$oProcess = new Processes();
$oProcess->downloadFile( $downloadUrl, $localPath, $newfilename );
@@ -35,10 +36,10 @@
if ($oProcess->processExists( $sProUid )) {
$G_MAIN_MENU = 'processmaker';
$G_ID_MENU_SELECTED = 'PROCESSES';
$G_PUBLISH = new Publisher;
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'processes/processes_ImportExisting', '', $Fields, 'downloadPML_ImportExisting' );
G::RenderPage( 'publish', 'blank' );
die;
die();
}
//creating the process
@@ -56,16 +57,15 @@
$Fields['version'] = $processData->version;
$G_MAIN_MENU = 'processmaker';
$G_ID_MENU_SELECTED = 'PROCESSES';
$G_PUBLISH = new Publisher;
$G_PUBLISH = new Publisher();
$Fields['PRO_UID'] = $sProUid;
$processmapLink = "processes_Map?PRO_UID=$sProUid";
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'processes/processes_ImportSucessful', '', $Fields, $processmapLink );
G::RenderPage( 'publish', 'blank' );
die;
die();
}
catch ( Exception $e ) {
$G_PUBLISH = new Publisher;
} catch (Exception $e) {
$G_PUBLISH = new Publisher();
$aMessage['MESSAGE'] = $e->getMessage();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
G::RenderPage( 'publish', 'blank' );

6
workflow/engine/methods/processes/downloadPML_ImportExisting.php
View File

@@ -20,7 +20,6 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
try {
@@ -91,9 +90,8 @@
$oProcess->createProcessFromData( $oData, $path . $filename );
}
G::header( 'Location: processes_Map?PRO_UID=' . $sNewProUid );
}
catch ( Exception $e ){
$G_PUBLISH = new Publisher;
} catch (Exception $e) {
$G_PUBLISH = new Publisher();
$aMessage['MESSAGE'] = $e->getMessage();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
G::RenderPage( 'publish', 'blank' );

2
workflow/engine/methods/processes/index.php
View File

@@ -20,9 +20,7 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
$newFile = str_replace( 'index.php', 'processes_List.php', __FILE__ );
return $newFile;

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

@@ -20,7 +20,6 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/*$access = $RBAC->userCanAccess('PM_FACTORY');
@@ -48,7 +47,7 @@ $G_SUB_MENU = 'process';
$G_ID_MENU_SELECTED = 'PROCESSES';
$G_ID_SUB_MENU_SELECTED = '-';
$G_PUBLISH = new Publisher;
$G_PUBLISH = new Publisher();
$oHeadPublisher = & headPublisher::getSingleton();
//$oHeadPublisher->addScriptFile('/jscore/processes/main.js');
$G_PUBLISH->AddContent( 'view', 'processes/mainLoad' );

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

@@ -20,18 +20,17 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
$oHeadPublisher = & headPublisher::getSingleton();
G::loadClass( 'configuration' );
$conf = new Configurations;
$conf = new Configurations();
$oHeadPublisher->addExtJsScript( 'processes/main', true ); //adding a javascript file .js
$oHeadPublisher->addContent( 'processes/main' ); //adding a html file .html.
$oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
G::RenderPage( 'publish', 'extJs' );

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

@@ -20,7 +20,6 @@
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/*
@@ -61,7 +60,7 @@ switch ($RBAC->userCanAccess('PM_FACTORY'))
$processData["PRO_UID"] = $PRO_UID;
$G_PUBLISH = new Publisher;
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'processes/processes_DeleteCases', '', $processData, 'processes_Delete.php' );
G::RenderPage( 'publish', 'raw' );