You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/12/26 07:54:52 UTC
svn commit: r1647937 [5/5] - in /ofbiz/trunk:
applications/product/webapp/catalog/WEB-INF/actions/
applications/product/webapp/catalog/WEB-INF/actions/category/
applications/product/webapp/catalog/WEB-INF/actions/config/
applications/product/webapp/cat...
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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy Fri Dec 26 06:54:50 2014
@@ -43,7 +43,7 @@ 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())) {
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy Fri Dec 26 06:54:50 2014
@@ -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/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -32,20 +32,20 @@ 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 {
@@ -78,9 +78,9 @@ try{
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 {
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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/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=1647937&r1=1647936&r2=1647937&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 Fri Dec 26 06:54:50 2014
@@ -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/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/Login.groovy Fri Dec 26 06:54:50 2014
@@ -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();
}
}
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy Fri Dec 26 06:54:50 2014
@@ -35,7 +35,7 @@ if (webPosSession) {
context.person = null;
if (UtilValidate.isNotEmpty(shoppingCart)) {
- placingCustomerParty = delegator.findOne("PartyAndPerson", [partyId : shoppingCart.getPlacingCustomerPartyId()], false);
+ placingCustomerParty = from("PartyAndPerson").where("partyId", shoppingCart.getPlacingCustomerPartyId()).queryOne();
if (UtilValidate.isNotEmpty(placingCustomerParty)) {
context.person = placingCustomerParty.lastName + " " + placingCustomerParty.firstName;
}
@@ -79,7 +79,7 @@ if (shoppingCart) {
context.shoppingCartSize = 0;
}
-context.paymentCash = delegator.findOne("PaymentMethodType", ["paymentMethodTypeId" : "CASH"], true);
-context.paymentCheck = delegator.findOne("PaymentMethodType", ["paymentMethodTypeId" : "PERSONAL_CHECK"], true);
-context.paymentGift = delegator.findOne("PaymentMethodType", ["paymentMethodTypeId" : "GIFT_CARD"], true);
-context.paymentCredit = delegator.findOne("PaymentMethodType", ["paymentMethodTypeId" : "CREDIT_CARD"], true);
\ No newline at end of file
+context.paymentCash = from("PaymentMethodType").where("paymentMethodTypeId" : "CASH").cache(true).queryOne();
+context.paymentCheck = from("PaymentMethodType").where("paymentMethodTypeId" : "PERSONAL_CHECK").cache(true).queryOne();
+context.paymentGift = from("PaymentMethodType").where("paymentMethodTypeId" : "GIFT_CARD").cache(true).queryOne();
+context.paymentCredit = from("PaymentMethodType").where("paymentMethodTypeId" : "CREDIT_CARD").cache(true).queryOne();
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy Fri Dec 26 06:54:50 2014
@@ -36,7 +36,7 @@ if (!(productCategoryId) && request.getA
productCategoryId = request.getAttribute("topCategoryId");
}
-category = delegator.findOne("ProductCategory", [productCategoryId : productCategoryId], true);
+category = from("ProductCategory").where("productCategoryId", productCategoryId).cache(true).queryOne();
if (category) {
if (category.detailScreen) {
detailScreen = category.detailScreen;
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy Fri Dec 26 06:54:50 2014
@@ -17,14 +17,14 @@
* under the License.
*/
-person = delegator.findOne("Person", [partyId : parameters.partyId], false);
+person = from("Person").where("partyId", parameters.partyId).queryOne();
if (person) {
request.setAttribute("lastName", person.lastName);
request.setAttribute("firstName", person.firstName);
request.setAttribute("partyId", parameters.partyId);
}
-contactMech = delegator.findOne("ContactMech", [contactMechId : parameters.contactMechId], false);
+contactMech = from("ContactMech").where("contactMechId", parameters.contactMechId).queryOne();
if (contactMech) {
postalAddress = contactMech.getRelatedOne("PostalAddress", false);
if (postalAddress) {
@@ -37,11 +37,11 @@ if (contactMech) {
request.setAttribute("postalCode", postalAddress.postalCode);
request.setAttribute("stateProvinceGeoId", postalAddress.stateProvinceGeoId);
request.setAttribute("countryGeoId", postalAddress.countryGeoId);
- stateProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false);
+ stateProvinceGeo = from("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne();
if (stateProvinceGeo) {
request.setAttribute("stateProvinceGeo", stateProvinceGeo.get("geoName", locale));
}
- countryProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false);
+ countryProvinceGeo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne();
if (countryProvinceGeo) {
request.setAttribute("countryProvinceGeo", countryProvinceGeo.get("geoName", locale));
}
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/manager/PaidOutAndIn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/manager/PaidOutAndIn.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/manager/PaidOutAndIn.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/manager/PaidOutAndIn.groovy Fri Dec 26 06:54:50 2014
@@ -19,5 +19,5 @@
import org.ofbiz.entity.condition.*;
-context.paidReasonIn = delegator.findList("Enumeration", EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "POS_PAID_REASON_IN") , null, ["sequenceId"], null, false);
-context.paidReasonOut = delegator.findList("Enumeration", EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "POS_PAID_REASON_OUT"), null, ["sequenceId"], null, false);
+context.paidReasonIn = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_IN").orderBy("sequenceId").queryList();
+context.paidReasonOut = from("Enumeration").where("enumTypeId", "POS_PAID_REASON_OUT").orderBy("sequenceId").queryList();
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy Fri Dec 26 06:54:50 2014
@@ -24,22 +24,22 @@ if (webPosSession) {
shoppingCart = webPosSession.getCart();
shipToCustomerPartyId = shoppingCart.getShipToCustomerPartyId();
if (UtilValidate.isNotEmpty(shipToCustomerPartyId)) {
- context.personShipTo = delegator.findOne("Person", [partyId : shipToCustomerPartyId], false);
+ context.personShipTo = from("Person").where("partyId", shipToCustomerPartyId).queryOne();
}
shippingContactMechId = shoppingCart.getContactMech("SHIPPING_LOCATION");
if (UtilValidate.isNotEmpty(shippingContactMechId)) {
- contactMech = delegator.findOne("ContactMech", [contactMechId : shippingContactMechId], false);
+ contactMech = from("ContactMech").where("contactMechId", shippingContactMechId).queryOne();
if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
}
}
billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId();
if (UtilValidate.isNotEmpty(billToCustomerPartyId)) {
- context.personBillTo = delegator.findOne("Person", [partyId : billToCustomerPartyId], false);
+ context.personBillTo = from("Person").where("partyId", billToCustomerPartyId).queryOne();
}
billingContactMechId = shoppingCart.getContactMech("BILLING_LOCATION");
if (UtilValidate.isNotEmpty(billingContactMechId)) {
- contactMech = delegator.findOne("ContactMech", [contactMechId : billingContactMechId], false);
+ contactMech = from("ContactMech").where("contactMechId", billingContactMechId).queryOne();
if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) {
context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress", false);
}
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/SearchSalesReps.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/SearchSalesReps.groovy?rev=1647937&r1=1647936&r2=1647937&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/SearchSalesReps.groovy (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/SearchSalesReps.groovy Fri Dec 26 06:54:50 2014
@@ -20,11 +20,7 @@
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
-List partyRoleCond = [];
-List orderBy = ["lastName", "firstName"];
-
-partyRoleCond.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "SALES_REP"));
-context.salesReps = delegator.findList("PartyRoleNameDetail", EntityCondition.makeCondition(partyRoleCond, EntityOperator.AND), null, orderBy, null, false);
+context.salesReps = from("PartyRoleNameDetail").where("roleTypeId", "SALES_REP").orderBy("lastName", "firstName").queryList();
shoppingCart = session.getAttribute("shoppingCart");
if (shoppingCart) {