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

Merged in release/3.3.4 (pull request #6782)

Browse Source 
Release/3.3.4

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2019-02-14 12:45:43 +00:00
parent bfbda48527 4a38df74c4
commit 460bb1aef4
25 changed files with 1445 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/templates/cases/casesList.js
View File

@@ -309,6 +309,7 @@ function pauseCase(date){
buttons: [{
text: _('ID_OK'),
handler: function(){
this.setDisabled(true);
if (Ext.getCmp('noteReason').getValue() != '') {
var noteReasonTxt = _('ID_CASE_PAUSE_LABEL_NOTE') + ' ' + Ext.getCmp('noteReason').getValue();
} else {

139
workflow/engine/templates/cases/casesListSetup.js
View File

@@ -64,7 +64,7 @@ Ext.onReady(function () {
success: function (response, opts)
{
var dataResponse = eval("(" + response.responseText + ")"); //json
var dataResponse = Ext.util.JSON.decode(response.responseText);
switch (option) {
case "FIELD_SET":
@@ -85,8 +85,11 @@ Ext.onReady(function () {
break;
case "FIELD_SAVE":
configDefaultResponseText = response.responseText;
Ext.Msg.alert(_("ID_INFO"), _("ID_SAVED"));
location.reload(true);
var windowAlert = Ext.Msg.alert(_("ID_INFO"), _("ID_SAVED"));
fieldSet(dataResponse);
setTimeout(function () {
windowAlert.getDialog().close();
}, 500);
break;
}
},
@@ -150,75 +153,55 @@ Ext.onReady(function () {
{name: 'align', mapping : 'align'}
];
//Dropdown to select the PMTable
var PmTableStore = new Ext.data.JsonStore({
root : 'data',
url : 'proxyPMTablesList',
totalProperty : 'totalCount',
idProperty : 'gridIndex',
remoteSort : false, //true,
autoLoad : false,
fields : [
'ADD_TAB_UID', 'ADD_TAB_NAME'
],
listeners : {load: function() {
tabs.setActiveTab(tabIndex);
}}
});
// create the Data Store to list PMTables in the dropdown
var pmTablesDropdown = new Ext.form.ComboBox ({
width : '180',
xtype : 'combo',
emptyText: _("ID_EMPTY_PMTABLE"),
displayField : 'ADD_TAB_NAME',
valueField : 'ADD_TAB_UID',
triggerAction: 'all',
store : PmTableStore,
listeners: {
'select': function() {
var tableUid = this.value;
Ext.Ajax.request({
url: 'proxyPMTablesFieldList',
success: function(response) {
var dataResponse = Ext.util.JSON.decode(response.responseText);
var rec = Ext.data.Record.create(pmFields);
//alert(firstGrid.store);
var index;
var record;
var count = firstGrid.store.getTotalCount();
// removing all the PM Table fields from the first grid
do {
index = firstGrid.store.find('fieldType','PM Table');
record = firstGrid.store.getAt(index);
if (index>=0) {
firstGrid.store.remove(record);
}
} while (index>=0);
// removing all the PM Table fields from the second grid
do {
index = secondGrid.store.find('fieldType','PM Table');
record = secondGrid.store.getAt(index);
if (index>=0) {
secondGrid.store.remove(record);
}
} while (index>=0);
for (var i = 0; i <= dataResponse.data.length-1; i++) {
var d = new rec( dataResponse.data[i] );
firstGrid.store.add(d);
//Dropdown to select the PMTable
var PmTableStore = new Ext.data.JsonStore({
root: 'data',
url: 'proxyPMTablesList',
totalProperty: 'totalCount',
idProperty: 'gridIndex',
remoteSort: false, //true,
autoLoad: false,
fields: [
'ADD_TAB_UID', 'ADD_TAB_NAME'
],
listeners: {
load: function () {
tabs.setActiveTab(tabIndex);
}
firstGrid.store.commitChanges();
},
failure: function(){},
params: {xaction: 'getFieldsFromPMTable', table: tableUid }
});
}
});
}
}
});
// create the Data Store to list PMTables in the dropdown
var pmTablesDropdown = new Ext.form.ComboBox({
width: '180',
xtype: 'combo',
emptyText: _("ID_EMPTY_PMTABLE"),
displayField: 'ADD_TAB_NAME',
valueField: 'ADD_TAB_UID',
triggerAction: 'all',
store: PmTableStore,
listeners: {
focus: function(){
PmTableStore.load();
},
'select': function () {
var tableUid = this.value;
Ext.Ajax.request({
url: 'proxyPMTablesFieldList',
params: {
xaction: 'FIELD_SET',
action: currentAction,
table: tableUid
},
success: function (response) {
var dataResponse = Ext.util.JSON.decode(response.responseText);
fieldSet(dataResponse);
},
failure: function () {}
});
}
}
});
// COMPONENT DEPRECATED remove it in the next revision of the enterprise plugin
// create the Dropdown for rows per page
@@ -501,6 +484,20 @@ Ext.onReady(function () {
height : screen.height-245,
layout : 'hbox',
layoutConfig : {align : 'stretch'},
listeners: {
render: function (target) {
var el;
if (target.container && target.container.dom) {
el = target.container.dom;
el.style.cssText = 'overflow:hidden;position:absolute;top:28px;bottom:0px;left:0px;right:0px;';
target.setHeight(el.clientHeight);
Ext.EventManager.onWindowResize(function () {
mainPanel.setHeight(el.clientHeight);
mainPanel.doLayout();
});
}
}
},
tbar : new Ext.Toolbar({
items: [
_("ID_PM_TABLE"),
@@ -573,7 +570,7 @@ Ext.onReady(function () {
text: _("ID_RESET"),
handler: function ()
{
var dataResponse = eval("(" + configDefaultResponseText + ")"); //json
var dataResponse = Ext.util.JSON.decode(configDefaultResponseText);
fieldSet(dataResponse);
}

334
workflow/engine/templates/cases/open.js
View File

@@ -1,11 +1,14 @@
var Actions = {};
var showCaseNavigatorPanel;
var hideCaseNavigatorPanel;
var informationMenu;
var caseMenuOpen = false;
var menuSelectedTitle = [];
var _ENV_CURRENT_DATE;
var winTree;
var Actions = {},
hideCaseNavigatorPanel,
informationMenu,
caseMenuOpen = false,
menuSelectedTitle = [],
_ENV_CURRENT_DATE,
winTree,
buttonCancel,
buttonClaimCase,
navPanelBottom,
navPanel;
historyGridListChangeLogGlobal = {};
historyGridListChangeLogGlobal.idHistory = '';
@@ -351,109 +354,217 @@ Ext.onReady(function(){
setNode(idfirstform);
}
var navPanelWest = {
id: 'navPanelWest',
region: 'west',
xtype:'panel',
width: 250,
height: 500,
maxSize: 400,
split: true,
collapsible: false,
margins: '0 0 0 0',
items:[casesStepTree]
}
var fnChangeStatus =function(){
alert('loaded');
}
var screenWidth = (PMExt.getBrowser().screen.width-140).toString() + 'px';
var navPanelCenter = {
id: 'navPanelCenter',
region: 'center', layout:'fit',forceLayout: true,
xtype:'panel',
items:[{
xtype:"tabpanel",
id: 'caseTabPanel',
deferredRender:false,
defaults:{autoScroll: true},
defaultType:"iframepanel",
activeTab: 0,
enableTabScroll: true,
//defaults: Ext.apply({}, Ext.isGecko? {style:{position:'absolute'},hideMode:'visibility'}:false),
items:[{
id: 'casesTab',
title: _('ID_CASE') +' ' + _APP_NUM,
frameConfig:{name:'openCaseFrame', id:'openCaseFrame'},
defaultSrc : uri,
loadMask:{msg: _('ID_LOADING_GRID') },
bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'hidden'},
width:screenWidth
}
],
listeners: {
tabchange: function(panel){
panel.ownerCt.doLayout();
},
render : function(panel){
Ext.each([this.el, this[this.collapseEl]] ,
function( elm ) {
elm.setVisibilityMode(Ext.Element.VISIBILITY).originalDisplay ='visible';
});
}
}
}]
};
var navPanel = {
id: 'navPanel',
region: 'center',
layout: 'border',
items:[navPanelWest, navPanelCenter],
tbar:[{
id: 'stepsMenu',
text: '&nbsp;&nbsp;'+_('ID_STEPS'),
pressed: false,
enableToggle:true,
tooltip: {
title: _('ID_CASES_STEPS'),
text:_('ID_SHOW_HIDE_CASES_STEPS')
},
iconCls: 'ICON_STEPS',
toggleHandler: togglePreview,
disabled: true
}, {
id: 'informationMenu',
text: _('ID_INFORMATION'),
menu: []
}, {
id: 'actionMenu',
text: _('ID_ACTIONS'),
menu: []
}, {
id: 'caseNotes',
pressed: false,
enableToggle:true,
text: '&nbsp;&nbsp;'+_('ID_CASES_NOTES'),
iconCls: 'button_menu_ext ICON_CASES_NOTES',
tooltip: {
title: _('ID_CASES_NOTES'),
text:_('ID_SHOW_CASES_NOTES')
},
toggleHandler:function(btn, pressed){
if(pressed){
openCaseNotesWindow();
}else{
closeCaseNotesWindow();
}
var navPanelWest = {
id: 'navPanelWest',
region: 'west',
xtype:'panel',
width: 250,
height: 500,
maxSize: 400,
split: true,
collapsible: false,
margins: '0 0 0 0',
items:[casesStepTree]
}
}]
}
var fnChangeStatus =function(){
alert('loaded');
}
var screenWidth = (PMExt.getBrowser().screen.width-140).toString() + 'px';
var navPanelCenter = {
id: 'navPanelCenter',
region: 'center', layout:'fit',forceLayout: true,
xtype:'panel',
items:[{
xtype:"tabpanel",
id: 'caseTabPanel',
deferredRender:false,
defaults:{autoScroll: true},
defaultType:"iframepanel",
activeTab: 0,
enableTabScroll: true,
//defaults: Ext.apply({}, Ext.isGecko? {style:{position:'absolute'},hideMode:'visibility'}:false),
items:[{
id: 'casesTab',
title: _('ID_CASE') +' ' + _APP_NUM,
frameConfig:{name:'openCaseFrame', id:'openCaseFrame'},
defaultSrc : uri,
loadMask:{msg: _('ID_LOADING_GRID') },
bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'hidden'},
width:screenWidth
}
],
listeners: {
tabchange: function(panel){
panel.ownerCt.doLayout();
},
render : function(panel){
Ext.each([this.el, this[this.collapseEl]] ,
function( elm ) {
elm.setVisibilityMode(Ext.Element.VISIBILITY).originalDisplay ='visible';
});
}
}
}]
};
buttonCancel = new Ext.Button({
buttonAlign: 'center',
text: 'Cancel',
handler: redirectHistory,
cls: 'cancelSummary',
width: '100px',
flex: 1,
style: "height:36px"
});
buttonClaimCase = new Ext.Button({
buttonAlign: 'center',
ui: 'round',
text: 'Claim this case',
handler: claimCase,
cls: 'claimCaseSummary',
width: '120px',
flex: 1,
style: "height:36px"
});
navPanelBottom = {
id: 'navPanelBottom',
name: 'navPanelBottom',
cls: 'navPanelBottom',
region: 'south',
layout: 'column',
dock: 'bottom',
border: false,
margin: '0 0 0 0',
split: false,
collapsible: false,
hidden: false,
buttonAlign: 'center',
buttonHeight: 200,
buttons: [buttonCancel, buttonClaimCase]
};
/**
* Claim the case.
*/
function claimCase() {
Ext.Ajax.request({
url: 'cases_CatchExecute',
success: function (response, opts) {
Ext.Ajax.request({
url: 'ajaxListener',
params: {action : 'steps'},
success: function (response, opts) {
Ext.getCmp('navPanelBottom').hide();
Ext.getCmp('navPanel').doLayout();
//Reload frame pmDynaform
if (isBrowserIE()) {
document.getElementById('openCaseFrame').contentWindow.location.reload(true);
} else {
Ext.getCmp('navPanelCenter').getUpdater().getEl().update();
}
}
});
}
});
}
/**
* Redirect to unassigned inbox.
*/
function redirectHistory() {
if (isBrowserIE()) {
if (top.opener) {
//Is open the claim case in another tab
top.opener.location.reload();
top.close();
} else {
//When isIE with ux skin is not open another tab
javascript:history.back();
}
} else {
javascript:history.back();
}
}
navPanel = {
id: 'navPanel',
region: 'center',
layout: 'border',
items: [navPanelWest, navPanelCenter],
tbar: [{
id: 'stepsMenu',
text: '&nbsp;&nbsp;' + _('ID_STEPS'),
pressed: false,
enableToggle: true,
tooltip: {
title: _('ID_CASES_STEPS'),
text: _('ID_SHOW_HIDE_CASES_STEPS')
},
iconCls: 'ICON_STEPS',
toggleHandler: togglePreview,
disabled: true
}, {
id: 'informationMenu',
text: _('ID_INFORMATION'),
menu: []
}, {
id: 'actionMenu',
text: _('ID_ACTIONS'),
menu: []
}, {
id: 'caseNotes',
pressed: false,
enableToggle: true,
text: '&nbsp;&nbsp;' + _('ID_CASES_NOTES'),
iconCls: 'button_menu_ext ICON_CASES_NOTES',
tooltip: {
title: _('ID_CASES_NOTES'),
text: _('ID_SHOW_CASES_NOTES')
},
toggleHandler: function (btn, pressed) {
if (pressed) {
openCaseNotesWindow();
} else {
closeCaseNotesWindow();
}
}
}]
};
/**
* Get Parameters from URL
* @returns {*}
*/
function getParameterURL() {
var item,
key = false,
result = {},
url = location.search.substring(1),
regExp = /([^&=]+)=([^&]*)/g;
if (arguments.length > 0 && arguments[0].length > 1) {
key = arguments[0];
}
while (item = regExp.exec(url)) {
if (key !== false && decodeURIComponent(item[1]) === key) {
return decodeURIComponent(item[2]);
}
else if (key === false) {
result[decodeURIComponent(item[1])] = decodeURIComponent(item[2]);
}
}
return key === false ? result : null;
}
if (this.showCustomForm && this.showCustomForm === true && getParameterURL('action') === 'unassigned') {
navPanel.items[navPanel.items.length] = navPanelBottom;
}
var viewport = new Ext.Viewport({
layout: 'border',
@@ -1359,6 +1470,7 @@ Ext.onReady(function(){
Actions.pauseCase = function()
{
Ext.getCmp('submitPauseCase').setDisabled(true);
Ext.Ajax.request({
url : 'ajaxListener' ,
params : {action : 'verifySession'},
@@ -1390,6 +1502,7 @@ Ext.onReady(function(){
var paramsNote = '&NOTE_REASON=' + noteReasonTxt + '&NOTIFY_PAUSE=' + notifyReasonVal;
var unpauseDate = Ext.getCmp('unpauseDate').getValue();
if( unpauseDate == '') {
Ext.getCmp('submitPauseCase').setDisabled(false);
return;
} else {
unpauseDate = unpauseDate.format('Y-m-d');
@@ -1420,6 +1533,7 @@ Ext.onReady(function(){
},
failure: function ( res, req) {
PMExt.error(_('ID_ERROR'), req.result.msg);
Ext.getCmp('submitPauseCase').setDisabled(false);
}
});
}
@@ -1428,6 +1542,7 @@ Ext.onReady(function(){
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert( _('ID_FAILED'), result.responseText);
}
Ext.getCmp('submitPauseCase').setDisabled(false);
}
});
}
@@ -1892,4 +2007,3 @@ Ext.onReady(function(){
node.select();
}