From 6c2c29f5c4087f2b66292175bcc77ebc2d9fe7ee Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Fri, 8 May 2015 09:54:27 -0400 Subject: [PATCH 1/2] Changed label error cost by hour --- workflow/engine/templates/users/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index f2d45f7d6..8647cf40e 100755 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -1176,7 +1176,7 @@ function saveUser() } } if (!Ext.getCmp('USR_COST_BY_HOUR').isValid()) { - PMExt.warning(_('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_INTEGER', _('ID_COST_BY_HOUR'))); + PMExt.warning(_('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_DECIMAL', _('ID_COST_BY_HOUR'))); Ext.getCmp('USR_COST_BY_HOUR').focus(true,10); return false; } From 6e59ac932ddca7a791c8f840bb5176fe9f3c8047 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Fri, 8 May 2015 10:47:42 -0400 Subject: [PATCH 2/2] Improvement script usr reportin pro reporting --- .../methods/setup/setupSchemas/triggerFillReportByProcess.sql | 2 +- .../methods/setup/setupSchemas/triggerFillReportByUser.sql | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql index d25283597..bfb22baf7 100644 --- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql @@ -39,7 +39,7 @@ WHERE APPLICATION.APP_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME) GROUP BY APPLICATION.PRO_UID; - +#TODO task duration should be calculated with the calendar UPDATE PRO_REPORTING SET PRO_REPORTING.CONFIGURED_PROCESS_TIME = ( SELECT SUM(if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*24), TASK.TAS_DURATION)) diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql index 82c33230b..12cadab2c 100644 --- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql @@ -44,6 +44,10 @@ WHERE ACV.DEL_INIT_DATE BETWEEN CAST(@INIT_DATE AS DATETIME) AND CAST(@FINISH_DATE AS DATETIME) GROUP BY ACV.USR_UID , ACV.TAS_UID , ACV.PRO_UID; +DELETE USR_REPORTING +FROM USR_REPORTING +INNER JOIN TASK ON TASK.TAS_UID = USR_REPORTING.TAS_UID +WHERE TASK.TAS_TYPE NOT IN ('NORMAL', 'ADHOC'); UPDATE USR_REPORTING INNER JOIN