svn commit: r1338423 - in /ofbiz/trunk/specialpurpose/sc
Locked
 
|
Author: doogie
Date: Mon May 14 21:03:38 2012 New Revision: 1338423 URL: http://svn.apache.org/viewvc?rev=1338423&view=rev Log: DEPRECATION: specialpurpose/scrum: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter. Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.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 ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java (original) +++ ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java Mon May 14 21:03:38 2012 @@ -71,7 +71,7 @@ public class ScrumEvents { EntityConditionList<EntityCondition> exprAnds = EntityCondition.makeCondition(UtilMisc.toList(exprOrs, EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)), EntityOperator.AND); List<GenericValue> partyRoleList = delegator.findList("PartyRole", exprAnds, null, null, null, false); if (UtilValidate.isNotEmpty(partyRoleList)) { - List<GenericValue> timesheetList = delegator.findByAndCache("Timesheet", UtilMisc.toMap("partyId", partyId, "statusId", "TIMESHEET_IN_PROCESS")); + List<GenericValue> timesheetList = delegator.findByAnd("Timesheet", UtilMisc.toMap("partyId", partyId, "statusId", "TIMESHEET_IN_PROCESS"), null, true); if (UtilValidate.isNotEmpty(timesheetList)) { for (GenericValue timesheetMap : timesheetList) { String timesheetId = timesheetMap.getString("timesheetId"); @@ -85,7 +85,7 @@ public class ScrumEvents { //check time entry List<GenericValue> timeEntryList = timesheetMap.getRelatedByAnd("TimeEntry", UtilMisc.toMap("partyId", partyId, "timesheetId",timesheetId, "fromDate",realTimeDate)); //check EmplLeave - List<GenericValue> emplLeaveList = delegator.findByAndCache("EmplLeave", UtilMisc.toMap("partyId", partyId, "fromDate", realTimeDate)); + List<GenericValue> emplLeaveList = delegator.findByAnd("EmplLeave", UtilMisc.toMap("partyId", partyId, "fromDate", realTimeDate), null, true); if (UtilValidate.isEmpty(timeEntryList) && UtilValidate.isEmpty(emplLeaveList)) { Map<String, Object> noEntryMap = FastMap.newInstance(); noEntryMap.put("timesheetId", timesheetId); Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original) +++ ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Mon May 14 21:03:38 2012 @@ -86,7 +86,7 @@ public class ScrumServices { communicationEventProduct.create(); } try { - List<GenericValue> productRoleList = delegator.findByAnd("ProductRole", UtilMisc.toMap("productId",productId, "partyId", communicationEvent.getString("partyIdFrom"), "roleTypeId","PRODUCT_OWNER")); + List<GenericValue> productRoleList = delegator.findByAnd("ProductRole", UtilMisc.toMap("productId",productId, "partyId", communicationEvent.getString("partyIdFrom"), "roleTypeId","PRODUCT_OWNER"), null, false); GenericValue productRoleMap = EntityUtil.getFirst(productRoleList); GenericValue userLogin = (GenericValue) context.get("userLogin"); // also close the incoming communication event @@ -213,7 +213,7 @@ public class ScrumServices { Debug.logInfo("Revision Link ============== >>>>>>>>>>> "+ revisionLink, module); if (UtilValidate.isNotEmpty(taskId)) { String version = "R" + i; - List <GenericValue> workeffContentList = delegator.findByAnd("WorkEffortAndContentDataResource", UtilMisc.toMap("contentName",version.trim() ,"drObjectInfo", revisionLink.trim())); + List <GenericValue> workeffContentList = delegator.findByAnd("WorkEffortAndContentDataResource", UtilMisc.toMap("contentName",version.trim() ,"drObjectInfo", revisionLink.trim()), null, false); List<EntityCondition> exprsAnd = FastList.newInstance(); exprsAnd.add(EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, taskId)); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddProductBacklogItem.groovy Mon May 14 21:03:38 2012 @@ -54,7 +54,7 @@ custRequestAndItems.each() { custRequest tempCustRequestAndItem.custSequenceNum = countSequence; tempCustRequestAndItem.realSequenceNum = custRequestAndItem.custSequenceNum; // if custRequest has task then get Actual Hours - custWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : custRequestAndItem.custRequestId]); + custWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : custRequestAndItem.custRequestId], null, false); if (custWorkEffortList) { actualHours = 0.00; custWorkEffortList.each() { custWorkEffortMap -> @@ -113,7 +113,7 @@ unplannedList.each() { unplannedItem -> tempUnplanned.custSequenceNum = countSequenceUnplanned; tempUnplanned.realSequenceNum = unplannedItem.custSequenceNum; // if custRequest has task then get Actual Hours - unplanCustWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : unplannedItem.custRequestId]); + unplanCustWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : unplannedItem.custRequestId], null, false); if (unplanCustWorkEffortList) { actualHours = 0.00; unplanCustWorkEffortList.each() { custWorkEffortMap -> Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/AddResourceTaskParty.groovy Mon May 14 21:03:38 2012 @@ -23,21 +23,21 @@ import org.ofbiz.base.util.Debug; partyId = parameters.partyId // get existing task that no assign projectSprintBacklogAndTaskList = []; -projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["taskId DESC"]); +projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["taskId DESC"], false); projectAndTaskList.each { projectAndTaskMap -> userLoginId = userLogin.partyId; projectId = projectAndTaskMap.projectId; - partyAssignmentProjectList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : projectId, "partyId" : partyId]); + partyAssignmentProjectList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : projectId, "partyId" : partyId], null, false); partyAssignmentProjectMap = partyAssignmentProjectList[0]; // if this userLoginId is a member of project if (partyAssignmentProjectMap) { sprintId = projectAndTaskMap.sprintId; - partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : partyId]); + partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : partyId], null, false); partyAssignmentSprintMap = partyAssignmentSprintList[0]; // if this userLoginId is a member of sprint if (partyAssignmentSprintMap) { workEffortId = projectAndTaskMap.taskId; - partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId]); + partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId], null, false); partyAssignmentTaskMap = partyAssignmentTaskList[0]; // if the task do not assigned if (!partyAssignmentTaskMap) { Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy Mon May 14 21:03:38 2012 @@ -67,7 +67,7 @@ context.weekNumber = UtilDateTime.weekNu // get the user names context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false); // get the default rate for this person -rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"])); +rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"], null, false)); if (rateTypes) { context.defaultRateTypeId = rateTypes[0].rateTypeId; } @@ -108,7 +108,7 @@ void retrieveWorkEffortData() { //entry.plannedHours = pHours; planHours = 0.0; planHours = lastTimeEntry.planHours; - lastTimeEntryOfTasks = delegator.findByAnd("TimeEntry", ["workEffortId" : lastTimeEntry.workEffortId, "partyId" : partyId], ["-fromDate"]); + lastTimeEntryOfTasks = delegator.findByAnd("TimeEntry", ["workEffortId" : lastTimeEntry.workEffortId, "partyId" : partyId], ["-fromDate"], false); if (lastTimeEntryOfTasks.size() != 0) lastTimeEntry = lastTimeEntryOfTasks[0]; if (planHours < 1) { planHours = estimatedHour; @@ -350,7 +350,7 @@ if (timeEntry || emplLeaveEntry) { } context.timeEntries = entries; // get all timesheets of this user, including the planned hours -timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"]); +timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"], false); timesheets = new LinkedList(); timesheetsDb.each { timesheetDb -> //get hours from EmplLeave; @@ -396,19 +396,19 @@ context.timesheets = timesheets; taskList=[]; projectSprintBacklogAndTaskList = []; backlogIndexList = []; -projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["projectName ASC","taskActualStartDate DESC"]); +projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["projectName ASC","taskActualStartDate DESC"], false); projectAndTaskList.each { projectAndTaskMap -> userLoginId = userLogin.partyId; sprintId = projectAndTaskMap.sprintId; - workEffortList = delegator.findByAnd("WorkEffortAndProduct", ["workEffortId" : projectAndTaskMap.projectId]); + workEffortList = delegator.findByAnd("WorkEffortAndProduct", ["workEffortId" : projectAndTaskMap.projectId], null, false); backlogIndexList.add(workEffortList[0].productId); - partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLoginId]); + partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLoginId], null, false); partyAssignmentSprintMap = partyAssignmentSprintList[0]; // if this userLoginId is a member of sprint if (partyAssignmentSprintMap) { workEffortId = projectAndTaskMap.taskId; - partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId]); + partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId], null, false); partyAssignmentTaskMap = partyAssignmentTaskList[0]; // if the task do not assigned if (partyAssignmentTaskMap) { @@ -427,7 +427,7 @@ userLoginId = userLogin.partyId; unplanList=[]; if (backlogIndexList) { backlogIndex = new HashSet(backlogIndexList); - custRequestList = delegator.findByAnd("CustRequest", ["custRequestTypeId" : "RF_UNPLAN_BACKLOG","statusId" : "CRQ_REVIEWED"],["custRequestDate DESC"]); + custRequestList = delegator.findByAnd("CustRequest", ["custRequestTypeId" : "RF_UNPLAN_BACKLOG","statusId" : "CRQ_REVIEWED"],["custRequestDate DESC"], false); if (custRequestList) { custRequestList.each { custRequestMap -> custRequestItemList = custRequestMap.getRelated("CustRequestItem"); @@ -437,9 +437,9 @@ if (backlogIndexList) { backlogIndex.each { backlogProduct -> productId = backlogProduct if (productId.equals(productOut)) { - custRequestWorkEffortList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : custRequestItemList[0].custRequestId]); + custRequestWorkEffortList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : custRequestItemList[0].custRequestId], null, false); custRequestWorkEffortList.each { custRequestWorkEffortMap -> - partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : custRequestWorkEffortMap.workEffortId]); + partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : custRequestWorkEffortMap.workEffortId], null, false); partyAssignmentTaskMap = partyAssignmentTaskList[0]; // if the task do not assigned if (!partyAssignmentTaskMap) { Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy Mon May 14 21:03:38 2012 @@ -66,7 +66,7 @@ context.weekNumber = UtilDateTime.weekNu // get the user names context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false); // get the default rate for this person -rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"])); +rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"], null, false)); if (rateTypes) { context.defaultRateTypeId = rateTypes[0].rateTypeId; } @@ -189,7 +189,7 @@ if (timeEntry) { } context.timeEntries = entries; // get all timesheets of this user, including the planned hours -timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"]); +timesheetsDb = delegator.findByAnd("Timesheet", ["partyId" : partyId], ["fromDate DESC"], false); timesheets = new LinkedList(); timesheetsDb.each { timesheetDb -> timesheet = [:]; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy Mon May 14 21:03:38 2012 @@ -32,7 +32,7 @@ import java.sql.Timestamp; productId =parameters.productId; custRequestList=[]; backlogList=[]; -custRequestList = delegator.findByAnd("CustRequestItem", ["productId" : productId]); +custRequestList = delegator.findByAnd("CustRequestItem", ["productId" : productId], null, false); custRequestList.each { custRequestListMap -> custRequestId=custRequestListMap.custRequestId; exprBldr = FastList.newInstance(); @@ -46,7 +46,7 @@ custRequestList.each { custRequestListMa productBacklogList = delegator.findList("CustRequest", custRequestTypeCond, null,orderBy ,null, false); productBacklogList.each { productBacklogMap -> productBackId = productBacklogMap.custRequestId; - taskBacklogList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : productBackId]); + taskBacklogList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : productBackId], null, false); int countImplTask=0, countImplTaskComplete=0, countInstallTask=0, countInstallTaskComplete=0, countErrTask=0, countErrTaskComplete=0, countTestTask=0; taskBacklogList.each { taskBacklogMap -> taskId = taskBacklogMap.workEffortId; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy Mon May 14 21:03:38 2012 @@ -105,7 +105,7 @@ if ((parameters.billed != null)||(parame tempBacklog.custSequenceNum = countSequenceBacklog; tempBacklog.realSequenceNum = backlogItem.custSequenceNum; // if custRequest has task then get Actual Hours - backlogCustWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : backlogItem.custRequestId]); + backlogCustWorkEffortList = delegator.findByAnd("CustRequestWorkEffort",["custRequestId" : backlogItem.custRequestId], null, false); if (backlogCustWorkEffortList) { actualHours = 0.00; backlogCustWorkEffortList.each() { custWorkEffortMap -> Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy Mon May 14 21:03:38 2012 @@ -170,7 +170,7 @@ if ((taskId != null)||(taskName != null) resultList = []; assignedList.each { assignedMap -> workEffortId = assignedMap.taskId; - assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId, "partyId" : partyId]); + assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId, "partyId" : partyId], null, false); if (assignToList) { assignedMap.partyId = assignToList[0].partyId; resultList.add(assignedMap); @@ -181,7 +181,7 @@ if ((taskId != null)||(taskName != null) resultList = []; assignedList.each { assignedMap -> workEffortId = assignedMap.taskId; - assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId]); + assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId], null, false); if (assignToList) { assignedMap.partyId = assignToList[0].partyId; resultList.add(assignedMap); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy Mon May 14 21:03:38 2012 @@ -83,7 +83,7 @@ if (userLogin) { if (partyAndSecurityGroupList) { groupId = partyAndSecurityGroupList[0].groupId; if ("SCRUM_PRODUCT_OWNER".equals(groupId)) { - productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : product.productId, "partyId" : userLogin.partyId, "thruDate" : null]); + productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : product.productId, "partyId" : userLogin.partyId, "thruDate" : null], null, false); if (productAndRoleList) { productAndRoleList.each { productAndRoleMap -> productIdInner = productAndRoleMap.productId; @@ -101,7 +101,7 @@ if (userLogin) { EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null) ], EntityJoinOperator.AND); scrumRolesPersonAndCompanyList = delegator.findList("ScrumRolesPersonAndCompany", scrumRolesCond, null, null, null, false); - productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null]); + productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null], null, false); if (productRoleList) { productRoleList.each { productRoleMap -> stakeholderProduct = productRoleMap.productId; @@ -113,7 +113,7 @@ if (userLogin) { //check in product. if (ismember == false) { productAndRoleList = delegator.findByAnd("ProductAndRole", ["productId" : product.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productAndRoleList) { ismember = true; } @@ -122,17 +122,17 @@ if (userLogin) { //check in product. productRoleList = []; productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : product.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productRoleList) { ismember = true; } //check in project. if (ismember == false) { projects = []; - projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"]); + projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"], null, false); if (projects) { projects.each { project -> - projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : project.workEffortId]); + projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : project.workEffortId], null, false); if (projectPartyAssignment) { ismember = true; } @@ -143,10 +143,10 @@ if (userLogin) { if (ismember == false) { projects.each { project -> allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId]) + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId], null, false) if (workEffortPartyAssignment) { ismember = true; } @@ -155,14 +155,14 @@ if (userLogin) { } } else { projects = []; - projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"]); + projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"], null, false); if (projects) { projects.each { project -> allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId]) + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId], null, false) if (workEffortPartyAssignment) { ismember = true; } @@ -180,7 +180,7 @@ if (userLogin) { if (unplannedBacklogList) { unplannedBacklogList.each { unplannedMap -> workEffortId = unplannedMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : workEffortId]) + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : workEffortId], null, false) if (workEffortPartyAssignment) { ismember = true; } Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy Mon May 14 21:03:38 2012 @@ -39,7 +39,7 @@ countSprint = 0; sprints = []; allSprints.each { sprint -> newProjectId = sprint.projectId; - productAndRole = delegator.findByAnd("ProductAndRole", ["roleTypeId" : "PRODUCT_OWNER_COMP", "productId" : sprint.productId], null); + productAndRole = delegator.findByAnd("ProductAndRole", ["roleTypeId" : "PRODUCT_OWNER_COMP", "productId" : sprint.productId], null, false); companyId = ""; companyName = ""; if (productAndRole.size() > 0) { @@ -61,7 +61,7 @@ allSprints.each { sprint -> if (partyAndSecurityGroupList) { groupId = partyAndSecurityGroupList[0].groupId; if ("SCRUM_PRODUCT_OWNER".equals(groupId)) { - productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : sprint.productId, "partyId" : partyAndSecurityGroupList.getAt(0).partyId, "thruDate" : null]); + productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : sprint.productId, "partyId" : partyAndSecurityGroupList.getAt(0).partyId, "thruDate" : null], null, false); if (productAndRoleList) { ismember = true; } @@ -74,7 +74,7 @@ allSprints.each { sprint -> EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null) ], EntityJoinOperator.AND); scrumRolesPersonAndCompanyList = delegator.findList("ScrumRolesPersonAndCompany", scrumRolesCond, null, null, null, false); - productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null]); + productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null], null, false); if (productRoleList) { productRoleList.each { productRoleMap -> stakeholderProduct = productRoleMap.productId; @@ -86,7 +86,7 @@ allSprints.each { sprint -> //check in product. if (ismember == false) { productAndRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productAndRoleList) { ismember = true; } @@ -95,13 +95,13 @@ allSprints.each { sprint -> //check in product productRoleList = []; productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productRoleList) { ismember = true; } //check in project. if (ismember == false) { - projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId]); + projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId], null, false); if (projectPartyAssignment) { ismember = true; } @@ -109,10 +109,10 @@ allSprints.each { sprint -> //check in sprint. if (ismember == false) { allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId]); + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false); if (workEffortPartyAssignment) { ismember = true; } @@ -120,10 +120,10 @@ allSprints.each { sprint -> } } else { allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId]); + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false); if (workEffortPartyAssignment) { ismember = true; } @@ -143,7 +143,7 @@ allSprints.each { sprint -> if (partyAndSecurityGroupList) { groupId = partyAndSecurityGroupList[0].groupId; if ("SCRUM_PRODUCT_OWNER".equals(groupId)) { - productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : sprint.productId, "partyId" : partyAndSecurityGroupList.getAt(0).partyId, "thruDate" : null]); + productAndRoleList = delegator.findByAnd("ProductRole", ["productId" : sprint.productId, "partyId" : partyAndSecurityGroupList.getAt(0).partyId, "thruDate" : null], null, false); if (productAndRoleList) { ismember = true; } @@ -156,7 +156,7 @@ allSprints.each { sprint -> EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null) ], EntityJoinOperator.AND); scrumRolesPersonAndCompanyList = delegator.findList("ScrumRolesPersonAndCompany", scrumRolesCond, null, null, null, false); - productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null]); + productRoleList = delegator.findByAnd("ProductRole", ["partyId" : scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId" : "PRODUCT_OWNER_COMP", "thruDate" : null], null, false); if (productRoleList) { productRoleList.each { productRoleMap -> stakeholderProduct = productRoleMap.productId; @@ -168,7 +168,7 @@ allSprints.each { sprint -> //check in product. if (ismember == false) { productAndRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productAndRoleList) { ismember = true; } @@ -177,13 +177,13 @@ allSprints.each { sprint -> //check in product productRoleList = []; productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId - , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null]); + , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false); if (productRoleList) { ismember = true; } //check in project. if (ismember == false) { - projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId]); + projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId], null, false); if (projectPartyAssignment) { ismember = true; } @@ -191,10 +191,10 @@ allSprints.each { sprint -> //check in sprint. if (ismember == false) { allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId]); + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false); if (workEffortPartyAssignment) { ismember = true; } @@ -202,10 +202,10 @@ allSprints.each { sprint -> } } else { allSprintList = []; - allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId]); + allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false); allSprintList.each { SprintListMap -> sprintId = SprintListMap.workEffortId; - workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId]); + workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false); if (workEffortPartyAssignment) { ismember = true; } Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy Mon May 14 21:03:38 2012 @@ -75,10 +75,10 @@ if ((parameters.productId != null)||(par inputMap.contentName = revisionMap.contentName; inputMap.description = revisionMap.description; inputMap.drObjectInfo = revisionMap.drObjectInfo; - custAndWorkEfffList = delegator.findByAnd("CustRequestAndWorkEffort", ["workEffortId" : revisionMap.workEffortId]); + custAndWorkEfffList = delegator.findByAnd("CustRequestAndWorkEffort", ["workEffortId" : revisionMap.workEffortId], null, false); if (custAndWorkEfffList) { custAndWorkEfffMap = custAndWorkEfffList[0]; - custAndCustItemList = delegator.findByAnd("CustRequestAndCustRequestItem", ["custRequestId" : custAndWorkEfffMap.custRequestId]); + custAndCustItemList = delegator.findByAnd("CustRequestAndCustRequestItem", ["custRequestId" : custAndWorkEfffMap.custRequestId], null, false); if (custAndCustItemList) { custAndCustItemMap = custAndCustItemList[0]; inputMap.productId = custAndCustItemMap.productId; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy Mon May 14 21:03:38 2012 @@ -80,7 +80,7 @@ if (scrumUserLoginSecurityGroupList) { context.userPreferenceList = userPreferenceOutList; } else { if (security.hasEntityPermission("SCRUM", "_ADMIN", session)) { - userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"]); + userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"], false); context.userPreferenceList = userPreferenceList; } } Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy Mon May 14 21:03:38 2012 @@ -25,7 +25,7 @@ productId = parameters.productId personAndCompanyList = []; if (productId) { - productRoleList = delegator.findByAnd("ProductRole", ["productId" : productId, "roleTypeId" : "PRODUCT_OWNER_COMP"]); + productRoleList = delegator.findByAnd("ProductRole", ["productId" : productId, "roleTypeId" : "PRODUCT_OWNER_COMP"], null, false); if (productRoleList) { personAndComCond = EntityCondition.makeCondition([ EntityCondition.makeCondition ("roleTypeId", EntityOperator.EQUALS, "PRODUCT_OWNER"), Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy Mon May 14 21:03:38 2012 @@ -38,12 +38,12 @@ try{ communicationEvent.communicationEventTypeId = "EMAIL_COMMUNICATION"; communicationEvent.contactMechTypeId = "EMAIL_ADDRESS"; communicationEvent.datetimeStarted = now; - checkOwner = delegator.findByAnd("ProductRole",["productId" : productId,"partyId" : loginPartyId,"roleTypeId" : "PRODUCT_OWNER"]); + checkOwner = delegator.findByAnd("ProductRole",["productId" : productId,"partyId" : loginPartyId,"roleTypeId" : "PRODUCT_OWNER"], null, false); if (checkOwner) { /* for product owner to our company */ // for owner - productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"]); + productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"], null, false); context.productOwnerId = productRole[0].partyId parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false); if (parentCom) { @@ -78,7 +78,7 @@ try{ communicationEvent.contactMechIdFrom = resultsIdFrom.contactMechId; } // for owner - productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"]); + productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"], null, false); context.productOwnerId = productRole[0].partyId; parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false); if(parentCom){ Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy Mon May 14 21:03:38 2012 @@ -22,13 +22,13 @@ import org.ofbiz.base.util.Debug; try{ // for sprint dropdown workEffortList = []; - sprintList = delegator.findByAnd("WorkEffort",["workEffortTypeId" : "SCRUM_SPRINT","currentStatusId" : "SPRINT_ACTIVE"]); + sprintList = delegator.findByAnd("WorkEffort",["workEffortTypeId" : "SCRUM_SPRINT","currentStatusId" : "SPRINT_ACTIVE"], null, false); if (sprintList) { sprintList.each{ sprintMap -> workEffortMap = [:]; workEffortParentId = sprintMap.workEffortParentId; if (workEffortParentId) { - projectList = delegator.findByAnd("WorkEffortAndProduct",["workEffortId" : workEffortParentId]); + projectList = delegator.findByAnd("WorkEffortAndProduct",["workEffortId" : workEffortParentId], null, false); projectMap = projectList[0]; // make sure that project dose not closed if (projectMap.currentStatusId != "SPJ_CLOSED") { @@ -59,9 +59,9 @@ try{ } categoryList = []; if (productId) { - sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG","productId" : productId]); + sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG","productId" : productId], null, false); } else { - sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG"]); + sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG"], null, false); } if (sprintList) { sprintList.each{ categoryMap -> Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy Mon May 14 21:03:38 2012 @@ -79,7 +79,7 @@ if (parameters.sprintId) { reviewedBacklog = 0; totalbacklog = 0; allTask = []; - sprintList = delegator.findByAnd("CustRequestWorkEffort", ["workEffortId" : parameters.sprintId]); + sprintList = delegator.findByAnd("CustRequestWorkEffort", ["workEffortId" : parameters.sprintId], null, false); sprintList.each { sprintMap -> custMap = sprintMap.getRelatedOne("CustRequest"); //if ("RF_PROD_BACKLOG".equals(custMap.custRequestTypeId)) { Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy Mon May 14 21:03:38 2012 @@ -38,11 +38,11 @@ taskListDropdown = []; //${projectId} - ${projectName} - ${sprintName} - ${groovy:description.substring(0,Math.min(description.length(),30))}[${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/> -taskUnplanList = delegator.findByAnd("ProjectSprintBacklogTaskAndParty", ["partyId" : partyId,"taskCurrentStatusId": "STS_CREATED","custRequestTypeId":"RF_UNPLAN_BACKLOG"],["taskTypeId"]); +taskUnplanList = delegator.findByAnd("ProjectSprintBacklogTaskAndParty", ["partyId" : partyId,"taskCurrentStatusId": "STS_CREATED","custRequestTypeId":"RF_UNPLAN_BACKLOG"],["taskTypeId"], false); taskUnplanList.each { taskUnplanMap -> unplanMap=[:]; custRequestId = taskUnplanMap.custRequestId; - productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"]); + productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"], false); productlist.each { productMap -> productId = productMap.productId; product = delegator.findOne("Product",["productId":productId], false); @@ -76,7 +76,7 @@ taskPlanList = delegator.findList("Proje taskPlanList.each { taskPlanMap -> planMap=[:]; if ("RF_SCRUM_MEETINGS".equals(taskPlanMap.custRequestTypeId)) { - workEffPartyAssignedList = delegator.findByAnd("WorkEffortPartyAssignment",["partyId" : partyId, "workEffortId" : taskPlanMap.taskId]); + workEffPartyAssignedList = delegator.findByAnd("WorkEffortPartyAssignment",["partyId" : partyId, "workEffortId" : taskPlanMap.taskId], null, false); workEffPartyAssignedMap = workEffPartyAssignedList[0]; if (!"SCAS_COMPLETED".equals(workEffPartyAssignedMap.statusId)) { taskPartyList.add(taskPlanMap); @@ -88,7 +88,7 @@ taskPlanList.each { taskPlanMap -> taskListDropdown.add(taskPlanMap); } else { custRequestId = taskPlanMap.custRequestId; - productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"]); + productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"], false); product = delegator.findOne("Product",["productId":productlist[0].productId], false); productName = product.internalName; planMap.taskId = taskPlanMap.taskId; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl Mon May 14 21:03:38 2012 @@ -22,7 +22,7 @@ under the License. <#assign actualCompletionDay = Static["org.ofbiz.base.util.UtilDateTime"].getDayStart(sprint.actualCompletionDate, timeZone, locale)/> <#assign dayNumber = ((actualCompletionDay.getTime() - actualStartDay.getTime())/1000/60/60/24) + 1/> <#assign estimatedHrs = sprint.estimatedMilliSeconds/1000/60/60/> -<#assign members = delegator.findByAnd("WorkEffortPartyAssignment", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", parameters.get("sprintId")))/> +<#assign members = delegator.findByAnd("WorkEffortPartyAssignment", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", parameters.get("sprintId")), null, false)/> <#if members.size() > 0 > <#assign maxHours = estimatedHrs * members.size()/> <div id="params_birtReport" style='display:none'> 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=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign Mon May 14 21:03:38 2012 @@ -95,11 +95,11 @@ unplannedData = 0; plannedData = 0; try{ - var unplannedList = delegator.findByAnd("CustRequestAndCustRequestItem", UtilMisc.toMap("productId", productId,"custRequestTypeId","RF_UNPLAN_BACKLOG")); + var unplannedList = delegator.findByAnd("CustRequestAndCustRequestItem", UtilMisc.toMap("productId", productId,"custRequestTypeId","RF_UNPLAN_BACKLOG"), null, false); if(unplannedList != null) unplannedData = unplannedList.size(); else unplannedData = 0; - var plannedList = delegator.findByAnd("CustRequestAndCustRequestItem", UtilMisc.toMap("productId", productId,"custRequestTypeId","RF_PROD_BACKLOG")); + var plannedList = delegator.findByAnd("CustRequestAndCustRequestItem", UtilMisc.toMap("productId", productId,"custRequestTypeId","RF_PROD_BACKLOG"), null, false); if(plannedList != null) plannedData = plannedList.size(); else plannedData = 0; 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=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign Mon May 14 21:03:38 2012 @@ -127,7 +127,7 @@ productId = params["productId"].value; <method name="open"><![CDATA[resultList = FastList.newInstance(); var projectList = null; try{ - var projectList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT")); + var projectList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT"), null, false); if (projectList != null) { for (i = 0;i < projectList.size(); i++ ) { var inputMap = FastMap.newInstance(); 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=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign Mon May 14 21:03:38 2012 @@ -95,11 +95,11 @@ projectActiveData = 0; projectClosedData = 0; try{ - var projectActiveList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_ACTIVE")); + var projectActiveList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_ACTIVE"), null, false); if(projectActiveList != null) projectActiveData = projectActiveList.size(); else projectActiveData = 0; - var projectClosedList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_CLOSED")); + var projectClosedList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_CLOSED"), null, false); if(projectClosedList != null) projectClosedData = projectClosedList.size(); else projectClosedData = 0; 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=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign Mon May 14 21:03:38 2012 @@ -141,7 +141,7 @@ installCompleted = 0; testCompleted = 0; try{ - var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT")); + var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"), null, false); // for implementation task var unplannedImpleConds = FastList.newInstance(); unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); 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=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign Mon May 14 21:03:38 2012 @@ -102,7 +102,7 @@ installationData = 0; testData = 0; try{ - var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT")); + var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"), null, false); // for implementation task var unplannedImpleConds = FastList.newInstance(); unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml?rev=1338423&r1=1338422&r2=1338423&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/scrumForms.xml Mon May 14 21:03:38 2012 @@ -292,7 +292,7 @@ under the License. <field-map field-name="productId" from-field="workeffAndProList[0].productId"/> </entity-one> <set field="maxHours" value="${groovy: - def memberSize = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId": parameters.sprintId]); + def memberSize = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId": parameters.sprintId], null, false); maxHours = memberSize.size() * context.estimatedHrs * 40; }"/> <service service-name="getScrumPlanHour" result-map="planHourOutMap"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |