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

Improvement script usr reportin pro reporting

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

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

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;
     }