diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 113bfd604..d878e9f49 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -3332,7 +3332,7 @@ class processMap 'LA_PRO_UID' => $aRow['PRO_UID'], 'LA_USR_UID' => $aRow['USR_UID'], 'LA_PU_NAME' => $aRow['GRP_TITLE'], - 'LA_PU_TYPE_NAME' => 'Group'); + 'LA_PU_TYPE_NAME' => G::LoadTranslation('ID_GROUP')); $oDataset->next(); } @@ -3359,7 +3359,7 @@ class processMap 'LA_PRO_UID' => $aRow['PRO_UID'], 'LA_USR_UID' => $aRow['USR_UID'], 'LA_PU_NAME' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'], - 'LA_PU_TYPE_NAME' => 'User'); + 'LA_PU_TYPE_NAME' => G::LoadTranslation('ID_USER')); $oDataset->next(); } @@ -3407,6 +3407,7 @@ class processMap 'UID' => 'char', 'USER_GROUP' => 'char', 'TYPE_UID' => 'char', + 'TYPE_UID_LABEL' => 'char', 'PRO_UID' => 'char') ); $oCriteria = new Criteria('workflow'); @@ -3429,6 +3430,7 @@ class processMap $aRespLi[] = array('UID' => $aRow['GRP_UID'], 'USER_GROUP' => $aRow['GRP_TITLE'], 'TYPE_UID' => 'Group', + 'TYPE_UID_LABEL' => G::LoadTranslation('ID_GROUP'), 'PRO_UID' => $sProcessUID); $oDataset->next(); } @@ -3475,6 +3477,7 @@ class processMap $aRespLi[] = array('UID' => $aRow['USR_UID'], 'USER_GROUP' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'], 'TYPE_UID' => 'User', + 'TYPE_UID_LABEL' => G::LoadTranslation('ID_USER'), 'PRO_UID' => $sProcessUID); $oDataset->next(); } @@ -3664,8 +3667,13 @@ class processMap } //Obtain action (permission) $sAction = G::LoadTranslation('ID_' . $aRow['OP_ACTION']); + if ($aRow['OP_CASE_STATUS'] == '') { + $sStatus = G::LoadTranslation('ID_ALL'); + } else { + $sStatus = G::LoadTranslation('ID_' . $aRow['OP_CASE_STATUS']); + } //Add to array - $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']); + $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $sStatus); $oDataset->next(); } global $_DBArray; @@ -3813,8 +3821,13 @@ class processMap } //Obtain action (permission) $sAction = G::LoadTranslation('ID_' . $aRow['OP_ACTION']); + if ($aRow['OP_CASE_STATUS'] == '') { + $sStatus = G::LoadTranslation('ID_ALL'); + } else { + $sStatus = G::LoadTranslation('ID_' . $aRow['OP_CASE_STATUS']); + } //Add to array - $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']); + $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $sStatus); $oDataset->next(); } return $aObjectsPermissions; @@ -6148,7 +6161,7 @@ class processMap } /** - * listProcessesUser for Extjs + * listExtProcessesSupervisors for Extjs * * @param string $sProcessUID * @return array(aProcessUser) $aProcessUser diff --git a/workflow/engine/methods/events/eventsEditAction.php b/workflow/engine/methods/events/eventsEditAction.php index 7ee480b9e..631d0bac5 100755 --- a/workflow/engine/methods/events/eventsEditAction.php +++ b/workflow/engine/methods/events/eventsEditAction.php @@ -247,7 +247,7 @@ function setLabels () { 'LABEL_ADD_USERS' => G::LoadTranslation( 'ID_EVENT_ADD_USERS' ), 'LABEL_REMOVED_SELECTED' => G::LoadTranslation( 'ID_EVENT_REMOVE_SELECTED' ), 'LABEL_ADD_DYNAVAR' => G::LoadTranslation( 'ID_EVENT_ADD_DYNAVAR' ), - 'LABEL_ADD_GROUPS' => G::LoadTranslation( 'ID_EVENT_ADD_GROUPS' ) + 'LABEL_ADD_GROUPS' => G::LoadTranslation( 'ID_EVENT_ADD_GROUP' ) ); return $labels; } diff --git a/workflow/engine/methods/events/eventsSetupGraph.php b/workflow/engine/methods/events/eventsSetupGraph.php index 3da2a7356..2c1bad621 100755 --- a/workflow/engine/methods/events/eventsSetupGraph.php +++ b/workflow/engine/methods/events/eventsSetupGraph.php @@ -151,7 +151,7 @@ function drawTimerEvent ($im, $x1, $y1, $h) imageline( $im, 15, $h - 19, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 23, $w - 15, $h - 19, $red ); imageline( $im, $w - 23, $h - 15, $w - 15, $h - 19, $red ); -imagestring( $im, 2, $w - 30, $h - 37, G::LoadTranslation('ID_DAYS'), $red ); +imagestring( $im, 2, $w - 30, $h - 37, utf8_decode(G::LoadTranslation('ID_DAYS')), $red ); if ($estimated == 0) { $s = 'i'; diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js index cd31a5661..e082b9faa 100755 --- a/workflow/engine/templates/pmTables/data.js +++ b/workflow/engine/templates/pmTables/data.js @@ -78,7 +78,7 @@ Ext.onReady(function(){ appUidSearch = new Ext.form.Checkbox ({ id: 'appUidSearch', - boxLabel : 'Search also in the APP_UID field' + boxLabel : _('ID_SEARCH_ALSO_APP_UID') }); contextMenu = new Ext.menu.Menu({ diff --git a/workflow/engine/templates/setup/cron.js b/workflow/engine/templates/setup/cron.js index 643918d51..e779c06b1 100644 --- a/workflow/engine/templates/setup/cron.js +++ b/workflow/engine/templates/setup/cron.js @@ -70,7 +70,6 @@ cron.application = { var formItems = Ext.getCmp("frmLogView").form.items; formItems.items[0].setValue(strData); - winLog.setTitle("Log - " + _("ID_WORKSPACE") + " " + record.get("WORKSPACE")); winLog.show(); } } @@ -260,6 +259,14 @@ cron.application = { items: ["-", _("ID_PAGE_SIZE") + " ", cboPageSize] }); + var renderStatus = function(val) { + if (val == 'action') { + return _('ID_COMPLETED'); + } else { + return _('ID_FAILED'); + } + }; + var cmodel = new Ext.grid.ColumnModel({ defaults: { width: 50, @@ -270,7 +277,7 @@ cron.application = { {id: "ID", dataIndex: "DATE", hidden: true, hideable: false}, {header: _("ID_DATE_LABEL"), dataIndex: "DATE", width: 10, align: "center"}, {header: _("ID_ACTION"), dataIndex: "ACTION", width: 10}, - {header: _("ID_STATUS"), dataIndex: "STATUS", width: 7, align: "center"}, + {header: _("ID_STATUS"), dataIndex: "STATUS", width: 7, align: "center", renderer: renderStatus}, {header: _("ID_DESCRIPTION"), dataIndex: "DESCRIPTION"} ] }); diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html index fb5c8fbed..3ab0bd920 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html +++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html @@ -109,7 +109,7 @@ - +
* {$SCH_START_TIME}{$form.SCH_START_TIME} format 24 hrs. (HH:MM) {$form.SCH_START_TIME} {php}echo (G::LoadTranslation('ID_FORMAT_24_HOURS'));{/php}
@@ -119,7 +119,7 @@ - +
* {$SCH_REPEAT_EVERY}{$form.SCH_REPEAT_EVERY} hour(s). {$form.SCH_REPEAT_EVERY} {php}echo (G::LoadTranslation('ID_HOUR_HOURS'));{/php}
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.html b/workflow/engine/xmlform/cases/cases_Scheduler_New.html index 5b59072e1..40a88b6ff 100755 --- a/workflow/engine/xmlform/cases/cases_Scheduler_New.html +++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.html @@ -92,8 +92,8 @@ - - + +
* {$SCH_START_TIME}{$form.SCH_START_TIME} format 24 hrs. (HH:MM) * {$SCH_START_TIME}{$form.SCH_START_TIME} {php}echo (G::LoadTranslation('ID_FORMAT_24_HOURS'));{/php}
@@ -103,12 +103,12 @@ - +
* {$SCH_REPEAT_EVERY}{$form.SCH_REPEAT_EVERY} Hour(s). {$form.SCH_REPEAT_EVERY} {php}echo (G::LoadTranslation('ID_HOUR_HOURS'));{/php}
- + {$form.SELECT_DATE} diff --git a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml index aa8369836..0501cc2cd 100755 --- a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml +++ b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml @@ -9,11 +9,11 @@ Status Case - - - - - + + + + + diff --git a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml index 56a7acd0b..63f836666 100755 --- a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml +++ b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml @@ -10,10 +10,10 @@ Status Case - - - - + + + + diff --git a/workflow/engine/xmlform/processes/processes_availableProcessesUser.xml b/workflow/engine/xmlform/processes/processes_availableProcessesUser.xml index 23e6527c9..eadafa3ee 100755 --- a/workflow/engine/xmlform/processes/processes_availableProcessesUser.xml +++ b/workflow/engine/xmlform/processes/processes_availableProcessesUser.xml @@ -2,11 +2,12 @@ + - + - + diff --git a/workflow/engine/xmlform/tracker/tracker_objectsList.xml b/workflow/engine/xmlform/tracker/tracker_objectsList.xml index 4a5301832..eddd4bbfd 100755 --- a/workflow/engine/xmlform/tracker/tracker_objectsList.xml +++ b/workflow/engine/xmlform/tracker/tracker_objectsList.xml @@ -7,8 +7,8 @@ - - + +