You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/09/09 15:26:59 UTC
svn commit: r1702002 -
/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/
Author: jleroux
Date: Wed Sep 9 13:26:58 2015
New Revision: 1702002
URL: http://svn.apache.org/r1702002
Log:
A slightly modified patch from Pierre Smits for "Scrum productstatistics shows errors" https://issues.apache.org/jira/browse/OFBIZ-4863
Those were only rptdesign issues
jleroux: I put back the removed license headers
Modified:
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -20,9 +20,11 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.java.math);
+ <method name="initialize"><![CDATA[
+
+importPackage(Packages.java.math);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util)
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "BacklogChart.rptdesign";
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -22,7 +22,7 @@ under the License.
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.java.math);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "BacklogByTypeChart.rptdesign";
@@ -1060,9 +1060,9 @@ return true;]]></method>
]]></xml-property>
<property name="outputFormat">SVG</property>
<property name="inheritColumns">false</property>
- <property name="dataSet">Data Set</property>
<property name="height">3in</property>
<property name="width">6in</property>
+ <property name="dataSet">Data Set</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">DataName</property>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Wed Sep 9 13:26:58 2015
@@ -20,10 +20,12 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.1.v20100902 Build <2.6.1.v20100915-1750></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.java.math);
-importPackage(Packages.java.text);
+ <method name="initialize"><![CDATA[
+importPackage(Packages.java.math);
importPackage(Packages.java.sql);
-
+importPackage(Packages.java.text);
+importPackage(Packages.java.util);
+importPackage(Packages.javolution.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
@@ -45,7 +47,7 @@ var countHoliday = 0;
while (countHoliday < dayNumber) {
var conditionTimestampFrom = new Timestamp(actualStartDate.getTime() + (countHoliday*1000*60*60*24));
// get public holiday
- var holidayConds = new LinkedkList();
+ var holidayConds = FastList.newInstance();
holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY"));
holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom));
var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
@@ -234,7 +236,7 @@ remainActualHours = BigDecimal.ZERO;
averageHours = previousAverageHours;
-holidays = new LinkedkList();
+holidays = FastList.newInstance();
reportContext.getAppContext().put("holidays", holidays);
]]></method>
<method name="fetch"><![CDATA[if (dayCount >= dayNumber || currentDay >= 0) return false;
@@ -251,7 +253,7 @@ if (nowTimestamp.getTime() >= conditionT
}
// get public holiday
-var holidayConds = new LinkedkList();
+var holidayConds = FastList.newInstance();
holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY"));
holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom));
var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate");
@@ -279,7 +281,7 @@ for (i=0; i<backlogItems.size(); i++) {
// get all task from backlog item
var backlogItem = backlogItems.get(i);
var custRequestId = backlogItem.get("custRequestId");
- var conds = new LinkedkList();
+ var conds = FastList.newInstance();
conds.add(EntityCondition.makeCondition("custRequestId", custRequestId));
conds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.NOT_EQUAL, "SCRUM_SPRINT"));
var tasks = delegator.findList("CustRequestAndWorkEffort", EntityCondition.makeCondition(conds), null, null, null, false);
@@ -301,7 +303,7 @@ for (i=0; i<backlogItems.size(); i++) {
}
}
// get all time entries from task
- var timeEntryConds = new LinkedkList();
+ var timeEntryConds = FastList.newInstance();
timeEntryConds.add(EntityCondition.makeCondition("workEffortId", workEffortId));
timeEntryConds.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, conditionTimestampFrom));
timeEntryConds.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, conditionTimestampTo));
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -23,11 +23,14 @@ under the License.
<method name="initialize"><![CDATA[importPackage(Packages.java.math);
importPackage(Packages.java.sql);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util);
+importPackage(Packages.javolution.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "ProjectAndSprintChart.rptdesign";
+totalRow = 0;
+countOfRow = 0;
productId = params["productId"].value;
]]></method>
<property name="iconFile">/templates/blank_report.gif</property>
@@ -124,7 +127,9 @@ productId = params["productId"].value;
</list-property>
</structure>
<property name="dataSource">Data Source</property>
- <method name="open"><![CDATA[resultList = new LinkedkList();
+ <method name="open"><![CDATA[
+
+ resultList = FastList.newInstance();
var projectList = null;
try{
var projectList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT"), null, false);
@@ -2125,9 +2130,9 @@ return true;]]></method>
]]></xml-property>
<property name="outputFormat">SVG</property>
<property name="inheritColumns">false</property>
- <property name="dataSet">Data Set</property>
<property name="height">3in</property>
<property name="width">7.5in</property>
+ <property name="dataSet">Data Set</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">TimeOut</property>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -22,7 +22,7 @@ under the License.
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.java.math);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "BacklogByTypeChart.rptdesign";
@@ -1060,9 +1060,9 @@ return true;]]></method>
]]></xml-property>
<property name="outputFormat">SVG</property>
<property name="inheritColumns">false</property>
- <property name="dataSet">Data Set</property>
<property name="height">3in</property>
<property name="width">6in</property>
+ <property name="dataSet">Data Set</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">DataName</property>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -22,7 +22,7 @@ under the License.
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.java.math);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "TaskByStatusChart.rptdesign";
@@ -2056,9 +2056,9 @@ return true;]]></method>
]]></xml-property>
<property name="outputFormat">SVG</property>
<property name="inheritColumns">true</property>
- <property name="dataSet">Data Set</property>
<property name="height">3in</property>
<property name="width">7.5in</property>
+ <property name="dataSet">Data Set</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">Completed</property>
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign?rev=1702002&r1=1702001&r2=1702002&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign Wed Sep 9 13:26:58 2015
@@ -22,7 +22,7 @@ under the License.
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.java.math);
importPackage(Packages.java.text);
-
+importPackage(Packages.java.util);
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.condition);
module = "TasksChart.rptdesign";
@@ -1152,10 +1152,10 @@ return true;]]></method>
]]></xml-property>
<property name="outputFormat">SVG</property>
<property name="inheritColumns">false</property>
- <structure name="toc"/>
- <property name="dataSet">Data Set</property>
<property name="height">3in</property>
<property name="width">6in</property>
+ <structure name="toc"/>
+ <property name="dataSet">Data Set</property>
<list-property name="boundDataColumns">
<structure>
<property name="name">TaskName</property>