Author: nmalin
Date: Fri Jun 17 12:18:44 2016
New Revision: 1748846
URL: http://svn.apache.org/viewvc?rev=1748846&view=rev
Log:
backport from trunk : correct typo error introduce with the issue OFBIZ-5781
that break birt report. Thanks Rohit Koushal to raise the alert with issue
OFBIZ-7364
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
Fri Jun 17 12:18:44 2016
@@ -524,7 +524,7 @@ var thruDate = params["thruDate"].value;
acctgTransAndEntries = null;
try {
- var conds = new LinkedkList();
+ var conds = new LinkedList();
if (glAccountId) conds.add(EntityCondition.makeCondition("glAccountId",
EntityOperator.EQUALS, glAccountId));
if (acctgTransTypeId)
conds.add(EntityCondition.makeCondition("acctgTransTypeId",
EntityOperator.EQUALS, acctgTransTypeId));
if (glFiscalTypeId)
conds.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
Fri Jun 17 12:18:44 2016
@@ -364,13 +364,13 @@ creditTotal = 0;]]></method>
</list-property>
</structure>
<property name="dataSource">OFBiz</property>
- <method name="open"><![CDATA[acctgTransAndEntries = new
LinkedkList();
+ <method name="open"><![CDATA[acctgTransAndEntries = new
LinkedList();
// get acctg trans entry of invoice
-invoiceAcctgTransAndEntries = new LinkedkList();
+invoiceAcctgTransAndEntries = new LinkedList();
var orderBy = UtilMisc.toList("acctgTransId", "acctgTransEntrySeqId");
try {
- var conds = new LinkedkList();
+ var conds = new LinkedList();
conds.add(EntityCondition.makeCondition("invoiceId",
EntityOperator.EQUALS, invoiceId));
conds.add(EntityCondition.makeCondition("paymentId",
EntityOperator.EQUALS, null));
invoiceAcctgTransAndEntries = delegator.findList("AcctgTransAndEntries",
EntityCondition.makeCondition(conds), null, orderBy, null, false);
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
Fri Jun 17 12:18:44 2016
@@ -50,7 +50,7 @@ if (!logoImageUrl) {
// prepare parties list
partyIds =
org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator,
organizationPartyId, "GROUP_ROLLUP");
-parties = new LinkedkList();
+parties = new LinkedList();
try {
var
parties = delegator.findList("Party",
EntityCondition.makeCondition("partyId", EntityOperator.IN, partyIds), null,
null, null, false);
@@ -69,12 +69,12 @@ GroovyUtil.runScriptAtLocation("componen
partyNameList = context.partyNameList;
// get grand totoal posted
-var condList = new LinkedkList();
+var condList = new LinkedList();
condList.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
condList.add(EntityCondition.makeCondition("customTimePeriodId",
EntityOperator.EQUALS, customTimePeriodId));
var cond = EntityCondition.makeCondition(condList);
var fieldsToSelect = UtilMisc.toSet("totalPostedDebits", "totalPostedCredits");
-grandTotalPosted = new LinkedkList();
+grandTotalPosted = new LinkedList();
try {
grandTotalPosted = delegator.findList("GlAccountAndHistoryTotals", cond,
fieldsToSelect, null, null, false);
} catch (e) {
@@ -214,13 +214,13 @@ grandTotalPostedRecord = grandTotalPoste
</structure>
<property name="dataSource">OFBiz</property>
<method name="open"><![CDATA[// get Gl account history totals
-var condList = new LinkedkList();
+var condList = new LinkedList();
condList.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
condList.add(EntityCondition.makeCondition("customTimePeriodId",
EntityOperator.EQUALS, customTimePeriodId));
var cond = EntityCondition.makeCondition(condList);
var fieldsToSelect = UtilMisc.toSet("glAccountId", "accountCode",
"accountName", "totalPostedDebits", "totalPostedCredits", "totalEndingBalance");
var orderBy = UtilMisc.toList("accountCode");
-glAccountAndHistories = new LinkedkList();
+glAccountAndHistories = new LinkedList();
try {
glAccountAndHistories = delegator.findList("GlAccountAndHistoryTotals",
cond, fieldsToSelect, orderBy, null, false);
} catch (e) {
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
Fri Jun 17 12:18:44 2016
@@ -179,7 +179,7 @@ if(productPromoCodes.size()>0){
amount = orderInfo.get("grandTotal");
totalOrdersAmount = totalOrdersAmount + amount;
//Shipping Total
- cond = new LinkedkList();
+ cond = new LinkedList();
cond.add(EntityCondition.makeCondition("orderId",
EntityOperator.EQUALS, orderId));
cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId",
EntityOperator.EQUALS, "SHIPPING_CHARGES"));
orderAdjustments = delegator.findList("OrderAdjustment",
EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null,
false);
Modified:
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
Fri Jun 17 12:18:44 2016
@@ -216,7 +216,7 @@ module = "Last3MonthsSalesReport.rptdesi
userLogin = null;
try {
userLogin =
delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
- months = new LinkedkList();
+ months = new LinkedList();
thisMonth = 0;
thisMonth = UtilDateTime.getMonth(UtilDateTime.nowTimestamp(),
TimeZone.getDefault(), Locale.getDefault())+1;
thisYear = UtilDateTime.getYear(UtilDateTime.nowTimestamp(),
TimeZone.getDefault(), Locale.getDefault())
@@ -265,7 +265,7 @@ try {
}
month = month - 1
}
- cond = new LinkedkList();
+ cond = new LinkedList();
cond.add(EntityCondition.makeCondition("orderDateMonthOfYear",
EntityOperator.IN, months));
cond.add(EntityCondition.makeCondition("orderDateYearName",
EntityOperator.EQUALS, UtilMisc.toLongObject(thisYear)));
salesOrderItemStarSchemas =
delegator.findList("SalesOrderItemStarSchema",
EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null,
false);
@@ -832,4 +832,4 @@ return true;]]></method>
</list-property>
</extended-item>
</body>
-</report>
+</report>
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign
Fri Jun 17 12:18:44 2016
@@ -142,7 +142,7 @@ try{
var sqlDate = date.toString().substring(0,10);
var thruDate = sqlDate + " " + "00:00:00.000";
//Debug.logInfo("-----------thruDate---------"+thruDate,module);
- var timeOutConds = new LinkedkList();
+ var timeOutConds = new LinkedList();
timeOutConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
timeOutConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
timeOutConds.add(EntityCondition.makeCondition("sprintCurrentStatusId",
EntityOperator.EQUALS, "SPRINT_ACTIVE"));
@@ -157,7 +157,7 @@ try{
inputMap.put("timeOut",timeOutData);
// active sprint
- var activeConds = new LinkedkList();
+ var activeConds = new LinkedList();
activeConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
activeConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
activeConds.add(EntityCondition.makeCondition("sprintCurrentStatusId",
EntityOperator.EQUALS, "SPRINT_ACTIVE"));
@@ -171,7 +171,7 @@ try{
inputMap.put("active",activeData);
// total sprint
- var totalConds = new LinkedkList();
+ var totalConds = new LinkedList();
totalConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
totalConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
var totalList = delegator.findList("ProjectSprint",
EntityCondition.makeCondition(totalConds), null, null, null, false);
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign
Fri Jun 17 12:18:44 2016
@@ -143,7 +143,7 @@ testCompleted = 0;
try{
var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct",
UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"),
null, false);
// for implementation task
- var unplannedImpleConds = new LinkedkList();
+ var unplannedImpleConds = new LinkedList();
unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedImpleConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedImpleConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -151,7 +151,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedImpleConds = new LinkedkList();
+ var plannedImpleConds = new LinkedList();
plannedImpleConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedImpleConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedImpleConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -171,7 +171,7 @@ try{
implementationData = 0;
}
- var unplannedImpleConds2 = new LinkedkList();
+ var unplannedImpleConds2 = new LinkedList();
unplannedImpleConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedImpleConds2.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedImpleConds2.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -180,7 +180,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedImpleConds2 = new LinkedkList();
+ var plannedImpleConds2 = new LinkedList();
plannedImpleConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedImpleConds2.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedImpleConds2.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -202,7 +202,7 @@ try{
}
// for error task
- var unplannedErrorConds = new LinkedkList();
+ var unplannedErrorConds = new LinkedList();
unplannedErrorConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedErrorConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedErrorConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -210,7 +210,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedErrorConds = new LinkedkList();
+ var plannedErrorConds = new LinkedList();
plannedErrorConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedErrorConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedErrorConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -228,7 +228,7 @@ try{
} else {
errorData = 0;
}
- var unplannedErrorConds2 = new LinkedkList();
+ var unplannedErrorConds2 = new LinkedList();
unplannedErrorConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedErrorConds2.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedErrorConds2.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -237,7 +237,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedErrorConds2 = new LinkedkList();
+ var plannedErrorConds2 = new LinkedList();
plannedErrorConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedErrorConds2.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedErrorConds2.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -258,7 +258,7 @@ try{
}
// for installation task
- var unplannedInstallConds = new LinkedkList();
+ var unplannedInstallConds = new LinkedList();
unplannedInstallConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedInstallConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedInstallConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -266,7 +266,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedInstallConds = new LinkedkList();
+ var plannedInstallConds = new LinkedList();
plannedInstallConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedInstallConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedInstallConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -284,7 +284,7 @@ try{
} else {
installData = 0;
}
- var unplannedInstallConds2 = new LinkedkList();
+ var unplannedInstallConds2 = new LinkedList();
unplannedInstallConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedInstallConds2.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedInstallConds2.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -293,7 +293,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedInstallConds2 = new LinkedkList();
+ var plannedInstallConds2 = new LinkedList();
plannedInstallConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedInstallConds2.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedInstallConds2.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -314,7 +314,7 @@ try{
}
// for test task
- var unplannedTestConds = new LinkedkList();
+ var unplannedTestConds = new LinkedList();
unplannedTestConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedTestConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedTestConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
@@ -322,7 +322,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedTestConds = new LinkedkList();
+ var plannedTestConds = new LinkedList();
plannedTestConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedTestConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedTestConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
@@ -340,7 +340,7 @@ try{
} else {
testData = 0;
}
- var unplannedTestConds2 = new LinkedkList();
+ var unplannedTestConds2 = new LinkedList();
unplannedTestConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedTestConds2.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedTestConds2.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
@@ -349,7 +349,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedTestConds2 = new LinkedkList();
+ var plannedTestConds2 = new LinkedList();
plannedTestConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedTestConds2.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedTestConds2.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
Modified:
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign?rev=1748846&r1=1748845&r2=1748846&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
(original)
+++
ofbiz/branches/release15.12/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign
Fri Jun 17 12:18:44 2016
@@ -104,7 +104,7 @@ testData = 0;
try{
var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct",
UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"),
null, false);
// for implementation task
- var unplannedImpleConds = new LinkedkList();
+ var unplannedImpleConds = new LinkedList();
unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedImpleConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedImpleConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -112,7 +112,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedImpleConds = new LinkedkList();
+ var plannedImpleConds = new LinkedList();
plannedImpleConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedImpleConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedImpleConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_IMPL"));
@@ -133,7 +133,7 @@ try{
}
// for error task
- var unplannedErrorConds = new LinkedkList();
+ var unplannedErrorConds = new LinkedList();
unplannedErrorConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedErrorConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedErrorConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -141,7 +141,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedErrorConds = new LinkedkList();
+ var plannedErrorConds = new LinkedList();
plannedErrorConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedErrorConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedErrorConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_ERROR"));
@@ -163,7 +163,7 @@ try{
}
// for installation task
- var unplannedInstallConds = new LinkedkList();
+ var unplannedInstallConds = new LinkedList();
unplannedInstallConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedInstallConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedInstallConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -171,7 +171,7 @@ try{
if (workEffortErrorList !=null) {
for(i = 0; i < workEffortErrorList.size(); i++){
var projectId =
workEffortErrorList.get(i).getString("workEffortId");
- var plannedInstallConds = new LinkedkList();
+ var plannedInstallConds = new LinkedList();
plannedInstallConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedInstallConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedInstallConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_INST"));
@@ -191,7 +191,7 @@ try{
}
// for test task
- var unplannedTestConds = new LinkedkList();
+ var unplannedTestConds = new LinkedList();
unplannedTestConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS,
productId));
unplannedTestConds.add(EntityCondition.makeCondition("custRequestTypeId",
EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG"));
unplannedTestConds.add(EntityCondition.makeCondition("workEffortTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
@@ -199,7 +199,7 @@ try{
if (workEffortErrorList !=null) {
for(j = 0; j < workEffortErrorList.size(); j++){
var projectId =
workEffortErrorList.get(j).getString("workEffortId");
- var plannedTestConds = new LinkedkList();
+ var plannedTestConds = new LinkedList();
plannedTestConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS,
projectId));
plannedTestConds.add(EntityCondition.makeCondition("sprintTypeId",
EntityOperator.EQUALS, "SCRUM_SPRINT"));
plannedTestConds.add(EntityCondition.makeCondition("taskTypeId",
EntityOperator.EQUALS, "SCRUM_TASK_TEST"));
