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

Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2041)

Browse Source 
Improvement formDashboards
This commit is contained in:
Dante Loayza
2015-04-29 16:32:15 -04:00
parent a0e0221e9b c11652b5fd
commit f49623a193
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -515,7 +515,7 @@ class indicatorsCalculator
$sqlString = "SELECT
COALESCE( SUM( TIMEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS OVERDUE,
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) > 0 ) , 0 ) AS ONTIME,
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS ATRISK
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 && TIMEDIFF( DEL_DUE_DATE , NOW( ) ) > 0) , 0 ) AS ATRISK
FROM LIST_INBOX
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO'
@@ -536,7 +536,7 @@ class indicatorsCalculator
COALESCE( SUM( TIMEDIFF( DEL_DUE_DATE , NOW( ) ) < 0 ) , 0 ) AS overdue,
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) > 0 ) , 0 ) AS onTime,
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 ) , 0 ) AS atRisk
COALESCE( SUM( TIMEDIFF( DEL_RISK_DATE , NOW( ) ) < 0 && TIMEDIFF( DEL_DUE_DATE , NOW( ) ) > 0) , 0 ) AS atRisk
FROM LIST_INBOX
WHERE USR_UID = :usrUid
AND APP_STATUS = 'TO_DO'

12
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -53,7 +53,6 @@ var storeProject;
var storeGroup;
var storeUsers;
var dataUserGroup;
var dasIndUid;
var flag = true;
var myMask;
var dataIndicator = '';
@@ -93,7 +92,7 @@ Ext.onReady( function() {
fieldLabel : _('ID_DESCRIPTION'),
anchor : '85%',
maskRe : /([a-zA-Z0-9_'\s]+)$/,
height : 50,
height : 50
}
]
});
@@ -485,7 +484,7 @@ Ext.onReady( function() {
}
},
{
title: _('ID_PRO_USER'),
title: _('ID_PRO_USER')
},
ownerInfoGrid
]
@@ -494,7 +493,7 @@ Ext.onReady( function() {
addTabButton = new Ext.Button ({
text: _('ID_NEW_TAB_INDICATOR'),
iconCls: 'button_menu_ext ss_sprite ss_add',
handler: addTab,
handler: addTab
});
tabPanel = new Ext.TabPanel({
@@ -627,12 +626,9 @@ Ext.onReady( function() {
items : [
addTabButton,
tabPanel
]
});
//form
frmDashboard = new Ext.FormPanel({
id : 'frmDashboard',
@@ -966,7 +962,7 @@ var addTab = function (flag) {
if (tabActivate.indexOf(that.id) == -1 ) {
tabActivate.push(that.id);
}
},
}
},
closable:true
};