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

Merged in dashboards2 (pull request #2423)

Browse Source 
Tickets 2787, 3063, 3001, 3061
This commit is contained in:
Julio Cesar Laura Avendaño
2015-07-12 12:26:37 -04:00
parent ed5bf66605 d4f33eae64
commit 2b71760cce
7 changed files with 142 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/setup/setupSchemas/triggerFillReportByProcess.sql
View File

@@ -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
);

6
workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
View File

@@ -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))
)