OFBiz › OFBiz - Commits

svn commit: r1702003 - in /ofbiz/branches/release14.12: ./ specialpurpose/scrum/webapp/scrum/reports/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1702003 - in /ofbiz/branches/release14.12: ./ specialpurpose/scrum/webapp/scrum/reports/

jleroux@apache.org
Author: jleroux
Date: Wed Sep  9 13:31:01 2015
New Revision: 1702003

URL: http://svn.apache.org/r1702003
Log:
"Applied fix from trunk for revision: 1702002  "
------------------------------------------------------------------------
r1702002 | jleroux | 2015-09-09 15:26:58 +0200 (mer. 09 sept. 2015) | 7 lignes

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/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
    ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep  9 13:31:01 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002

Modified: ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign Wed Sep  9 13:31:01 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 &lt;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.javolution.util);
+importPackage(Packages.java.util)
 importPackage(Packages.org.ofbiz.base.util);
 importPackage(Packages.org.ofbiz.entity.condition);
 module = "BacklogChart.rptdesign";

Modified: ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign Wed Sep  9 13:31:01 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.javolution.util);
+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/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Wed Sep  9 13:31:01 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 &lt;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);

Modified: ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign Wed Sep  9 13:31:01 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 = FastList.newInstance();
+            <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/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign Wed Sep  9 13:31:01 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.javolution.util);
+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/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign Wed Sep  9 13:31:01 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.javolution.util);
+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/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign?rev=1702003&r1=1702002&r2=1702003&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign (original)
+++ ofbiz/branches/release14.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign Wed Sep  9 13:31:01 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.javolution.util);
+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>


Free forum by Nabble Edit this page