From 103c9ef036b974340b92ce148cfe320b0ed84c19 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Wed, 1 Jul 2015 11:17:13 -0400 Subject: [PATCH] Improvement minutes - execute cron. --- .../setup/setupSchemas/triggerFillReportByProcess.sql | 2 +- .../methods/setup/setupSchemas/triggerFillReportByUser.sql | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql index 6ff6ad621..2f1526725 100644 --- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql @@ -53,7 +53,7 @@ USR_REPORTING.PRO_UNIT_COST = PROCESS.PRO_UNIT_COST; #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)) + SELECT SUM(if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*24), (if (TASK.TAS_TIMEUNIT = "MINUTES", (TASK.TAS_DURATION/60), TASK.TAS_DURATION)))) FROM TASK WHERE PRO_REPORTING.PRO_UID = TASK.PRO_UID ); diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql index fd2488ba1..8e7bae1c9 100644 --- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql +++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql @@ -80,6 +80,10 @@ IF(TASK.TAS_TIMEUNIT = "DAYS", WHERE CA.OBJECT_UID = TASK.TAS_UID AND CA.CALENDAR_UID = CBH.CALENDAR_UID GROUP BY CA.CALENDAR_UID LIMIT 1) ,24))) -,TASK.TAS_DURATION) +, +(IF(TASK.TAS_TIMEUNIT = "MINUTES", + (TASK.TAS_DURATION /60) +,TASK.TAS_DURATION)) +)