fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in dheeyi/processmaker/HOR-302 (pull request #3761)

Browse Source 
HOR-302
This commit is contained in:
Julio Cesar Laura Avendaño
2016-03-01 14:53:43 -04:00
parent 954ea53d72 fe3ad734e0
commit a09181f8ce
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/menus/cases.php
View File

@@ -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'), '');
}
/*----------------------------------********---------------------------------*/

4
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -121,7 +121,9 @@ class Consolidated
$response["casesNumRec"] = \Library::getCasesNumRec($usr_uid);
if (is_array($res)) {
$response ["message"] = "<b>" . G::LoadTranslation("ID_CASE") . " " . $app_number . "</b> Summary of Derivations: <br> " . $messageDerivateCase;
$response ["message"] = "<b>" . G::LoadTranslation("ID_CASE") . " " . $app_number . "</b> " .
G::LoadTranslation("ID_SUMMARY_DERIVATION_BATCH_ROUTING") . ' :' . " <br> " .
$messageDerivateCase;
} else {
$response ["message"] = G::LoadTranslation("ID_CASE") . " " . $app_number . " " . $res->message;
}

6
workflow/engine/templates/cases/casesListConsolidated.js
View File

@@ -421,10 +421,10 @@ 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 = "";
@@ -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) {