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

Merged in release/3.4.9 (pull request #7294)

Browse Source 
Release/3.4.9

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2020-04-06 13:44:27 +00:00
parent 2b2694a308 66ca59f69f
commit e5f455fff3
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
workflow/engine/templates/processes/main.js
View File

@@ -401,7 +401,13 @@ Ext.onReady(function(){
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
//End code export - exportGranular (handle) //End code export - exportGranular (handle)
var proSelModel = new Ext.grid.CheckboxSelectionModel({
listeners: {
selectionchange: function (sm) {
//TODO selection change handler
}
}
});
processesGrid = new Ext.grid.GridPanel( { processesGrid = new Ext.grid.GridPanel( {
region: 'center', region: 'center',
layout: 'fit', layout: 'fit',
@@ -415,7 +421,6 @@ Ext.onReady(function(){
enableHdMenu: true, enableHdMenu: true,
frame:false, frame:false,
plugins: expander, plugins: expander,
cls : 'grid_with_checkbox',
columnLines: true, columnLines: true,
viewConfig: { viewConfig: {
forceFit:true, forceFit:true,
@@ -424,12 +429,12 @@ Ext.onReady(function(){
}, },
cm: new Ext.grid.ColumnModel({ cm: new Ext.grid.ColumnModel({
defaults: { defaults: {
width: 200, width: 50,
sortable: true sortable: true
}, },
columns: [ columns: [
proSelModel,
expander, expander,
// There is a list of allowed columns to sort: // There is a list of allowed columns to sort:
// workflow/engine/methods/cases/proxyProcessList.php // workflow/engine/methods/cases/proxyProcessList.php
// This is to prevent ORDER BY injection attacks // This is to prevent ORDER BY injection attacks
@@ -437,11 +442,10 @@ Ext.onReady(function(){
// It is identical to this list. // It is identical to this list.
// If you need to add a new column that is sortable, please // If you need to add a new column that is sortable, please
// make sure it is added there or sorting will not work. // make sure it is added there or sorting will not work.
{id:'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false}, {id:'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false},
{header: "", dataIndex: 'PRO_STATUS', width: 50, hidden:true, hideable:false}, {header: "", dataIndex: 'PRO_STATUS', width: 50, hidden:true, hideable:false},
{header: _('ID_PRO_DESCRIPTION'), dataIndex: 'PRO_DESCRIPTION', hidden:true, hideable:false}, {header: _('ID_PRO_DESCRIPTION'), dataIndex: 'PRO_DESCRIPTION', hidden:true, hideable:false},
{header: _('ID_PRO_TITLE'), dataIndex: 'PRO_TITLE', width: 380, hideable:false, renderer:function(v,p,r){ {header: _('ID_PRO_TITLE'), dataIndex: 'PRO_TITLE', width: 200, hideable:false, renderer:function(v,p,r){
// TODO Labels for var 'type' are hardcoded, they must be replaced on the future // TODO Labels for var 'type' are hardcoded, they must be replaced on the future
var color = r.get('PROJECT_TYPE') == 'bpmn'? 'green': 'blue'; var color = r.get('PROJECT_TYPE') == 'bpmn'? 'green': 'blue';
var type = r.get('PROJECT_TYPE') == 'bpmn'? ' (BPMN Project)': ''; var type = r.get('PROJECT_TYPE') == 'bpmn'? ' (BPMN Project)': '';
@@ -449,24 +453,25 @@ Ext.onReady(function(){
}}, }},
{header: _('ID_TYPE'), dataIndex: 'PROJECT_TYPE', width: 60, hidden:false}, {header: _('ID_TYPE'), dataIndex: 'PROJECT_TYPE', width: 60, hidden:false},
{header: _('ID_CATEGORY'), dataIndex: 'PRO_CATEGORY_LABEL', width: 100, hidden:false}, {header: _('ID_CATEGORY'), dataIndex: 'PRO_CATEGORY_LABEL', width: 100, hidden:false},
{header: _('ID_STATUS'), dataIndex: 'PRO_STATUS_LABEL', width: 60, renderer:function(v,p,r){
{header: _('ID_STATUS'), dataIndex: 'PRO_STATUS_LABEL', width: 50, renderer:function(v,p,r){
color = r.get('PRO_STATUS') == 'ACTIVE'? 'green': 'red'; color = r.get('PRO_STATUS') == 'ACTIVE'? 'green': 'red';
return String.format("<font color='{0}'>{1}</font>", color, v); return String.format("<font color='{0}'>{1}</font>", color, v);
}}, }},
{header: _('ID_OWNER'), dataIndex: 'PRO_CREATE_USER_LABEL', width: 150}, {header: _('ID_OWNER'), dataIndex: 'PRO_CREATE_USER_LABEL', width: 90},
{header: _('ID_PRO_CREATE_DATE'), dataIndex: 'PRO_CREATE_DATE', width: 70}, {header: _('ID_PRO_CREATE_DATE'), dataIndex: 'PRO_CREATE_DATE', width: 90},
{header: _('ID_INBOX'), dataIndex: 'CASES_COUNT_TO_DO', width: 60, align:'right'}, {header: _('ID_INBOX'), dataIndex: 'CASES_COUNT_TO_DO', width: 50, align:'right'},
{header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 60, align:'right'}, {header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 50, align:'right'},
{header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 60, align:'right'}, {header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 50, align:'right'},
{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 60, align:'right'}, {header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 50, align:'right'},
{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 60, renderer:function(v){return "<b>"+v+"</b>";}, align:'right'}, {header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75, renderer:function(v){return "<b>"+v+"</b>";}, align:'right'}
{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 70, align:"left"} ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"right"}
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE", width: 70, align:"left"} ,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE", width: 90, align:"right"}
] ]
}), }),
sm: proSelModel,
store: store, store: store,
tbar:[ tbar:[
newTypeProcess,/* newTypeProcess,/*