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

Doc System, change hardcoded labels

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-03-14 15:15:04 -04:00
parent 9e0e980a23
commit 64e518fb49
81 changed files with 377 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,15 +38,15 @@ class AppProxy extends HttpProxyController
if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) {
$caseLoad = $case->loadCase($appUid);
$httpData->pro = $caseLoad['PRO_UID'];
}
}
if(!isset($httpData->pro) || empty($httpData->pro) )
{
$proUid = $_SESSION['PROCESS'];
} else {
$proUid = $httpData->pro;
}
if(!isset($httpData->tas) || empty($httpData->tas))
{
$tasUid = $_SESSION['TASK'];
@@ -56,7 +56,7 @@ class AppProxy extends HttpProxyController
//$proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro;
//$tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas;
$usrUid = $_SESSION['USER_LOGGED'];
$respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );
$respBlock = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' );
@@ -68,7 +68,7 @@ class AppProxy extends HttpProxyController
//require_once ("classes/model/AppNotes.php");
if (! isset( $appUid )) {
throw new Exception( 'Can\'t resolve the Apllication ID for this request.' );
throw new Exception( G::LoadTranslation('ID_RESOLVE_APPLICATION_ID' ) );
}
$usrUid = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : "";
@@ -108,7 +108,7 @@ class AppProxy extends HttpProxyController
//Disabling the controller response because we handle a special behavior
$this->setSendResponse(false);
//Add note case
$appNote = new AppNotes();
$response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail));
@@ -193,7 +193,7 @@ class AppProxy extends HttpProxyController
function getSummary ($httpData)
{
$labels = array ();
$form = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG );
$form = new Form( 'cases/cases_Resume', PATH_XMLFORM, SYS_LANG ); //este es el problema!!!!!
G::LoadClass( 'case' );
$case = new Cases();
@@ -231,41 +231,26 @@ class AppProxy extends HttpProxyController
$taskData = $task->load( $applicationFields['TAS_UID'] );
$currentUser = $applicationFields['CURRENT_USER'] != '' ? $applicationFields['CURRENT_USER'] : '[' . G::LoadTranslation( 'ID_UNASSIGNED' ) . ']';
$data[] = array ('label' => $labels['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['TITLE'],'value' => $applicationFields['TITLE'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['DESCRIPTION'],'value' => $applicationFields['DESCRIPTION'],'section' => $labels['TITLE1']
);
$data[] = array ('label' => $labels['PRO_TITLE'],'value' => $processData['PRO_TITLE'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['TITLE'],'value' => $applicationFields['TITLE'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['APP_NUMBER'],'value' => $applicationFields['APP_NUMBER'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['STATUS'],'value' => $applicationFields['STATUS'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['APP_UID'],'value' => $applicationFields['APP_UID'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['CREATOR'],'value' => $applicationFields['CREATOR'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['CREATE_DATE'],'value' => $applicationFields['CREATE_DATE'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['UPDATE_DATE'],'value' => $applicationFields['UPDATE_DATE'],'section' => $labels['TITLE1']);
$data[] = array ('label' => $labels['DESCRIPTION'],'value' => $applicationFields['DESCRIPTION'],'section' => $labels['TITLE1']);
// note added by krlos pacha carlos[at]colosa[dot]com
//getting this field if it doesn't exist. Related 7994 bug
$taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG );
$data[] = array ('label' => $labels['TAS_TITLE'],'value' => $taskData['TAS_TITLE'],'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['CURRENT_USER'],'value' => $currentUser,'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labels['TITLE2']
);
$data[] = array ('label' => $labels['TAS_TITLE'],'value' => $taskData['TAS_TITLE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['CURRENT_USER'],'value' => $currentUser,'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_INIT_DATE'],'value' => $applicationFields['DEL_INIT_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_TASK_DUE_DATE'],'value' => $applicationFields['DEL_TASK_DUE_DATE'],'section' => $labels['TITLE2']);
$data[] = array ('label' => $labels['DEL_FINISH_DATE'],'value' => $applicationFields['DEL_FINISH_DATE'],'section' => $labels['TITLE2']);
//$data[] = array('label'=>$labels['DYN_UID'] , 'value' => $processData['PRO_DYNAFORMS']['PROCESS'];, 'section'=>$labels['DYN_UID']);
return $data;
}

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

@@ -173,7 +173,7 @@ class Dashboard extends Controller
{
try {
if (! isset( $_SESSION['USER_LOGGED'] )) {
throw new Exception( 'The session has expired.' );
throw new Exception( G::LoadTranslation('ID_SESSION_EXPIRED') );
}
return $this->pmDashlet->getDashletsInstancesForUser( $_SESSION['USER_LOGGED'] );
} catch (Exception $error) {

5
workflow/engine/controllers/main.php
View File

@@ -323,9 +323,8 @@ class Main extends Controller
$this->setVar( 'logo_company', $this->getCompanyLogo() );
$this->setVar( 'pmos_version', System::getVersion() );
$footerText = 'Copyright © 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.';
$adviseText = 'Supplied free of charge with no support, certification, warranty,
maintenance nor indemnity by Colosa and its Certified Partners. ';
$footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL');
$adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS');
$this->setVar( 'footer_text', $footerText );
$this->setVar( 'advise_text', $adviseText );

13
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -366,7 +366,7 @@ class pmTablesProxy extends HttpProxyController
$rtOld = new ReportTable();
$existReportTableOld = $rtOld->load( $row->id );
if (count($existReportTableOld) == 0) {
throw new Exception( "Table does not exist... skipped!\n" );
throw new Exception( G::LoadTranslation('ID_TABLE_NOT_EXIST_SKIPPED') );
}
}
@@ -388,10 +388,10 @@ class pmTablesProxy extends HttpProxyController
if ($errors == '') {
$result->success = true;
$result->message = "$count tables removed Successfully.";
$result->message = $count.G::LoadTranslation( 'ID_TABLES_REMOVED_SUCCESSFULLY' );
} else {
$result->success = false;
$result->message = "$count tables removed but with errors.\n$errors";
$result->message = $count. G::LoadTranslation( 'ID_TABLES_REMOVED_WITH_ERRORS' ) .$errors;
}
$result->errors = $errors;
@@ -486,7 +486,7 @@ class pmTablesProxy extends HttpProxyController
foreach ($obj->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "\n";
}
throw new Exception( 'Error trying insert into "' . $table['ADD_TAB_NAME'] . "\"\n" . $msg );
throw new Exception( G::LoadTranslation('ID_ERROR_TRYING_INSERT'). '"' . $table['ADD_TAB_NAME'] . "\"\n" . $msg );
}
$index = G::encrypt( implode( ',', $primaryKeysValues ), 'pmtable' );
@@ -496,7 +496,7 @@ class pmTablesProxy extends HttpProxyController
if ($toSave) {
$result->success = true;
$result->message = 'Record saved successfully';
$result->message = G::LoadTranslation('ID_RECORD_SAVED_SUCCESFULLY');
$result->rows = $obj->toArray( BasePeer::TYPE_FIELDNAME );
$result->rows['__index__'] = $index;
} else {
@@ -1374,8 +1374,7 @@ class pmTablesProxy extends HttpProxyController
$excludeFieldsList = array ('title','subtitle','link','file','button','reset','submit','listbox','checkgroup','grid','javascript', ''
);
$labelFieldsTypeList = array ('dropdown','radiogroup'
);
$labelFieldsTypeList = array ('dropdown','radiogroup');
G::loadSystem( 'dynaformhandler' );
$index = 0;