From 005f00a153e455fdf692198c307efb03d9304266 Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Thu, 7 May 2015 15:26:07 -0400
Subject: [PATCH 1/9] adding 1 decimal to costs

---
 .../engine/js/strategicDashboard/viewDashboardPresenter.js    | 4 ++--
 workflow/engine/js/strategicDashboard/viewDashboardView.js    | 4 +++-
 .../engine/templates/strategicDashboard/viewDashboard.html    | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
index 13c8be6bf..2ac674d22 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
@@ -88,12 +88,12 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
 
 		//rounding
 		newObject.comparative =  Math.round(newObject.comparative*100)/100;
-		newObject.comparative = ((newObject.comparative > 0)? "+": "") + newObject.comparative;
+		newObject.comparative = ((newObject.comparative > 0) ? "+": "") + newObject.comparative;
 
 		newObject.percentComparative = (newObject.percentComparative != '--')
 										? '(' + newObject.percentComparative + '%)'
 										: "";
-		newObject.percentComparative = (newObject.comparative == 0)
+		newObject.percentComparative = (newObject.comparative == 0 && newObject.percentComparative !=  '')
 										? "(0%)"
 										: newObject.percentComparative;
 
diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js
index c5f03c931..6d2f112d3 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardView.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js
@@ -535,7 +535,9 @@ var defaultEndDate = function () {
 
 var fillDashboardsList = function (presenterData) {
 	if (presenterData == null || presenterData.length == 0) {
-		$('#dashboardsList').append(G_STRING['ID_NO_DATA_TO_DISPLAY']);
+		$('#dashboardMessage').text(G_STRING['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE']);
+		$('#titleH4').text(G_STRING['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE']);
+		$('#compareIndicators').hide();
 	}
 	_.templateSettings.variable = "dashboard";
 	var template = _.template ($("script.dashboardButtonTemplate").html())
diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html
index 4460e1c8b..18925611e 100644
--- a/workflow/engine/templates/strategicDashboard/viewDashboard.html
+++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html
@@ -358,7 +358,7 @@
                         <h4 id="titleH4" class="header-dashboard"></h4>
                         <div class="pull-right dashboard-right container-fluid">
 
-							<div class="row pull-left">
+							<div id="compareIndicators" class="row pull-left">
 								<div class="span4 pull-left">
 									<h5 class="pull-left">{translate label="ID_DASH_COMPARE_MONTH"}:</h5>
 								</div>
@@ -402,7 +402,7 @@
                         <div class="clearfix"></div>
                         <div class="collapse" id="collapseExample">
                           <div class="well">
-                            <p class="text-center">{translate label="ID_DASH_CLICK_TO_VIEW"}</p>
+                            <p id="dashboardMessage" class="text-center">{translate label="ID_DASH_CLICK_TO_VIEW"}</p>
                             <p>
                                 <!-- Split button -->
                               <div id="dashboardsList">

From 51d45c5a7210556a59ad923d9e39062e23aa0a93 Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Thu, 7 May 2015 17:01:05 -0400
Subject: [PATCH 2/9] 20150507_1701PM

---
 .../js/strategicDashboard/viewDashboardPresenter.js  | 12 ++++++------
 .../templates/strategicDashboard/viewDashboard.html  |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
index 2ac674d22..cc0615122 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
@@ -255,7 +255,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
 		var newObject = that.helper.merge(originalObject, {}, map);
 		graphData.push(newObject);
 		originalObject.efficiencyIndexToShow = that.roundedIndicatorValue(originalObject.efficiencyIndex);
-		originalObject.inefficiencyCostToShow =  Math.round(originalObject.inefficiencyCost);
+		originalObject.inefficiencyCostToShow =  Math.round(originalObject.inefficiencyCost * 10) / 10;
 		originalObject.indicatorId = data.id;
 		originalObject.json = JSON.stringify(originalObject);
 	});
@@ -266,7 +266,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
 	this.makeShortLabel(graphData, 10);
 	retval.dataToDraw = this.adaptGraphData(graphData);
 
-	retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
+	retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost * 10) / 10;
 	retval.efficiencyIndexToShow = that.roundedIndicatorValue(retval.efficiencyIndex);
 	return retval;
 };
@@ -284,7 +284,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
 		};
 		var newObject = that.helper.merge(originalObject, {}, map);
 		graphData.push(newObject);
-		originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
+		originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost * 10)/10;
 		originalObject.efficiencyIndexToShow = that.roundedIndicatorValue(originalObject.efficiencyIndex);
 		originalObject.indicatorId = data.id;
 		originalObject.json = JSON.stringify(originalObject);
@@ -295,7 +295,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
 	this.makeShortLabel(graphData, 10);
 	retval.dataToDraw = this.adaptGraphData(graphData);
 
-	retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
+	retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost * 10) / 10;
 	retval.efficiencyIndexToShow = that.roundedIndicatorValue(retval.efficiencyIndex);
 	return retval;
 };
@@ -418,7 +418,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
 			"deviationTime" : "dispersion"
 		};
 		var newObject = that.helper.merge(originalObject, {}, map);
-		originalObject.inefficiencyCostToShow =  Math.round(originalObject.inefficiencyCost);
+		originalObject.inefficiencyCostToShow =  Math.round(originalObject.inefficiencyCost * 10) / 10;
 		originalObject.efficiencyIndexToShow = that.roundedIndicatorValue(originalObject.efficiencyIndex);
 		originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
 		originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
@@ -445,7 +445,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
 			"deviationTime" : "dispersion"
 		};
 		var newObject = that.helper.merge(originalObject, {}, map);
-		originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
+		originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost * 10) / 10;
 		originalObject.efficiencyIndexToShow = that.roundedIndicatorValue(originalObject.efficiencyIndex);
 		originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
 		originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html
index 18925611e..033dc2c9f 100644
--- a/workflow/engine/templates/strategicDashboard/viewDashboard.html
+++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html
@@ -208,7 +208,7 @@
 				<div class="col-xs-12 text-center detail-title-selector">
 					<i class="fa fa-tasks fa-fw"></i> 
 					<span id="usrName"><%- detailData.name %> </span>
-					<span>(<%- detailData.rankToShow %>)</span>
+					<span>(Ranking: <%- detailData.rankToShow %>)</span>
 				 </div>
 				<div class="clearfix"></div>
 			</div>
@@ -363,7 +363,6 @@
 									<h5 class="pull-left">{translate label="ID_DASH_COMPARE_MONTH"}:</h5>
 								</div>
 
-
 								<div class="span4 pull-left">
 									<select id="year" class="form-control pull-right ">
 									{literal}

From d5e9c073f5965e51d7bba93a516e92882b0f2ce6 Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Thu, 7 May 2015 17:31:50 -0400
Subject: [PATCH 3/9] detail view changed

---
 .../strategicDashboard/viewDashboard.html     | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html
index 033dc2c9f..1587c83c4 100644
--- a/workflow/engine/templates/strategicDashboard/viewDashboard.html
+++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html
@@ -170,7 +170,9 @@
 	</script>
 
 	<script type="text/template" class="specialIndicatorDetail">
-		<div  class="process-div well hideme  detail-button-selector" data-gs-no-resize="true"
+		<div  class="process-div well hideme  detail-button-selector" 
+			data-gs-no-resize="true"
+			style="cursor:pointer;"
 			  id="detailData-<%- detailData.uid %>"
 			  data-indicator-id="<%- detailData.indicatorId %>"
 			  data-detail-id="<%- detailData.uid %>"
@@ -179,23 +181,29 @@
 			  data-detail-cost="<%- detailData.inefficiencyCost%>"
 			  data-detail-name="<%- detailData.name %>"
             >
-			<div class="col-lg-12 vcenter-task">
-				<a href="#" class="process-button">
-					<div class="col-xs-5 text-left title-process">
-						<div  class="small grey detail-title-selector"> <%- detailData.name %></div>
-					</div>
-					<div class="col-xs-3 text-center ">
-						<div class="blue"><%- detailData.efficiencyIndexToShow%></div>
-						<div class="small grey detail-efficiency-selector ellipsis"></div>
-					</div>
-					<div class="col-xs-3 text-center ">
-						<div class="red detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow %></div>
-						<div class="small grey detail-cost-selector ellipsis"></div>
-					</div>
-					<div class="col-xs-1 text-right arrow"><i class="fa fa-chevron-right fa-fw"></i></div>
-				</a>
+			<div class="panel-heading greenbg">
+				<div class="col-xs-11 text-center detail-title-selector">
+					<div class="ellipsis"><%- detailData.name %> </div>
+				 </div>
+				<div class="col-xs-1 text-center detail-title-selector">
+					<i class="fa fa-chevron-right fa-fw"></i> 
+				 </div>
+				<div class="clearfix"></div>
 			</div>
-			<div class="clearfix"></div>
+			<div class="text-center huge">
+				<div class="col-xs-12 vcenter-task">
+					<div class="col-xs-6 ">
+						<div class="blue small"><%- detailData.efficiencyIndexToShow%></div>
+						<div class="smallB grey detail-efficiency-selector ellipsis"></div>
+					</div>
+					<div class="col-xs-6 ">
+						<div class="small detail-cost-number-selector">{$unitCost}&nbsp;<%- detailData.inefficiencyCostToShow%></div>
+						<div class="smallB grey detail-cost-selector ellipsis"></div>
+					</div>
+				</div>
+				<div class="clearfix"></div>
+			</div>
+
 		</div>
 	</script>
 
@@ -219,7 +227,7 @@
 						<div class="smallB grey detail-efficiency-selector ellipsis"></div>
 					</div>
 					<div class="col-xs-6 ">
-						<div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
+						<div class="small detail-cost-number-selector">{$unitCost}&nbsp;<%- detailData.inefficiencyCostToShow%></div>
 						<div class="smallB grey detail-cost-selector ellipsis"></div>
 					</div>
 				</div>
@@ -247,7 +255,7 @@
 						<div class="smallB grey detail-efficiency-selector ellipsis"></div>
 					</div>
 					<div class="col-xs-6 ">
-						<div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
+						<div class="small detail-cost-number-selector">{$unitCost}&nbsp;<%- detailData.inefficiencyCostToShow%></div>
 						<div class="smallB grey detail-cost-selector ellipsis"></div>
 					</div>
 				</div>

From d5dace0e5381f3d98ce84bf7ec0cc615eef558a1 Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Thu, 7 May 2015 17:43:48 -0400
Subject: [PATCH 4/9] detail view corrected for long names of processes, tasks
 and users

---
 .../engine/templates/strategicDashboard/viewDashboard.html   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html
index 1587c83c4..7e6477b81 100644
--- a/workflow/engine/templates/strategicDashboard/viewDashboard.html
+++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html
@@ -213,10 +213,9 @@
 			 data-indicator-id="<%- detailData.indicatorId %>"
 			 data-detail-id="<%- detailData.uid %>">
 			<div class="panel-heading greenbg">
-				<div class="col-xs-12 text-center detail-title-selector">
-					<i class="fa fa-tasks fa-fw"></i> 
+				<div class="col-xs-12 text-center detail-title-selector ellipsis">
 					<span id="usrName"><%- detailData.name %> </span>
-					<span>(Ranking: <%- detailData.rankToShow %>)</span>
+					(Ranking: <%- detailData.rankToShow %>)
 				 </div>
 				<div class="clearfix"></div>
 			</div>

From 878e9bc6da28250f1b000f49e85ced9cb4226140 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina Mena <marcoantonina@gmail.com>
Date: Thu, 7 May 2015 18:46:59 -0400
Subject: [PATCH 5/9] Improvement configured task time of calendar

---
 .../setupSchemas/triggerFillReportByUser.sql   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
index 6479d5ddb..82c33230b 100644
--- a/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
+++ b/workflow/engine/methods/setup/setupSchemas/triggerFillReportByUser.sql
@@ -39,7 +39,7 @@ SELECT
     count(if(ACV.DEL_DELAY_DURATION > 0, 1, NULL)) AS TOTAL_CASES_OVERDUE,
     count(if(ACV.DEL_DELAY_DURATION <= 0, 1, NULL)) AS TOTAL_CASES_ON_TIME
 FROM
-    APP_CACHE_VIEW AS ACV 
+    APP_CACHE_VIEW AS ACV
 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;
@@ -52,10 +52,16 @@ ON USR_REPORTING.USR_UID = USERS.USR_UID
 SET USR_REPORTING.USER_HOUR_COST = USERS.USR_COST_BY_HOUR;
 
 UPDATE USR_REPORTING
