You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/01/05 09:50:36 UTC
svn commit: r1649482 [25/26] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/ac...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy Mon Jan 5 08:50:30 2015
@@ -40,7 +40,7 @@ if (!partyId) {
timesheet = null;
timesheetId = parameters.timesheetId;
if (timesheetId) {
- timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false);
+ timesheet = from("Timesheet").where("timesheetId", timesheetId).queryOne();
partyId = timesheet.partyId; // use the party from this timesheet
} else {
// make sure because of timezone changes, not a duplicate timesheet is created
@@ -50,13 +50,13 @@ if (timesheetId) {
EntityCondition.makeCondition("thruDate", EntityComparisonOperator.GREATER_THAN, midweek),
EntityCondition.makeCondition("partyId", EntityComparisonOperator.EQUALS, partyId)
], EntityOperator.AND);
- entryIterator = delegator.find("Timesheet", entryExprs, null, null, null, null);
+ entryIterator = from("Timesheet").where(entryExprs).queryIterator();
timesheet = entryIterator.next();
entryIterator.close();
if (timesheet == null) {
- result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]);
+ result = runService('createProjectTimesheet', ["userLogin" : parameters.userLogin, "partyId" : partyId]);
if (result && result.timesheetId) {
- timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false);
+ timesheet = from("Timesheet").where("timesheetId", result.timesheetId).queryOne();
}
}
}
@@ -65,9 +65,9 @@ context.timesheet = timesheet;
context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate);
// get the user names
-context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false);
+context.partyNameView = from("PartyNameView").where("partyId", partyId).queryOne();
// get the default rate for this person
-rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"], null, false));
+rateTypes = from("PartyRate").where("partyId", partyId, "defaultRate", "Y").filterByDate().queryList();
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"], false);
+ lastTimeEntryOfTasks = from("TimeEntry").where("workEffortId", lastTimeEntry.workEffortId, "partyId", partyId).orderBy("-fromDate").queryList();
if (lastTimeEntryOfTasks.size() != 0) lastTimeEntry = lastTimeEntryOfTasks[0];
if (planHours < 1) {
planHours = estimatedHour;
@@ -141,7 +141,7 @@ void retrieveWorkEffortData() {
// get project/phase information
entry.workEffortId = entryWorkEffort.workEffortId;
entry.workEffortName = entryWorkEffort.workEffortName;
- result = dispatcher.runSync("getProjectInfoFromTask", ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]);
+ result = runService('getProjectInfoFromTask', ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]);
entry.phaseId = result.phaseId;
entry.phaseName = result.phaseName;
entry.projectId = result.projectId;
@@ -211,12 +211,8 @@ while (te.hasNext()) {
void retrieveEmplLeaveData() {
if (lastEmplLeaveEntry) {
//service get Hours
- inputMap = [:];
- inputMap.userLogin = parameters.userLogin;
- inputMap.partyId = lastEmplLeaveEntry.partyId;
- inputMap.leaveTypeId = lastEmplLeaveEntry.leaveTypeId;
- inputMap.fromDate = lastEmplLeaveEntry.fromDate;
- result = dispatcher.runSync("getPartyLeaveHoursForDate", inputMap);
+ result = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": lastEmplLeaveEntry.partyId, "leaveTypeId": lastEmplLeaveEntry.leaveTypeId, "fromDate": lastEmplLeaveEntry.fromDate]);
if (result.hours) {
leaveEntry.plannedHours = result.hours;
leaveEntry.planHours = result.hours;
@@ -242,12 +238,11 @@ void retrieveEmplLeaveData() {
}
// define condition
-findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
leaveExprs = [];
leaveExprs.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, timesheet.fromDate));
leaveExprs.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, timesheet.thruDate));
leaveExprs.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId));
-emplLeave = delegator.find("EmplLeave", EntityCondition.makeCondition(leaveExprs, EntityOperator.AND), null, null, null, findOpts);
+emplLeave = from("EmplLeave").where(leaveExprs).cursorScrollInsensitive().distinct().queryIterator();
while ((emplLeaveMap = emplLeave.next())) {
if (emplLeaveEntry!=void) {
@@ -261,21 +256,13 @@ while ((emplLeaveMap = emplLeave.next())
!lastEmplLeaveEntry.partyId.equals(emplLeaveEntry.partyId))) {
retrieveEmplLeaveData();
}
- input = [:];
- input.userLogin = parameters.userLogin;
- input.partyId = emplLeaveEntry.partyId;
- input.leaveTypeId = emplLeaveEntry.leaveTypeId;
- input.fromDate = emplLeaveEntry.fromDate;
- resultHours = dispatcher.runSync("getPartyLeaveHoursForDate", input);
+ resultHours = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": emplLeaveEntry.partyId, "leaveTypeId": emplLeaveEntry.leaveTypeId, "fromDate": emplLeaveEntry.fromDate]);
if (resultHours.hours) {
leaveDayNumber = "d" + (emplLeaveEntry.fromDate.getTime() - timesheet.fromDate.getTime()) / (24*60*60*1000);
- inputMap = [:];
- inputMap.userLogin = parameters.userLogin;
- inputMap.partyId = emplLeaveEntry.partyId;
- inputMap.leaveTypeId = emplLeaveEntry.leaveTypeId;
- inputMap.fromDate = emplLeaveEntry.fromDate;
- resultHours = dispatcher.runSync("getPartyLeaveHoursForDate", inputMap);
+ resultHours = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": emplLeaveEntry.partyId, "leaveTypeId": emplLeaveEntry.leaveTypeId, "fromDate": emplLeaveEntry.fromDate]);
leaveHours = resultHours.hours.doubleValue();
leaveEntry.put(String.valueOf(leaveDayNumber), leaveHours);
if (leaveDayNumber.equals("d0")) day0Total += leaveHours;
@@ -289,12 +276,8 @@ while ((emplLeaveMap = emplLeave.next())
}
if (resultHours.hours) {
leavePlanDay = "pd" + (emplLeaveEntry.fromDate.getTime() - timesheet.fromDate.getTime()) / (24*60*60*1000);
- inputMap = [:];
- inputMap.userLogin = parameters.userLogin;
- inputMap.partyId = emplLeaveEntry.partyId;
- inputMap.leaveTypeId = emplLeaveEntry.leaveTypeId;
- inputMap.fromDate = emplLeaveEntry.fromDate;
- resultPlanHours = dispatcher.runSync("getPartyLeaveHoursForDate", inputMap);
+ resultPlanHours = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": emplLeaveEntry.partyId, "leaveTypeId": emplLeaveEntry.leaveTypeId, "fromDate": emplLeaveEntry.fromDate]);
leavePlanHours = resultPlanHours.hours.doubleValue();
leaveEntry.put(String.valueOf(leavePlanDay), leavePlanHours);
if (leavePlanDay.equals("pd0")) pDay0Total += leavePlanHours;
@@ -350,7 +333,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"], false);
+timesheetsDb = from("Timesheet").where("partyId", partyId).orderBy("fromDate DESC").queryList();
timesheets = new LinkedList();
timesheetsDb.each { timesheetDb ->
//get hours from EmplLeave;
@@ -359,17 +342,13 @@ timesheetsDb.each { timesheetDb ->
leaveExprsList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, timesheetDb.fromDate));
leaveExprsList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, timesheetDb.thruDate));
leaveExprsList.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId));
- emplLeaveList = delegator.find("EmplLeave", EntityCondition.makeCondition(leaveExprsList, EntityOperator.AND), null, null, null, findOpts);
+ emplLeaveList = from("EmplLeave").where(leaveExprsList).cursorScrollInsensitive().distinct().queryIterator();
leaveHours = 0.00;
while ((emplLeaveMap = emplLeaveList.next())) {
emplLeaveEntry = emplLeaveMap;
- inputData = [:];
- inputData.userLogin = parameters.userLogin;
- inputData.partyId = emplLeaveEntry.partyId;
- inputData.leaveTypeId = emplLeaveEntry.leaveTypeId;
- inputData.fromDate = emplLeaveEntry.fromDate;
- resultHour = dispatcher.runSync("getPartyLeaveHoursForDate", inputData);
+ resultHour = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": emplLeaveEntry.partyId, "leaveTypeId": emplLeaveEntry.leaveTypeId, "fromDate": emplLeaveEntry.fromDate]);
if (resultHour) {
leaveActualHours = resultHour.hours.doubleValue();
leaveHours += leaveActualHours;
@@ -396,19 +375,19 @@ context.timesheets = timesheets;
taskList=[];
projectSprintBacklogAndTaskList = [];
backlogIndexList = [];
-projectAndTaskList = delegator.findByAnd("ProjectSprintBacklogAndTask", ["sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED"], ["projectName ASC","taskActualStartDate DESC"], false);
+projectAndTaskList = from("ProjectSprintBacklogAndTask").where("sprintTypeId" : "SCRUM_SPRINT","taskCurrentStatusId" : "STS_CREATED").orderBy("projectName ASC","taskActualStartDate DESC").queryList();
projectAndTaskList.each { projectAndTaskMap ->
userLoginId = userLogin.partyId;
sprintId = projectAndTaskMap.sprintId;
- workEffortList = delegator.findByAnd("WorkEffortAndProduct", ["workEffortId" : projectAndTaskMap.projectId], null, false);
+ workEffortList = from("WorkEffortAndProduct").where("workEffortId", projectAndTaskMap.projectId).queryList();
backlogIndexList.add(workEffortList[0].productId);
- partyAssignmentSprintList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLoginId], null, false);
+ partyAssignmentSprintList = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", userLoginId).queryList();
partyAssignmentSprintMap = partyAssignmentSprintList[0];
// if this userLoginId is a member of sprint
if (partyAssignmentSprintMap) {
workEffortId = projectAndTaskMap.taskId;
- partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : workEffortId], null, false);
+ partyAssignmentTaskList = from("WorkEffortPartyAssignment").where("workEffortId", workEffortId).queryList();
partyAssignmentTaskMap = partyAssignmentTaskList[0];
// if the task do not assigned
if (partyAssignmentTaskMap) {
@@ -427,24 +406,24 @@ userLoginId = userLogin.partyId;
unplanList=[];
if (backlogIndexList) {
backlogIndex = new HashSet(backlogIndexList);
- custRequestList = delegator.findByAnd("CustRequest", ["custRequestTypeId" : "RF_UNPLAN_BACKLOG","statusId" : "CRQ_REVIEWED"],["custRequestDate DESC"], false);
+ custRequestList = from("CustRequest").where("custRequestTypeId", "RF_UNPLAN_BACKLOG","statusId", "CRQ_REVIEWED").orderBy("custRequestDate DESC").queryList();
if (custRequestList) {
custRequestList.each { custRequestMap ->
custRequestItemList = custRequestMap.getRelated("CustRequestItem", null, null, false);
custRequestItem =
productOut = custRequestItemList[0].productId;
- product = delegator.findOne("Product", ["productId" : productOut], false);
+ product = from("Product").where("productId", productOut).queryOne();
backlogIndex.each { backlogProduct ->
productId = backlogProduct
if (productId.equals(productOut)) {
- custRequestWorkEffortList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : custRequestItemList[0].custRequestId], null, false);
+ custRequestWorkEffortList = from("CustRequestWorkEffort").where("custRequestId", custRequestItemList[0].custRequestId).queryList();
custRequestWorkEffortList.each { custRequestWorkEffortMap ->
- partyAssignmentTaskList = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : custRequestWorkEffortMap.workEffortId], null, false);
+ partyAssignmentTaskList = from("WorkEffortPartyAssignment").where("workEffortId", custRequestWorkEffortMap.workEffortId).queryList();
partyAssignmentTaskMap = partyAssignmentTaskList[0];
// if the task do not assigned
if (!partyAssignmentTaskMap) {
result = [:];
- workEffortMap = delegator.findOne("WorkEffort", ["workEffortId" : custRequestWorkEffortMap.workEffortId], false);
+ workEffortMap = from("WorkEffort").where("workEffortId", custRequestWorkEffortMap.workEffortId).queryOne();
result.description = custRequestMap.description;
result.productName = product.internalName;
result.taskId = workEffortMap.workEffortId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy Mon Jan 5 08:50:30 2015
@@ -39,7 +39,7 @@ if (!partyId) {
timesheet = null;
timesheetId = parameters.timesheetId;
if (timesheetId) {
- timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false);
+ timesheet = from("Timesheet").where("timesheetId", timesheetId).queryOne();
partyId = timesheet.partyId; // use the party from this timesheet
} else {
// make sure because of timezone changes, not a duplicate timesheet is created
@@ -49,13 +49,13 @@ if (timesheetId) {
EntityCondition.makeCondition("thruDate", EntityComparisonOperator.GREATER_THAN, midweek),
EntityCondition.makeCondition("partyId", EntityComparisonOperator.EQUALS, partyId)
], EntityOperator.AND);
- entryIterator = delegator.find("Timesheet", entryExprs, null, null, null, null);
+ entryIterator = from("Timesheet").where(entryExprs).queryIterator();
timesheet = entryIterator.next();
entryIterator.close();
if (timesheet == null) {
- result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]);
+ result = runService('createProjectTimesheet', ["userLogin" : parameters.userLogin, "partyId" : partyId]);
if (result && result.timesheetId) {
- timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false);
+ timesheet = from("Timesheet").where("timesheetId", result.timesheetId).queryOne();
}
}
}
@@ -64,9 +64,9 @@ context.timesheet = timesheet;
context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate);
// get the user names
-context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false);
+context.partyNameView = from("PartyNameView").where("partyId", partyId).queryOne();
// get the default rate for this person
-rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"], null, false));
+rateTypes = from("PartyRate").where("partyId", partyId, "defaultRate", "Y").filterByDate().queryList();
if (rateTypes) {
context.defaultRateTypeId = rateTypes[0].rateTypeId;
}
@@ -114,7 +114,7 @@ void retrieveWorkEffortData() {
// get project/phase information
entry.workEffortId = entryWorkEffort.workEffortId;
entry.workEffortName = entryWorkEffort.workEffortName;
- result = dispatcher.runSync("getProjectIdAndNameFromTask", ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]);
+ result = runService('getProjectIdAndNameFromTask', ["userLogin" : parameters.userLogin,"taskId" : entryWorkEffort.workEffortId]);
entry.sprintId = result.phaseId;
entry.sprintName = result.phaseName;
entry.projectId = result.projectId;
@@ -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"], false);
+timesheetsDb = from("Timesheet").where("partyId", partyId).orderBy("fromDate DESC").queryList();
timesheets = new LinkedList();
timesheetsDb.each { timesheetDb ->
timesheet = [:];
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy Mon Jan 5 08:50:30 2015
@@ -32,7 +32,7 @@ import java.sql.Timestamp;
productId =parameters.productId;
custRequestList=[];
backlogList=[];
-custRequestList = delegator.findByAnd("CustRequestItem", ["productId" : productId], null, false);
+custRequestList = from("CustRequestItem").where("productId", productId).queryList();
custRequestList.each { custRequestListMap ->
custRequestId=custRequestListMap.custRequestId;
exprBldr = FastList.newInstance();
@@ -43,15 +43,15 @@ custRequestList.each { custRequestListMa
andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR));
custRequestTypeCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
orderBy = ["custRequestTypeId"];
- productBacklogList = delegator.findList("CustRequest", custRequestTypeCond, null,orderBy ,null, false);
+ productBacklogList = from("CustRequest").where(andExprs).orderBy("custRequestTypeId").queryList();
productBacklogList.each { productBacklogMap ->
productBackId = productBacklogMap.custRequestId;
- taskBacklogList = delegator.findByAnd("CustRequestWorkEffort", ["custRequestId" : productBackId], null, false);
+ taskBacklogList = from("CustRequestWorkEffort").where("custRequestId", productBackId).queryList();
int countImplTask=0, countImplTaskComplete=0, countInstallTask=0, countInstallTaskComplete=0, countErrTask=0, countErrTaskComplete=0, countTestTask=0;
taskBacklogList.each { taskBacklogMap ->
taskId = taskBacklogMap.workEffortId;
- task = delegator.findOne("WorkEffort", ["workEffortId" : taskId], false);
+ task = from("WorkEffort").where("workEffortId", taskId).queryOne();
if (task.workEffortTypeId == "SCRUM_TASK_IMPL") {
countImplTask+=1;
if ( task.currentStatusId == "STS_COMPLETED" || task.currentStatusId == "STS_CANCELLED") {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindProductBacklogItem.groovy Mon Jan 5 08:50:30 2015
@@ -94,9 +94,12 @@ if ((parameters.billed != null)||(parame
}
mainConditionBacklogList.add(conditionsBacklog);
- mainConditionsBacklog = EntityCondition.makeCondition(mainConditionBacklogList, EntityOperator.AND);
- backlogList = delegator.findList("CustRequestAndCustRequestItem", mainConditionsBacklog, ["custRequestId","custRequestTypeId", "custSequenceNum", "statusId", "description", "custEstimatedMilliSeconds", "custRequestName", "parentCustRequestId","productId","billed","custRequestDate","fromPartyId"] as Set, ["-custRequestTypeId",orderBy], null, false);
+ backlogList = select("custRequestId","custRequestTypeId", "custSequenceNum", "statusId", "description", "custEstimatedMilliSeconds", "custRequestName", "parentCustRequestId","productId","billed","custRequestDate","fromPartyId")
+ .from("CustRequestAndCustRequestItem")
+ .where(mainConditionBacklogList)
+ .orderBy("-custRequestTypeId", orderBy)
+ .queryList();
def countSequenceBacklog = 1;
def backlogItems = [];
backlogList.each() { backlogItem ->
@@ -105,11 +108,11 @@ 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], null, false);
+ backlogCustWorkEffortList = from("CustRequestWorkEffort").where("custRequestId", backlogItem.custRequestId).queryList();
if (backlogCustWorkEffortList) {
actualHours = 0.00;
backlogCustWorkEffortList.each() { custWorkEffortMap ->
- result = dispatcher.runSync("getScrumActualHour", ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]);
+ result = runService('getScrumActualHour', ["taskId" : custWorkEffortMap.workEffortId,"partyId" : null, "userLogin" : userLogin]);
actualHours += result.actualHours;
}
if(actualHours) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy Mon Jan 5 08:50:30 2015
@@ -69,11 +69,10 @@ if ((taskId != null)||(taskName != null)
if (statusId){
exprBldr.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, statusId));
}
- unplannedCond = EntityCondition.makeCondition(exprBldr, EntityOperator.AND);
- unplannedTaskList = delegator.findList("UnPlannedBacklogsAndTasks", unplannedCond, null,["-createdDate"] ,null, false);
+ unplannedTaskList = from("UnPlannedBacklogsAndTasks").where(exprBldr).orderBy("-createdDate").queryList();
}
else{
- unplannedTaskList = delegator.findList("UnPlannedBacklogsAndTasks", null, null,["-createdDate"] ,null, false);
+ unplannedTaskList = from("UnPlannedBacklogsAndTasks").orderBy("-createdDate").queryList();
}
exprBldr2 = FastList.newInstance();
@@ -102,8 +101,7 @@ if ((taskId != null)||(taskName != null)
exprBldr2.add(EntityCondition.makeCondition("projectName", EntityOperator.LIKE, "%"+projectName+"%"));
}
exprBldr2.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT"));
- plannedCond = EntityCondition.makeCondition(exprBldr2, EntityOperator.AND);
- plannedTaskList = delegator.findList("ProjectSprintBacklogAndTask", plannedCond, null,["-taskCreatedDate"] ,null, false);
+ plannedTaskList = from("ProjectSprintBacklogAndTask").where(exprBldr2).orderBy("-taskCreatedDate").queryList();
unplannedTaskList.each{ unplannedTaskMap ->
unplannedMap = [:];
@@ -170,7 +168,7 @@ if ((taskId != null)||(taskName != null)
resultList = [];
assignedList.each { assignedMap ->
workEffortId = assignedMap.taskId;
- assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId, "partyId" : partyId], null, false);
+ assignToList = from("WorkEffortPartyAssignment").where("workEffortId", workEffortId, "partyId", partyId).queryList();
if (assignToList) {
assignedMap.partyId = assignToList[0].partyId;
resultList.add(assignedMap);
@@ -181,7 +179,7 @@ if ((taskId != null)||(taskName != null)
resultList = [];
assignedList.each { assignedMap ->
workEffortId = assignedMap.taskId;
- assignToList = delegator.findByAnd("WorkEffortPartyAssignment",["workEffortId" : workEffortId], null, false);
+ assignToList = from("WorkEffortPartyAssignment").where("workEffortId", workEffortId).queryList();
if (assignToList) {
assignedMap.partyId = assignToList[0].partyId;
resultList.add(assignedMap);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentProducts.groovy Mon Jan 5 08:50:30 2015
@@ -59,22 +59,22 @@ if (userLogin) {
paramCond.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "PRODUCT_OWNER_COMP"));
paramCond.add(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null));
- cond = EntityCondition.makeCondition(paramCond, EntityOperator.AND);
+ allProducts = from("ProductAndRole").where(paramCond).orderBy("groupName", "internalName").queryList();
- allProducts = delegator.findList("ProductAndRole", cond, null, ["groupName", "internalName"], null, false);
+ partyAndSecurityGroupList = select("partyId", "groupId")
+ .from("ScrumMemberUserLoginAndSecurityGroup").where(EntityCondition.makeCondition([
+ EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, userLogin.partyId),
+ EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
+ EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null)
+ ], EntityJoinOperator.AND))
+ .orderBy("partyId")
+ .queryList();
- securityGroupCond = EntityCondition.makeCondition([
- EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, userLogin.partyId),
- EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
- EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null)
- ], EntityJoinOperator.AND);
- fields = new HashSet(["partyId", "groupId"]);
- partyAndSecurityGroupList = delegator.findList("ScrumMemberUserLoginAndSecurityGroup", securityGroupCond, fields, ["partyId"], null, false);
context.partyAndSecurityGroupList = partyAndSecurityGroupList;
boolean addAllProducts = false;
allProducts.each { product ->
product = product.getAllFields();
- productMap = delegator.findOne("Product", ["productId" : product.productId], false);
+ productMap = from("Product").where("productId", product.productId).queryOne();
product.put("longDescription",productMap.longDescription)
if(security.hasEntityPermission("SCRUM", "_ADMIN", session)){
addAllProducts = true;
@@ -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], null, false);
+ productAndRoleList = from("ProductRole").where("productId", product.productId, "partyId", userLogin.partyId, "thruDate", null).queryList();
if (productAndRoleList) {
productAndRoleList.each { productAndRoleMap ->
productIdInner = productAndRoleMap.productId;
@@ -100,8 +100,8 @@ if (userLogin) {
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
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], null, false);
+ scrumRolesPersonAndCompanyList = from("ScrumRolesPersonAndCompany").where(scrumRolesCond).queryList();
+ productRoleList = from("ProductRole").where("partyId", scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId", "PRODUCT_OWNER_COMP", "thruDate", null).queryList();
if (productRoleList) {
productRoleList.each { productRoleMap ->
stakeholderProduct = productRoleMap.productId;
@@ -112,8 +112,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], null, false);
+ productAndRoleList = from("ProductAndRole").where("productId" : product.productId, "partyId" : userLogin.partyId, "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null).queryList()
if (productAndRoleList) {
ismember = true;
}
@@ -121,18 +120,17 @@ if (userLogin) {
} else if ("SCRUM_MASTER".equals(groupId)) {
//check in product.
productRoleList = [];
- productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : product.productId, "partyId" : userLogin.partyId
- , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false);
+ productRoleList = from("ProductAndRole").where("productId" : product.productId, "partyId" : userLogin.partyId, "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null).queryList();
if (productRoleList) {
ismember = true;
}
//check in project.
if (ismember == false) {
projects = [];
- projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"], null, false);
+ projects = from("WorkEffortAndProduct").where("productId", product.productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_ACTIVE").queryList();
if (projects) {
projects.each { project ->
- projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : project.workEffortId], null, false);
+ projectPartyAssignment = from("WorkEffortPartyAssignment").where("partyId", userLogin.partyId, "workEffortId", project.workEffortId).queryList();
if (projectPartyAssignment) {
ismember = true;
}
@@ -143,10 +141,10 @@ if (userLogin) {
if (ismember == false) {
projects.each { project ->
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", project.workEffortId, "currentStatusId", "SPRINT_ACTIVE").queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId], null, false)
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("partyId", userLogin.partyId, "workEffortId", sprintId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
@@ -155,14 +153,14 @@ if (userLogin) {
}
} else {
projects = [];
- projects = delegator.findByAnd("WorkEffortAndProduct", ["productId" : product.productId, "workEffortTypeId" : "SCRUM_PROJECT", "currentStatusId" : "SPJ_ACTIVE"], null, false);
+ projects = from("WorkEffortAndProduct").where("productId", product.productId, "workEffortTypeId", "SCRUM_PROJECT", "currentStatusId", "SPJ_ACTIVE").queryList();
if (projects) {
projects.each { project ->
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : project.workEffortId, "currentStatusId" : "SPRINT_ACTIVE"], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", project.workEffortId, "currentStatusId", "SPRINT_ACTIVE").queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : sprintId], null, false)
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("partyId", userLogin.partyId, "workEffortId", sprintId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
@@ -176,11 +174,11 @@ if (userLogin) {
EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "STS_CREATED"),
EntityCondition.makeCondition(exprBldr, EntityOperator.OR)];
unplannedBacklogCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
- unplannedBacklogList = delegator.findList("UnPlannedBacklogsAndTasks", unplannedBacklogCond, null,null ,null, false);
+ unplannedBacklogList = from("UnPlannedBacklogsAndTasks").where(unplannedBacklogCond).queryList();
if (unplannedBacklogList) {
unplannedBacklogList.each { unplannedMap ->
workEffortId = unplannedMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : userLogin.partyId, "workEffortId" : workEffortId], null, false)
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("partyId", userLogin.partyId, "workEffortId", workEffortId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListCurrentSprints.groovy Mon Jan 5 08:50:30 2015
@@ -31,15 +31,15 @@ securityGroupCond = EntityCondition.make
], EntityJoinOperator.AND);
fields = new HashSet(["partyId", "groupId"]);
-allSprints = delegator.findList("ProjectSprint", cond, null, ["projectName", "-sprintActualStartDate"], null, false);
-partyAndSecurityGroupList = delegator.findList("ScrumMemberUserLoginAndSecurityGroup", securityGroupCond, fields, ["partyId"], null, false);
+allSprints = from("ProjectSprint").where(cond).orderBy("projectName", "-sprintActualStartDate").queryList();
+partyAndSecurityGroupList = select("partyId", "groupId").from("ScrumMemberUserLoginAndSecurityGroup").where(securityGroupCond).orderBy("partyId").queryList();
oldProjectId = null;
newProjectId = null;
countSprint = 0;
sprints = [];
allSprints.each { sprint ->
newProjectId = sprint.projectId;
- productAndRole = delegator.findByAnd("ProductAndRole", ["roleTypeId" : "PRODUCT_OWNER_COMP", "productId" : sprint.productId], null, false);
+ productAndRole = from("ProductAndRole").where("roleTypeId", "PRODUCT_OWNER_COMP", "productId", sprint.productId).queryList();
companyId = "";
companyName = "";
if (productAndRole.size() > 0) {
@@ -49,7 +49,7 @@ allSprints.each { sprint ->
sprint = sprint.getAllFields();
sprint.put("companyId", companyId)
sprint.put("companyName", companyName)
- product = delegator.findOne("Product",["productId" : sprint.productId], false);
+ product = from("Product").where("productId", sprint.productId).queryOne();
productName = "";
if (product != null) productName = product.internalName;
sprint.put("productName", productName);
@@ -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], null, false);
+ productAndRoleList = from("ProductRole").where("productId", sprint.productId, "partyId", partyAndSecurityGroupList.getAt(0).partyId, "thruDate", null).queryList();
if (productAndRoleList) {
ismember = true;
}
@@ -73,8 +73,8 @@ allSprints.each { sprint ->
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
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], null, false);
+ scrumRolesPersonAndCompanyList = from("ScrumRolesPersonAndCompany").where(scrumRolesCond).queryList();
+ productRoleList = from("ProductRole").where("partyId", scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId", "PRODUCT_OWNER_COMP", "thruDate", null).queryList();
if (productRoleList) {
productRoleList.each { productRoleMap ->
stakeholderProduct = productRoleMap.productId;
@@ -85,8 +85,10 @@ 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], null, false);
+ productAndRoleList = from("ProductAndRole")
+ .where("productId", sprint.productId, "partyId", userLogin.partyId, "roleTypeId", "STAKEHOLDER",
+ "supportDiscontinuationDate", null, "thruDate", null)
+ .queryList();
if (productAndRoleList) {
ismember = true;
}
@@ -94,14 +96,17 @@ allSprints.each { sprint ->
} else if("SCRUM_MASTER".equals(groupId)) {
//check in product
productRoleList = [];
- productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId
- , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false);
+ productRoleList = from("ProductAndRole")
+ .where("productId" : sprint.productId, "partyId" : userLogin.partyId,
+ "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null)
+ .queryList();
+
if (productRoleList) {
ismember = true;
}
//check in project.
if (ismember == false) {
- projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId], null, false);
+ projectPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprint.projectId, "partyId", userLogin.partyId).queryList();
if (projectPartyAssignment) {
ismember = true;
}
@@ -109,10 +114,10 @@ allSprints.each { sprint ->
//check in sprint.
if (ismember == false) {
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", sprint.projectId).queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false);
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", userLogin.partyId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
@@ -120,10 +125,10 @@ allSprints.each { sprint ->
}
} else {
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", sprint.projectId).queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false);
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", userLogin.partyId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
@@ -143,7 +148,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], null, false);
+ productAndRoleList = from("ProductRole").where("productId", sprint.productId, "partyId", partyAndSecurityGroupList.getAt(0).partyId, "thruDate", null).queryList();
if (productAndRoleList) {
ismember = true;
}
@@ -155,8 +160,8 @@ allSprints.each { sprint ->
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
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], null, false);
+ scrumRolesPersonAndCompanyList = from("ScrumRolesPersonAndCompany").where(scrumRolesCond).queryList();
+ productRoleList = from("ProductRole").where("partyId", scrumRolesPersonAndCompanyList[0].partyIdFrom, "roleTypeId", "PRODUCT_OWNER_COMP", "thruDate", null).queryList();
if (productRoleList) {
productRoleList.each { productRoleMap ->
stakeholderProduct = productRoleMap.productId;
@@ -167,8 +172,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], null, false);
+ productAndRoleList = from("ProductAndRole").where("productId" : sprint.productId, "partyId" : userLogin.partyId, "roleTypeId" : "STAKEHOLDER", "supportDiscontinuationDate" : null, "thruDate" : null).queryList();
if (productAndRoleList) {
ismember = true;
}
@@ -176,14 +180,13 @@ allSprints.each { sprint ->
} else if("SCRUM_MASTER".equals(groupId)) {
//check in product
productRoleList = [];
- productRoleList = delegator.findByAnd("ProductAndRole", ["productId" : sprint.productId, "partyId" : userLogin.partyId
- , "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null], null, false);
+ productRoleList = from("ProductAndRole").where("productId" : sprint.productId, "partyId" : userLogin.partyId, "roleTypeId" : "SCRUM_MASTER", "supportDiscontinuationDate" : null, "thruDate" : null).queryList();
if (productRoleList) {
ismember = true;
}
//check in project.
if (ismember == false) {
- projectPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprint.projectId, "partyId" : userLogin.partyId], null, false);
+ projectPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprint.projectId, "partyId", userLogin.partyId).queryList();
if (projectPartyAssignment) {
ismember = true;
}
@@ -191,10 +194,10 @@ allSprints.each { sprint ->
//check in sprint.
if (ismember == false) {
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", sprint.projectId).queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false);
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", userLogin.partyId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
@@ -202,10 +205,10 @@ allSprints.each { sprint ->
}
} else {
allSprintList = [];
- allSprintList = delegator.findByAnd("WorkEffort", ["workEffortParentId" : sprint.projectId], null, false);
+ allSprintList = from("WorkEffort").where("workEffortParentId", sprint.projectId).queryList();
allSprintList.each { SprintListMap ->
sprintId = SprintListMap.workEffortId;
- workEffortPartyAssignment = delegator.findByAnd("WorkEffortPartyAssignment", ["workEffortId" : sprintId, "partyId" : userLogin.partyId], null, false);
+ workEffortPartyAssignment = from("WorkEffortPartyAssignment").where("workEffortId", sprintId, "partyId", userLogin.partyId).queryList();
if (workEffortPartyAssignment) {
ismember = true;
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListRevision.groovy Mon Jan 5 08:50:30 2015
@@ -40,7 +40,7 @@ if ((parameters.productId != null)||(par
}
andList.add(EntityCondition.makeCondition(orList, EntityOperator.OR));
custRequestCond = EntityCondition.makeCondition(andList, EntityOperator.AND);
- custRequestList = delegator.findList("CustRequestAndCustRequestItem", custRequestCond, null,null ,null, false);
+ custRequestList = from("CustRequestAndCustRequestItem").where(custRequestCond).queryList();
custRequestIds = EntityUtil.getFieldListFromEntityList(custRequestList, "custRequestId", true);
taskOrList = [];
@@ -52,7 +52,7 @@ if ((parameters.productId != null)||(par
taskAndList.add(EntityCondition.makeCondition("custRequestId", EntityOperator.IN, custRequestIds));
taskAndList.add(EntityCondition.makeCondition(taskOrList, EntityOperator.OR));
custAndWorkEffortCond = EntityCondition.makeCondition(taskAndList, EntityOperator.AND);
- custAndWorkEffortList = delegator.findList("CustRequestAndWorkEffort", custAndWorkEffortCond, null,null ,null, false);
+ custAndWorkEffortList = from("CustRequestAndWorkEffort").where(custAndWorkEffortCond).queryList();
//for workEffortId
workEffortIds = EntityUtil.getFieldListFromEntityList(custAndWorkEffortList, "workEffortId", true);
@@ -64,7 +64,7 @@ if ((parameters.productId != null)||(par
}
revisionAndList.add(EntityCondition.makeCondition("workEffortContentTypeId", EntityOperator.EQUALS, "TASK_SUB_INFO"));
revisionCond = EntityCondition.makeCondition(revisionAndList, EntityOperator.AND);
- revisionList = delegator.findList("WorkEffortAndContentDataResource", revisionCond, null,["-fromDate"] ,null, false);
+ revisionList = from("WorkEffortAndContentDataResource").where(revisionCond).orderBy("-fromDate").queryList();
if (revisionList) {
revisionList.each { revisionMap ->
@@ -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], null, false);
+ custAndWorkEfffList = from("CustRequestAndWorkEffort").where("workEffortId", revisionMap.workEffortId).queryList();
if (custAndWorkEfffList) {
custAndWorkEfffMap = custAndWorkEfffList[0];
- custAndCustItemList = delegator.findByAnd("CustRequestAndCustRequestItem", ["custRequestId" : custAndWorkEfffMap.custRequestId], null, false);
+ custAndCustItemList = from("CustRequestAndCustRequestItem").where("custRequestId", custAndWorkEfffMap.custRequestId).queryList();
if (custAndCustItemList) {
custAndCustItemMap = custAndCustItemList[0];
inputMap.productId = custAndCustItemMap.productId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy Mon Jan 5 08:50:30 2015
@@ -47,7 +47,7 @@ combinedCondList.add(andCondList);
combinedConds = EntityCondition.makeCondition(combinedCondList, EntityOperator.AND);
-scrumUserLoginSecurityGroupList = delegator.findList("ScrumMemberUserLoginAndSecurityGroup", combinedConds, null, null, null, false);
+scrumUserLoginSecurityGroupList = from("ScrumMemberUserLoginAndSecurityGroup").where(combinedConds).queryList();
userPreferenceList = [];
userPreferenceOutList = [];
if (scrumUserLoginSecurityGroupList) {
@@ -57,13 +57,13 @@ if (scrumUserLoginSecurityGroupList) {
ownerCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
ownerCond.add(EntityCondition.makeCondition("enumId", EntityOperator.NOT_EQUAL, "MASTER_NOTIFY"));
ownerConds = EntityCondition.makeCondition(ownerCond, EntityOperator.AND);
- userPreferenceList = delegator.findList("Enumeration" , ownerConds, null, null, null, false);
+ userPreferenceList = from("Enumeration").where(ownerConds).queryList();
} else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_MASTER") {
masterCond = FastList.newInstance();
masterCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
masterCond.add(EntityCondition.makeCondition("enumId", EntityOperator.EQUALS, "MASTER_NOTIFY"));
masterConds = EntityCondition.makeCondition(masterCond, EntityOperator.AND);
- userPreferenceList = delegator.findList("Enumeration" , masterConds, null, null, null, false);
+ userPreferenceList = from("Enumeration").where(masterConds).queryList();
} /*else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_TEAM") {
teamCond = FastList.newInstance();
teamCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
@@ -80,7 +80,7 @@ if (scrumUserLoginSecurityGroupList) {
context.userPreferenceList = userPreferenceOutList;
} else {
if (security.hasEntityPermission("SCRUM", "_ADMIN", session)) {
- userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"], false);
+ userPreferenceList = from("Enumeration").where("enumTypeId", "SCRUM_PREFERENCE").queryList();
context.userPreferenceList = userPreferenceList;
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy Mon Jan 5 08:50:30 2015
@@ -41,7 +41,7 @@ performFindInMap.orderBy = parameters.so
if (parameters.sortField) {
performFindInMap.orderBy = "lastName";
}
-performFindResults = dispatcher.runSync("performFind", performFindInMap);
+performFindResults = runService('performFind', performFindInMap);
resultList = performFindResults.listIt.getCompleteList();
performFindResults.listIt.close();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumRolesPersonAndCompany.groovy Mon Jan 5 08:50:30 2015
@@ -25,7 +25,7 @@ productId = parameters.productId
personAndCompanyList = [];
if (productId) {
- productRoleList = delegator.findByAnd("ProductRole", ["productId" : productId, "roleTypeId" : "PRODUCT_OWNER_COMP"], null, false);
+ productRoleList = from("ProductRole").where("productId" : productId, "roleTypeId" : "PRODUCT_OWNER_COMP").queryList();
if (productRoleList) {
personAndComCond = EntityCondition.makeCondition([
EntityCondition.makeCondition ("roleTypeId", EntityOperator.EQUALS, "PRODUCT_OWNER"),
@@ -33,7 +33,7 @@ if (productId) {
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null)
], EntityJoinOperator.AND);
- personAndCompanyList = delegator.findList("ScrumRolesPersonAndCompany", personAndComCond, null, ["groupName"], null, false);
+ personAndCompanyList = from("ScrumRolesPersonAndCompany").where(personAndComCond).orderBy("groupName").queryList();
}
}
if (personAndCompanyList) {
@@ -50,7 +50,7 @@ personAndComConds = EntityCondition.make
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"),
EntityCondition.makeCondition ("thruDate", EntityOperator.EQUALS, null)
], EntityJoinOperator.AND);
-personAndCompanyList = delegator.findList("ScrumRolesPersonAndCompany", personAndComConds, null, ["groupName"], null, false);
+personAndCompanyList = from("ScrumRolesPersonAndCompany").where(personAndComConds).orderBy("groupName").queryList();
if (personAndCompanyList) {
personAndCompanyList.each { personAndCompanyMap ->
partyId = personAndCompanyMap.partyId;
@@ -58,7 +58,7 @@ if (personAndCompanyList) {
EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, partyId),
EntityCondition.makeCondition ("partyStatusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED")
], EntityJoinOperator.AND);
- securityGroupList = delegator.findList("ScrumMemberUserLoginAndSecurityGroup", securityGroupCond, null, null, null, false);
+ securityGroupList = from("ScrumMemberUserLoginAndSecurityGroup").where(securityGroupCond).queryList();
if (securityGroupList) {
scrumRolesPersonAndCompanyList.add(personAndCompanyMap);
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy Mon Jan 5 08:50:30 2015
@@ -25,17 +25,13 @@ import org.ofbiz.base.util.UtilDateTime;
// get all timesheets of all user, including the planned hours
timesheets = [];
-performFindInMap = [:];
inputFields = [:];
-performFindInMap.entityName = "Timesheet";
if (!parameters.noConditionFind) {
parameters.noConditionFind = "N"
}
inputFields.putAll(parameters);
-performFindInMap.inputFields = inputFields;
-performFindInMap.orderBy = "fromDate DESC";
-performFindResults = dispatcher.runSync("performFind", performFindInMap);
+performFindResults = runService('performFind', ["entityName": "Timesheet", "inputFields": inputFields, "orderBy": "fromDate DESC"]);
if (performFindResults.listSize > 0) {
timesheetsDb = performFindResults.listIt.getCompleteList();
performFindResults.listIt.close();
@@ -47,17 +43,13 @@ if (performFindResults.listSize > 0) {
leaveExprsList.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, timesheetDb.fromDate));
leaveExprsList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, timesheetDb.thruDate));
leaveExprsList.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, timesheetDb.partyId));
- emplLeaveList = delegator.find("EmplLeave", EntityCondition.makeCondition(leaveExprsList, EntityOperator.AND), null, null, null, findOpts);
+ emplLeaveList = from("EmplLeave").where(leaveExprsList).cursorScrollInsensitive().distinct().queryIterator();
leaveHours = 0.00;
while ((emplLeaveMap = emplLeaveList.next())) {
emplLeaveEntry = emplLeaveMap;
- inputData = [:];
- inputData.userLogin = parameters.userLogin;
- inputData.partyId = emplLeaveEntry.partyId;
- inputData.leaveTypeId = emplLeaveEntry.leaveTypeId;
- inputData.fromDate = emplLeaveEntry.fromDate;
- resultHour = dispatcher.runSync("getPartyLeaveHoursForDate", inputData);
+ resultHour = runService('getPartyLeaveHoursForDate',
+ ["userLogin": parameters.userLogin, "partyId": emplLeaveEntry.partyId, "leaveTypeId": emplLeaveEntry.leaveTypeId, "fromDate": emplLeaveEntry.fromDate]);
if (resultHour) {
leaveActualHours = resultHour.hours.doubleValue();
leaveHours += leaveActualHours;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy Mon Jan 5 08:50:30 2015
@@ -43,7 +43,7 @@ andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition(orStsExprs, EntityOperator.OR));
andExprs.add(EntityCondition.makeCondition(orCurentExprs, EntityOperator.OR));
unplannedBacklogCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
-unplannedBacklogList = delegator.findList("UnPlannedBacklogsAndTasks", unplannedBacklogCond, null,["-custRequestId","workEffortTypeId","custSequenceNum"],null, false);
+unplannedBacklogList = from("UnPlannedBacklogsAndTasks").where(unplannedBacklogCond).orderBy("-custRequestId","workEffortTypeId","custSequenceNum").queryList();
context.listIt = unplannedBacklogList;
context.paraBacklogStatusId = paraBacklogStatusId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy Mon Jan 5 08:50:30 2015
@@ -31,9 +31,8 @@ entryExprs =
EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId),
EntityCondition.makeCondition("invoiceId", EntityOperator.NOT_EQUAL, null),
], EntityOperator.AND);
-orderBy = ["-fromDate"];
// check if latest invoice generated is still in process so allow re-generation to correct errors
-entryIterator = delegator.find("ProjectSprintBacklogTaskAndTimeEntryTimeSheet", entryExprs, null, null, orderBy, null);
+entryIterator = from("ProjectSprintBacklogTaskAndTimeEntryTimeSheet").where(entryExprs).orderBy("-fromDate").queryIterator();
while (entryItem = entryIterator.next()) {
invoice = entryItem.getRelatedOne("Invoice", false);
if (invoice.getString("statusId").equals("INVOICE_IN_PROCESS")) {
@@ -73,13 +72,13 @@ if ("N".equals(includeMeeting)) {
taskConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.NOT_EQUAL, "RF_SCRUM_MEETINGS"));
}
// get sprint task list
-def sprintTasks = delegator.findList("ProjectSprintBacklogTaskAndTimeEntryTimeSheet", EntityCondition.makeCondition(taskConds), null, null, null, false);
+def sprintTasks = from("ProjectSprintBacklogTaskAndTimeEntryTimeSheet").where(taskConds).queryList();
// get cancelled backlog task list
-def cancelledBacklogTasks = delegator.findList("CancelledBacklogsTaskAndTimeEntryTimeSheet", EntityCondition.makeCondition(taskConds), null, null, null, false);
+def cancelledBacklogTasks = from("CancelledBacklogsTaskAndTimeEntryTimeSheet").where(taskConds).queryList();
// get unplanned task list
-def unplannedTasks = delegator.findList("UnPlannedBacklogsTaskAndTimeEntryTimeSheet", EntityCondition.makeCondition(taskConds), null, null, null, false);
+def unplannedTasks = from("UnPlannedBacklogsTaskAndTimeEntryTimeSheet").where(taskConds).queryList();
def hoursNotYetBilledTasks = [];
hoursNotYetBilledTasks.addAll(sprintTasks);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductEmail.groovy Mon Jan 5 08:50:30 2015
@@ -32,33 +32,33 @@ now = UtilDateTime.nowTimestamp();
try{
if (UtilValidate.isNotEmpty(loginPartyId)) {
if (UtilValidate.isNotEmpty(productId)) {
- context.product = delegator.findOne("Product",["productId" : productId], false);
+ context.product = from("Product").where("productId", productId).queryOne();
}
- communicationEvent = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
+ communicationEvent = from("CommunicationEvent").where("communicationEventId", communicationEventId).queryOne();
communicationEvent.communicationEventTypeId = "EMAIL_COMMUNICATION";
communicationEvent.contactMechTypeId = "EMAIL_ADDRESS";
communicationEvent.datetimeStarted = now;
- checkOwner = delegator.findByAnd("ProductRole",["productId" : productId,"partyId" : loginPartyId,"roleTypeId" : "PRODUCT_OWNER"], null, false);
+ checkOwner = from("ProductRole").where("productId", productId,"partyId", loginPartyId,"roleTypeId", "PRODUCT_OWNER").queryList();
if (checkOwner) {
/* for product owner to our company */
// for owner
- productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"], null, false);
+ productRole = from("ProductRole").where("productId", productId,"roleTypeId", "PRODUCT_OWNER").queryList();
context.productOwnerId = productRole[0].partyId
- parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
+ parentCom = from("CommunicationEvent").where("communicationEventId", communicationEventId).queryOne();
if (parentCom) {
context.partyIdFrom = productRole[0].partyId;
} else {
context.partyIdFrom = parentCom.partyIdTo;
}
- resultsIdFrom = dispatcher.runSync("getPartyEmail", ["partyId" : productRole[0].partyId, "userLogin" : userLogin]);
+ resultsIdFrom = runService('getPartyEmail', ["partyId" : productRole[0].partyId, "userLogin" : userLogin]);
if (resultsIdFrom.contactMechId != null) {
context.contactMechIdFrom = resultsIdFrom.contactMechId;
communicationEvent.contactMechIdFrom = resultsIdFrom.contactMechId;
}
// for team
defaultPartyIdTo = organizationPartyId;
- resultsIdTo = dispatcher.runSync("getPartyEmail", ["partyId" : defaultPartyIdTo,"contactMechPurposeTypeId" :"SUPPORT_EMAIL", "userLogin" : userLogin]);
+ resultsIdTo = runService('getPartyEmail', ["partyId" : defaultPartyIdTo,"contactMechPurposeTypeId" :"SUPPORT_EMAIL", "userLogin" : userLogin]);
if (resultsIdTo.contactMechId != null) {
context.contactMechIdTo = resultsIdTo.contactMechId;
communicationEvent.contactMechIdTo = resultsIdTo.contactMechId;
@@ -72,21 +72,21 @@ try{
// for team
defaultPartyIdFrom = organizationPartyId;
context.partyIdFrom = defaultPartyIdFrom;
- resultsIdFrom = dispatcher.runSync("getPartyEmail", ["partyId" : defaultPartyIdFrom,"contactMechPurposeTypeId" :"SUPPORT_EMAIL", "userLogin" : userLogin]);
+ resultsIdFrom = runService('getPartyEmail', ["partyId" : defaultPartyIdFrom,"contactMechPurposeTypeId" :"SUPPORT_EMAIL", "userLogin" : userLogin]);
if (resultsIdFrom.contactMechId != null) {
context.contactMechIdFrom = resultsIdFrom.contactMechId;
communicationEvent.contactMechIdFrom = resultsIdFrom.contactMechId;
}
// for owner
- productRole = delegator.findByAnd("ProductRole",["productId" : productId,"roleTypeId" : "PRODUCT_OWNER"], null, false);
+ productRole = from("ProductRole").where("productId", productId,"roleTypeId", "PRODUCT_OWNER").queryList();
context.productOwnerId = productRole[0].partyId;
- parentCom = delegator.findOne("CommunicationEvent",["communicationEventId" : communicationEventId], false);
+ parentCom = from("CommunicationEvent").where("communicationEventId", communicationEventId).queryOne();
if(parentCom){
context.partyIdTo = productRole[0].partyId;
} else {
context.partyIdTo = parentCom.partyIdFrom;
}
- resultsIdTo = dispatcher.runSync("getPartyEmail", ["partyId" : productRole[0].partyId, "userLogin" : userLogin]);
+ resultsIdTo = runService('getPartyEmail', ["partyId" : productRole[0].partyId, "userLogin" : userLogin]);
if (resultsIdTo.contactMechId != null) {
context.contactMechIdTo = resultsIdTo.contactMechId;
communicationEvent.contactMechIdTo = resultsIdTo.contactMechId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/QuickAddBacklog.groovy Mon Jan 5 08:50:30 2015
@@ -22,17 +22,17 @@ import org.ofbiz.base.util.Debug;
try{
// for sprint dropdown
workEffortList = [];
- sprintList = delegator.findByAnd("WorkEffort",["workEffortTypeId" : "SCRUM_SPRINT","currentStatusId" : "SPRINT_ACTIVE"], null, false);
+ sprintList = from("WorkEffort").where("workEffortTypeId", "SCRUM_SPRINT","currentStatusId", "SPRINT_ACTIVE").queryList();
if (sprintList) {
sprintList.each{ sprintMap ->
workEffortMap = [:];
workEffortParentId = sprintMap.workEffortParentId;
if (workEffortParentId) {
- projectList = delegator.findByAnd("WorkEffortAndProduct",["workEffortId" : workEffortParentId], null, false);
+ projectList = from("WorkEffortAndProduct").where("workEffortId", workEffortParentId).queryList();
projectMap = projectList[0];
// make sure that project dose not closed
if (projectMap.currentStatusId != "SPJ_CLOSED") {
- productMap = delegator.findOne("Product",["productId" : projectMap.productId], false);
+ productMap = from("Product").where("productId", projectMap.productId).queryOne();
workEffortMap.productId = productMap.productId;
workEffortMap.internalName = returnNameAsString(productMap.internalName,30);
workEffortMap.projectId = projectMap.workEffortId;
@@ -59,16 +59,16 @@ try{
}
categoryList = [];
if (productId) {
- sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG","productId" : productId], null, false);
+ sprintList = from("CustRequestAndCustRequestItem").where("custRequestTypeId", "RF_PARENT_BACKLOG","productId", productId).queryList();
} else {
- sprintList = delegator.findByAnd("CustRequestAndCustRequestItem",["custRequestTypeId" : "RF_PARENT_BACKLOG"], null, false);
+ sprintList = from("CustRequestAndCustRequestItem").where("custRequestTypeId", "RF_PARENT_BACKLOG").queryList();
}
if (sprintList) {
sprintList.each{ categoryMap ->
inputMap = [:];
productIdIn = categoryMap.productId;
if (productIdIn) {
- productMap = delegator.findOne("Product",["productId" : productIdIn], false);
+ productMap = from("Product").where("productId", productIdIn).queryOne();
inputMap.productId = productMap.productId;
inputMap.internalName = productMap.internalName;
inputMap.custRequestId = categoryMap.custRequestId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy Mon Jan 5 08:50:30 2015
@@ -67,7 +67,7 @@ andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT"));
projectSprintCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
-projectSprintList = delegator.findList("ProjectSprintBacklogAndTask", projectSprintCond, null,["custSequenceNum","custRequestId","taskTypeId"],null, false);
+projectSprintList = from("ProjectSprintBacklogAndTask").where(andExprs).orderBy("custSequenceNum","custRequestId","taskTypeId").queryList();
context.listIt = projectSprintList;
context.paraBacklogStatusId = paraBacklogStatusId;
@@ -79,7 +79,7 @@ if (parameters.sprintId) {
reviewedBacklog = 0;
totalbacklog = 0;
allTask = [];
- sprintList = delegator.findByAnd("CustRequestWorkEffort", ["workEffortId" : parameters.sprintId], null, false);
+ sprintList = from("CustRequestWorkEffort").where("workEffortId", parameters.sprintId).queryList();
sprintList.each { sprintMap ->
custMap = sprintMap.getRelatedOne("CustRequest", false);
//if ("RF_PROD_BACKLOG".equals(custMap.custRequestTypeId)) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy Mon Jan 5 08:50:30 2015
@@ -38,14 +38,14 @@ 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"], false);
+taskUnplanList = from("ProjectSprintBacklogTaskAndParty").where("partyId", partyId,"taskCurrentStatusId", "STS_CREATED","custRequestTypeId","RF_UNPLAN_BACKLOG").orderBy("taskTypeId").queryList();
taskUnplanList.each { taskUnplanMap ->
unplanMap=[:];
custRequestId = taskUnplanMap.custRequestId;
- productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"], false);
+ productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList();
productlist.each { productMap ->
productId = productMap.productId;
- product = delegator.findOne("Product",["productId":productId], false);
+ product = from("Product").where("productId", productId).queryOne();
productName = product.internalName;
unplanMap.taskId = taskUnplanMap.taskId;
unplanMap.taskName = taskUnplanMap.taskName;
@@ -72,11 +72,11 @@ andExprs.add(EntityCondition.makeConditi
andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR));
custRequestTypeCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
-taskPlanList = delegator.findList("ProjectSprintBacklogTaskAndParty", custRequestTypeCond, null,["taskTypeId","projectId","sprintId"] ,null, false);
+taskPlanList = from("ProjectSprintBacklogTaskAndParty").where(custRequestTypeCond).orderBy("taskTypeId","projectId","sprintId").queryList();
taskPlanList.each { taskPlanMap ->
planMap=[:];
if ("RF_SCRUM_MEETINGS".equals(taskPlanMap.custRequestTypeId)) {
- workEffPartyAssignedList = delegator.findByAnd("WorkEffortPartyAssignment",["partyId" : partyId, "workEffortId" : taskPlanMap.taskId], null, false);
+ workEffPartyAssignedList = from("WorkEffortPartyAssignment").where("partyId", partyId, "workEffortId", taskPlanMap.taskId).queryList();
workEffPartyAssignedMap = workEffPartyAssignedList[0];
if (!"SCAS_COMPLETED".equals(workEffPartyAssignedMap.statusId)) {
taskPartyList.add(taskPlanMap);
@@ -88,8 +88,8 @@ taskPlanList.each { taskPlanMap ->
taskListDropdown.add(taskPlanMap);
} else {
custRequestId = taskPlanMap.custRequestId;
- productlist = delegator.findByAnd("CustRequestItem", ["custRequestId" : custRequestId],["productId"], false);
- product = delegator.findOne("Product",["productId":productlist[0].productId], false);
+ productlist = from("CustRequestItem").where("custRequestId", custRequestId).orderBy("productId").queryList();
+ product = from("Product").where("productId", productlist[0].productId).queryOne();
productName = product.internalName;
planMap.taskId = taskPlanMap.taskId;
planMap.taskTypeId = taskPlanMap.taskTypeId;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy Mon Jan 5 08:50:30 2015
@@ -42,8 +42,8 @@ if (productStore) {
facilityId = productStore.getString("inventoryFacilityId");
if (facilityId) {
- context.posTerminals = delegator.findList("PosTerminal", EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId), null, ["posTerminalId"], null, false);
+ context.posTerminals = from("PosTerminal").where("facilityId", facilityId).orderBy("posTerminalId").queryList();
} else {
- context.posTerminals = delegator.findList("PosTerminal", null, null, ["posTerminalId"], null, false);
+ context.posTerminals = from("PosTerminal").orderBy("posTerminalId").queryList();
}
}