Merged in dashboards2 (pull request #1862)

Adjusts to schema

workflow/engine/config/schema.xml

@@ -1478,7 +1478,7 @@
     <column name="USR_TOTAL_PAUSED" type="INTEGER" default="0"/>
     <column name="USR_TOTAL_COMPLETED" type="INTEGER" default="0"/>
     <column name="USR_TOTAL_UNASSIGNED" type="INTEGER" default="0"/>
-    <column name="USR_COST_BY_HOUR" type="DOUBLE" size="11,2" required="false" default="0"/>
+    <column name="USR_COST_BY_HOUR" type="DECIMAL" size="7,2" required="false" default="0"/>
     <column name="USR_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
     <validator column="USR_STATUS">
       <rule name="validValues" value="ACTIVE|INACTIVE|VACATION|CLOSED" message="Please select a valid type."/>

workflow/engine/data/mysql/schema.sql

@@ -28,6 +28,8 @@ CREATE TABLE `APPLICATION`
 	`APP_UPDATE_DATE` DATETIME  NOT NULL,
 	`APP_DATA` MEDIUMTEXT  NOT NULL,
 	`APP_PIN` VARCHAR(32) default '' NOT NULL,
+    `APP_DURATION` DOUBLE default 0,
+    `APP_DELAY_DURATION` DOUBLE default 0,
 	PRIMARY KEY (`APP_UID`),
 	KEY `indexApp`(`PRO_UID`, `APP_STATUS`, `APP_UID`),
 	KEY `indexAppNumber`(`APP_NUMBER`),
@@ -705,6 +707,8 @@ CREATE TABLE `USERS`
 	`USR_TOTAL_PAUSED` INTEGER default 0,
 	`USR_TOTAL_COMPLETED` INTEGER default 0,
 	`USR_TOTAL_UNASSIGNED` INTEGER default 0,
+    `USR_COST_BY_HOUR` DECIMAL(7,2) default 0,
+    `USR_UNIT_COST` VARCHAR(50) default '',
 	PRIMARY KEY (`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Users';
 #-----------------------------------------------------------------------------

workflow/engine/js/strategicDashboard/dashboard.js

@@ -1060,6 +1060,8 @@
             var widget = userEffic;
             var id = "userEffic";
             break;
+        case "1020":
+        case "1040":
         case "1050":
         case "1060":
         case "1070":