diff --git a/workflow/engine/classes/class.dashletOpenVSCompleted.php b/workflow/engine/classes/class.dashletOpenVSCompleted.php index b923d7e93..6f8ab0798 100644 --- a/workflow/engine/classes/class.dashletOpenVSCompleted.php +++ b/workflow/engine/classes/class.dashletOpenVSCompleted.php @@ -26,16 +26,29 @@ class dashletOpenVSCompleted implements DashletInterface $contextTimeStore->xtype = 'arraystore'; $contextTimeStore->fields = array ('id','value' ); - $contextTimeStore->data = array (array ('TODAY','Today' - ),array ('YESTERDAY','Yesterday' - ),array ('THIS_WEEK','This week' - ),array ('PREVIOUS_WEEK','Previous Week' - ),array ('THIS_MONTH','This Month' - ),array ('PREVIOUS_MONTH','Previous Month' - ),array ('THIS_YEAR','This Year' - ),array ('PREVIOUS_YEAR','Previous Year' - ) - ); + if (defined('PARTNER_FLAG')) { + $contextTimeStore->data = array (array ('TODAY','Hoje' + ),array ('YESTERDAY','Ontem' + ),array ('THIS_WEEK','Essa semana' + ),array ('PREVIOUS_WEEK','Semana anterior' + ),array ('THIS_MONTH','Este mês' + ),array ('PREVIOUS_MONTH','Mês Anterior' + ),array ('THIS_YEAR','Este ano' + ),array ('PREVIOUS_YEAR','Ano anterior' + ) + ); + } else { + $contextTimeStore->data = array (array ('TODAY','Today' + ),array ('YESTERDAY','Yesterday' + ),array ('THIS_WEEK','This week' + ),array ('PREVIOUS_WEEK','Previous Week' + ),array ('THIS_MONTH','This Month' + ),array ('PREVIOUS_MONTH','Previous Month' + ),array ('THIS_YEAR','This Year' + ),array ('PREVIOUS_YEAR','Previous Year' + ) + ); + } $contextTime = new stdclass(); $contextTime->xtype = 'combo'; diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index f37f63ecc..694ce8340 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -233,6 +233,8 @@ class Dashboard extends Controller } $dashlets = $this->getDashlets(); $this->setJSVar( 'storeDasUID', $dashlets ); + $this->setJSVar('PARTNER_FLAG', (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false); + if ($data->DAS_INS_UID != '') { $this->pmDashlet->setup( $data->DAS_INS_UID ); $this->setJSVar( 'dashletInstance', $this->pmDashlet->getDashletInstance() ); diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php index 2f2ed1f44..24e076a60 100755 --- a/workflow/engine/methods/controls/varsAjax.php +++ b/workflow/engine/methods/controls/varsAjax.php @@ -39,24 +39,24 @@ $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= ''; $html .= ''; $html .= '     '; $html .= ''; @@ -78,7 +78,7 @@ $html .= ''; $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; @@ -113,11 +113,11 @@ $html .= ''; $html .= '
'; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= ''; -$html .= ''; +$html .= ''; $html .= ''; $html .= ''; $html .= '
Result'.G::LoadTranslation('ID_RESULT').'@@SYS_LANG
Description'.G::LoadTranslation('ID_DESCRIPTION').''.G::LoadTranslation('ID_SYSTEM').'
'; diff --git a/workflow/engine/templates/dashboard/dashletInstanceForm.js b/workflow/engine/templates/dashboard/dashletInstanceForm.js index 75e1250a4..004d9df18 100644 --- a/workflow/engine/templates/dashboard/dashletInstanceForm.js +++ b/workflow/engine/templates/dashboard/dashletInstanceForm.js @@ -16,7 +16,7 @@ Ext.onReady(function() { storeDasInsOwnerType = new Ext.data.ArrayStore({ idIndex: 0, fields: ['id', 'value'], - data: [['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']] + data: PARTNER_FLAG?[['USER', 'Usuário'], ['DEPARTMENT', 'Departmento'], ['GROUP', 'Grupo'], ['EVERYBODY', 'Todos']]:[['USER', 'User'], ['DEPARTMENT', 'Department'], ['GROUP', 'Group'], ['EVERYBODY', 'Everybody']] }); storeDasInsOwnerUID = new Ext.data.Store({