From fe3ad734e044bb850d2cf6d2b930f37edb21152f Mon Sep 17 00:00:00 2001 From: william barra Date: Mon, 29 Feb 2016 17:12:25 -0400 Subject: [PATCH] HOR-302 The "Batch Routing" label (case menu) is not included in the PO file that ProcessMaker generates --- workflow/engine/menus/cases.php | 3 +- .../BusinessModel/Consolidated.php | 4 ++- .../templates/cases/casesListConsolidated.js | 34 +++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php index 2ebf51b92..375568541 100755 --- a/workflow/engine/menus/cases.php +++ b/workflow/engine/menus/cases.php @@ -32,7 +32,8 @@ G::LoadTranslation('ID_NEW_CASE'), ''); /*----------------------------------********---------------------------------*/ $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) { - $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', 'Batch Routing', ''); + $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated', + G::LoadTranslation('ID_BATCH_ROUTING'), ''); } /*----------------------------------********---------------------------------*/ diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php index 63e9b684c..1b2ba2187 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php @@ -121,7 +121,9 @@ class Consolidated $response["casesNumRec"] = \Library::getCasesNumRec($usr_uid); if (is_array($res)) { - $response ["message"] = "" . G::LoadTranslation("ID_CASE") . " " . $app_number . " Summary of Derivations:
" . $messageDerivateCase; + $response ["message"] = "" . G::LoadTranslation("ID_CASE") . " " . $app_number . " " . + G::LoadTranslation("ID_SUMMARY_DERIVATION_BATCH_ROUTING") . ' :' . "
" . + $messageDerivateCase; } else { $response ["message"] = G::LoadTranslation("ID_CASE") . " " . $app_number . " " . $res->message; } diff --git a/workflow/engine/templates/cases/casesListConsolidated.js b/workflow/engine/templates/cases/casesListConsolidated.js index 26a87452a..fec3f8a53 100644 --- a/workflow/engine/templates/cases/casesListConsolidated.js +++ b/workflow/engine/templates/cases/casesListConsolidated.js @@ -421,27 +421,27 @@ Ext.onReady(function () { }); var buttonProcess = new Ext.Action({ - text: "Derivate", + text: _("ID_DERIVATED"), //iconCls: 'ICON_CASES_PAUSED', handler : function (){ - Ext.Msg.confirm('Confirm Routing', 'Route cases per batch?', + Ext.Msg.confirm(_("ID_CONFIRM_ROUTING"), _("ID_ROUTE_BATCH_ROUTING"), function(btn, text){ - if (btn=='yes'){ - htmlMessage = ""; - var selectedRow = Ext.getCmp(gridId).getSelectionModel().getSelections(); - var maxLenght = selectedRow.length; - for (var i in selectedRow) { - rowGrid = selectedRow[i].data - for (fieldGrid in rowGrid){ - if(fieldGrid != 'APP_UID' && fieldGrid != 'APP_NUMBER' && fieldGrid != 'APP_TITLE' && fieldGrid != 'DEL_INDEX' ){ - fieldGridGral = fieldGrid; - fieldGridGralVal = rowGrid[fieldGrid]; - } - } - if (selectedRow[i].data) { - ajaxDerivationRequest(selectedRow[i].data["APP_UID"], selectedRow[i].data["DEL_INDEX"], maxLenght, selectedRow[i].data["APP_NUMBER"],fieldGridGral, fieldGridGralVal); + if (btn == 'yes') { + htmlMessage = ""; + var selectedRow = Ext.getCmp(gridId).getSelectionModel().getSelections(); + var maxLenght = selectedRow.length; + for (var i in selectedRow) { + rowGrid = selectedRow[i].data + for (fieldGrid in rowGrid) { + if (fieldGrid != 'APP_UID' && fieldGrid != 'APP_NUMBER' && fieldGrid != 'APP_TITLE' && fieldGrid != 'DEL_INDEX') { + fieldGridGral = fieldGrid; + fieldGridGralVal = rowGrid[fieldGrid]; } } + if (selectedRow[i].data) { + ajaxDerivationRequest(selectedRow[i].data["APP_UID"], selectedRow[i].data["DEL_INDEX"], maxLenght, selectedRow[i].data["APP_NUMBER"], fieldGridGral, fieldGridGralVal); + } + } } } ); @@ -1321,7 +1321,7 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber, fieldGrid if (index == maxLenght) { Ext.MessageBox.show({ - title: "Derivation Result", + title: _("ID_DERIVATION_RESULT"), msg: htmlMessage, fn: function (btn, text, opt) {