-INNER JOIN
-TASK
-ON USR_REPORTING.TAS_UID = TASK.TAS_UID
-SET USR_REPORTING.CONFIGURED_TASK_TIME = if (TASK.TAS_TIMEUNIT = "DAYS", (TASK.TAS_DURATION*24), TASK.TAS_DURATION)
-
+INNER JOIN TASK ON USR_REPORTING.TAS_UID = TASK.TAS_UID
+SET USR_REPORTING.CONFIGURED_TASK_TIME =
+IF(TASK.TAS_TIMEUNIT = "DAYS",
+  (TASK.TAS_DURATION *
+    (IF ((SELECT CA.CALENDAR_UID FROM CALENDAR_ASSIGNMENTS AS CA WHERE CA.OBJECT_UID = TASK.TAS_UID limit 1) IS NOT NULL,
+       (SELECT AVG(TIMEDIFF(STR_TO_DATE(CBH.CALENDAR_BUSINESS_END, '%H:%i'), STR_TO_DATE(CBH.CALENDAR_BUSINESS_START, '%H:%i')))/10000
+        FROM CALENDAR_ASSIGNMENTS AS CA, CALENDAR_BUSINESS_HOURS AS CBH
+        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)
 
 

From b5cb01835fc2d7dc03efd4f19548bb19024c0063 Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Thu, 7 May 2015 18:50:08 -0400
Subject: [PATCH 6/9] add round

---
 workflow/engine/js/strategicDashboard/viewDashboardPresenter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
index cc0615122..df5e55d97 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
@@ -255,6 +255,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
 		var newObject = that.helper.merge(originalObject, {}, map);
 		graphData.push(newObject);
 		originalObject.efficiencyIndexToShow = that.roundedIndicatorValue(originalObject.efficiencyIndex);
+		//rounded to 1 decimal
 		originalObject.inefficiencyCostToShow =  Math.round(originalObject.inefficiencyCost * 10) / 10;
 		originalObject.indicatorId = data.id;
 		originalObject.json = JSON.stringify(originalObject);

From a48a45e1dc0a9615463f958ce0ffc75a71d1ddab Mon Sep 17 00:00:00 2001
From: Dante <danloa@.gmail.com>
Date: Fri, 8 May 2015 09:53:25 -0400
Subject: [PATCH 7/9] default dashboard added

---
 .../js/strategicDashboard/viewDashboardPresenter.js    | 10 ++++++++++
 .../src/ProcessMaker/BusinessModel/Dashboard.php       |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
index df5e55d97..77968c892 100644
--- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
+++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
@@ -22,6 +22,7 @@ ViewDashboardPresenter.prototype.userDashboardsViewModel = function(data) {
 	//if null data is returned we default to an empty array
 	if (data == null) { data = []; }
 	var returnList = [];
+	var hasFavorite = false;
 	$.each(data, function(index, originalObject) {
 		var map = {
 			"DAS_TITLE" : "title",
@@ -29,8 +30,17 @@ ViewDashboardPresenter.prototype.userDashboardsViewModel = function(data) {
 			"DAS_FAVORITE" : "isFavorite"
 		};
 		var newObject = that.helper.merge(originalObject, {}, map);
+		if (newObject.isFavorite == 1) {
+			hasFavorite = true;
+		}
 		returnList.push(newObject);
 	});
+
+	//if no favorite is selected, the first one is selected.
+	if (!hasFavorite && returnList.length > 0 ) {
+		returnList[0].isFavorite = 1;
+	}
+
 	return returnList;
 };
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
index 741af63e9..5bb656d86 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
@@ -41,26 +41,27 @@ class Dashboard {
         $resp = array();
         $dashboards = $this->getDashboardsUidByUser($usr_uid);
         $existFavorite = false;
+		$cont = 0;
         foreach($dashboards as $i=>$x) {
             //$resp[$i] = $this->getDashboard($x['DAS_UID']);
             $dashboardUser = $this->getDashboard($x['DAS_UID']);
             if ($dashboardUser['DAS_STATUS'] == 0) {
                 continue;
             }
-            $resp[$i] = $dashboardUser;
+            $resp[$cont] = $dashboardUser;
             $Dashboard = new \ProcessMaker\BusinessModel\Dashboard();
             $dashConfig = $Dashboard->getConfig($usr_uid);
-            $resp[$i]['DAS_FAVORITE'] = 0;
+            $resp[$cont]['DAS_FAVORITE'] = 0;
             foreach ($dashConfig as $dashId=>$dashData) {
                 if($dashId == $x['DAS_UID'] ) {
-                    $resp[$i]['DAS_FAVORITE'] = $dashData['dashFavorite'];
+                    $resp[$cont]['DAS_FAVORITE'] = $dashData['dashFavorite'];
                     if ($dashData['dashFavorite']==1) {
                         $existFavorite = true;
                     }
                 }
             }
+			$cont++;
         }
-
         //if no favorite is set, the default favorite is the first one
         if ($existFavorite == false && $resp != null &&  sizeof($resp)>0) {
             $resp[0]['DAS_FAVORITE'] = 1;

From 6c2c29f5c4087f2b66292175bcc77ebc2d9fe7ee Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina Mena <marcoantonina@gmail.com>
Date: Fri, 8 May 2015 09:54:27 -0400
Subject: [PATCH 8/9] 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 <marcoantonina@gmail.com>
Date: Fri, 8 May 2015 10:47:42 -0400
Subject: [PATCH 9/9] 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