svn commit: r1643778 [1/5] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1643778 [1/5] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Dec 8 10:21:56 2014 New Revision: 1643778 URL: http://svn.apache.org/r1643778 Log: Keeps in sync with OFBiz trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/OfbizDslDescriptorForEclipse.dsld - copied unchanged from r1643777, ofbiz/trunk/framework/base/src/org/ofbiz/base/OfbizDslDescriptorForEclipse.dsld ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl - copied unchanged from r1643777, ofbiz/trunk/framework/base/src/org/ofbiz/base/OfbizDslDescriptorForIntelliJ.gdsl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/runtime/.gitignore - copied unchanged from r1643777, ofbiz/trunk/runtime/.gitignore Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/DemoBlogPubPtData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderErrorUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/config/OrderUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/order/OrderServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/script/org/ofbiz/order/test/ShoppingCartTests.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/services.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/OrderManagerEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/testdef/ShoppingCartTests.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/UrlServletHelper.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitygroup.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/entitydef/entitymodel.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/resources/templates/AdminNewTenantData-Derby.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/resources/templates/AdminNewTenantData-MySQL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/resources/templates/AdminNewTenantData-Oracle.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/resources/templates/AdminNewTenantData-PostgreSQL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/event/RequestBodyMapHandlerFactory.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/hot-deploy/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/data/CmsSiteDemoData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/MainDecorator.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/data/topic.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ --- svn:global-ignores (added) +++ svn:global-ignores Mon Dec 8 10:21:56 2014 @@ -0,0 +1 @@ +.git Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Dec 8 10:21:56 2014 @@ -11,3 +11,11 @@ changelog .idea dependencyCheck.groovy desktop.ini +cloudfeet-backup-logs.sh +cloudfeet-CI.sh +cloudfeet-restart-qa.sh +cloudfeet-restart-test.sh +cloudfeet-restore-logs.sh +cloudfeet-startofbiz.sh +cloudfeet-stop.sh +cloudfeet.on.error.sh Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 8 10:21:56 2014 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1535158-1642659 +/ofbiz/trunk:1535158-1643777 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml Mon Dec 8 10:21:56 2014 @@ -32,23 +32,12 @@ under the License. <!-- finally create the record (should not exist already)--> <create-value value-field="newEntity"/> - <set field="setStatus.budgetId" from-field="newEntity.budgetId"/> <set field="setStatus.statusId" value="BG_CREATED"/> <call-service service-name="updateBudgetStatus" in-map-name="setStatus"/> <field-to-result field="newEntity.budgetId" result-name="budgetId"/> </simple-method> - - <!-- update an existing Budget header Record --> - <simple-method method-name="updateBudget" short-description="Update an existing Budget"> - <entity-one entity-name="Budget" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <set-pk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - - <field-to-result field="parameters.budgetId" result-name="budgetId"/> - </simple-method> - + <!-- update Budget Status --> <simple-method method-name="updateBudgetStatus" short-description="Update Budget Status"> <now-timestamp field="nowDate"/> @@ -78,75 +67,20 @@ under the License. </else> </if-not-empty> </simple-method> - - <simple-method method-name="createBudgetItem" short-description="Create a new Budget Item"> - <set field="budgetId" from-field="parameters.budgetId"/> - <make-value value-field="newEntity" entity-name="BudgetItem"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.budgetItemSeqId"> - <make-next-seq-id value-field="newEntity" seq-field-name="budgetItemSeqId"/> - </if-empty> - <create-value value-field="newEntity"/> - <field-to-result field="budgetId"/> - </simple-method> - - <simple-method method-name="updateBudgetItem" - short-description="Update an existing Budget Item"> - <make-value value-field="lookedUpValue" entity-name="BudgetItem"/> - <set-pk-fields map="parameters" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - <field-to-result field="lookedUpValue.budgetItemSeqId" result-name="budgetItemSeqId"/> - <field-to-result field="lookedUpValue.budgetId" result-name="budgetId"/> - </simple-method> - - <simple-method method-name="removeBudgetItem" short-description="Remove an existing Budget Item"> - <entity-one entity-name="BudgetItem" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="createBudgetRole" short-description="Create a Budget Role"> - <entity-one value-field="partyRole" entity-name="PartyRole"> - <field-map field-name="partyId" from-field="parameters.partyId"/> - <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> - </entity-one> + <entity-one value-field="partyRole" entity-name="PartyRole"/> <if-empty field="partyRole"> <set field="createPartyRole.partyId" from-field="parameters.partyId"/> <set field="createPartyRole.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="createPartyRole" in-map-name="createPartyRole"/> <check-errors/> </if-empty> - <make-value value-field="newEntity" entity-name="BudgetRole"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> - <field-to-result field="parameters.budgetId" result-name="budgetId"/> </simple-method> - <simple-method method-name="removeBudgetRole" short-description="Remove existing Budget Role"> - <entity-one entity-name="BudgetRole" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - <field-to-result field="parameters.budgetId" result-name="budgetId"/> - </simple-method> - - <simple-method method-name="createBudgetReview" short-description="Create a Budget Review"> - <make-value value-field="newEntity" entity-name="BudgetReview"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.budgetReviewId"> - <make-next-seq-id value-field="newEntity" seq-field-name="budgetReviewId"/> - </if-empty> - <create-value value-field="newEntity"/> - <field-to-result field="parameters.budgetId" result-name="budgetId"/> - </simple-method> - - <simple-method method-name="removeBudgetReview" short-description="Remove existing Budget Review"> - <entity-one entity-name="BudgetReview" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - <field-to-result field="parameters.budgetId" result-name="budgetId"/> - </simple-method> </simple-methods> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_budget.xml Mon Dec 8 10:21:56 2014 @@ -20,8 +20,8 @@ under the License. <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - <description>Accounting Services: Fixed Asset </description> - <vendor>OFBiz</vendor> + <description>Accounting Services: Budget</description> + <vendor>Apache OFBiz</vendor> <version>1.0</version> <!-- Budget --> @@ -31,65 +31,54 @@ under the License. <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateBudget" default-entity-name="Budget" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="updateBudget" auth="true"> + <service name="updateBudget" default-entity-name="Budget" engine="entity-auto" invoke="update" auth="true"> <description>Update a Budget</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <attribute name="budgetId" mode="OUT" type="String" optional="false"></attribute> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> + <service name="updateBudgetStatus" default-entity-name="BudgetStatus" engine="simple" location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="updateBudgetStatus"> <description>Update a Budget</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="createBudgetItem" default-entity-name="BudgetItem" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="createBudgetItem"> + + <service name="createBudgetItem" default-entity-name="BudgetItem" engine="entity-auto" invoke="create" auth="true"> <description>Create a Budget Item</description> <auto-attributes include="nonpk" mode="IN" optional="true"/> - <attribute name="budgetId" mode="INOUT" type="String" optional="false"></attribute> + <attribute name="budgetId" mode="IN" type="String" optional="false"/> + <attribute name="budgetItemSeqId" mode="OUT" type="String" optional="false"/> </service> - <service name="updateBudgetItem" default-entity-name="BudgetItem" engine="simple" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="updateBudgetItem"> + <service name="updateBudgetItem" default-entity-name="BudgetItem" engine="entity-auto" invoke="update" auth="true"> <description>Update a Budget Item</description> - <auto-attributes include="pk" mode="INOUT" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeBudgetItem" engine="simple" default-entity-name="BudgetItem" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="removeBudgetItem"> + <service name="removeBudgetItem" default-entity-name="BudgetItem" engine="entity-auto" invoke="delete" auth="true"> <description>Remove an existing Budget Item Record</description> <auto-attributes mode="IN" include="pk" optional="false"/> </service> - - <service name="createBudgetRole" engine="simple" default-entity-name="BudgetRole" + + <service name="createBudgetRole" default-entity-name="BudgetRole" engine="simple" location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="createBudgetRole"> <description>Create a new Budget Role Record</description> <auto-attributes mode="IN" include="pk" optional="false"/> - <attribute name="budgetId" mode="OUT" type="String" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> </service> - - <service name="removeBudgetRole" engine="simple" default-entity-name="BudgetRole" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="removeBudgetRole"> + <service name="removeBudgetRole" default-entity-name="BudgetRole" engine="entity-auto" invoke="delete" auth="true"> <description>Remove an existing Budget Role Record</description> <auto-attributes mode="IN" include="pk" optional="false"/> - <attribute name="budgetId" mode="OUT" type="String" optional="false"/> </service> - - <service name="createBudgetReview" engine="simple" default-entity-name="BudgetReview" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="createBudgetReview"> + + <service name="createBudgetReview" default-entity-name="BudgetReview" engine="entity-auto" invoke="create" auth="true"> <description>Create a new Budget Review Record</description> - <attribute name="budgetId" mode="INOUT" type="String" optional="false"/> - <attribute name="partyId" mode="IN" type="String" optional="false"/> - <attribute name="budgetReviewResultTypeId" mode="IN" type="String" optional="false"/> + <auto-attributes mode="IN" include="pk" optional="false"/> <auto-attributes mode="IN" include="nonpk" optional="true"/> + <override name="budgetReviewId" mode="OUT" type="String" optional="false"/> </service> - - <service name="removeBudgetReview" engine="simple" default-entity-name="BudgetReview" - location="component://accounting/script/org/ofbiz/accounting/budget/BudgetServices.xml" invoke="removeBudgetReview"> + <service name="removeBudgetReview" default-entity-name="BudgetReview" engine="entity-auto" invoke="delete" auth="true"> <description>Remove an existing Budget Review Record</description> <auto-attributes mode="IN" include="pk" optional="false"/> - <attribute name="budgetId" mode="OUT" type="String" optional="false"/> </service> </services> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/OrderShippingInfo.js Mon Dec 8 10:21:56 2014 @@ -31,4 +31,137 @@ jQuery(document).ready( function() { // Populate state list based on default country getAssociatedStateList('countryGeoId', 'stateProvinceGeoId', 'advice-required-stateProvinceGeoId', 'states'); } -}); \ No newline at end of file +}); + +function showEdit(edit, index) { + var sufix = index; + if (sufix == '-1') { + sufix = ""; + } + + //display / hide edit element + var element = document.getElementById("edit" + sufix); + if (element != null) { + var objBranch = element.style; + if ("edit" == edit) { + objBranch.display = "block"; + } else { + objBranch.display = "none"; + } + } + var element = document.getElementById("display" + sufix); + if (element != null) { + var objBranch = element.style; + if (edit == "display") { + objBranch.display = "block"; + } else { + objBranch.display = "none"; + } + } + + var next = true; + for(var i = 0; next ; i++) { + //hide / show display quantity + var element = document.getElementById("displayQuantity" + sufix + i); + if (element != null) { + var objBranch = element.style; + if (edit == "display") { + objBranch.display = "block"; + } else { + objBranch.display = "none"; + } + } + + //hide / show edit quantity + var element = document.getElementById("editQuantity" + sufix + i); + if (element != null) { + var objBranch = element.style; + if (edit == "edit") { + objBranch.display = "block"; + } else { + objBranch.display = "none"; + } + } + if (element == null) { + next = false; + } + } + + //Hide display OISG edit view + var element = document.getElementById("OISGEdit" + sufix); + if (element != null) { + var objBranch = element.style; + if (edit == "edit") { + objBranch.display = "block"; + } + else { + objBranch.display = "none"; + } + } +} + +function restoreEditField(index) { + var sufix = index; + if (sufix == '-1') + sufix = ""; + + //display / hide edit element + var next = true; + for(var i = 0; next ; i++) { + var editElement = document.getElementById("edit" + index + "_o_" + i); + if (editElement == null) { + next = false; + } else { + editElement.value = editElement.title; + } + } +} + +function showShipByDate(e, id) { + var element = document.getElementById(id); + if (e.value == "new") { + element.style.display = "block"; + } else { + element.style.display = "none"; + } +} + +function showView(view, index) { + var sufix = index; + if (sufix == '-1') { + sufix = ""; + } + //display / hide buttonDisplay element + var element = document.getElementById("display" + sufix); + if (element != null) { + var objBranch = element.style; + if ("view" == view) { + objBranch.display = "none"; + } else { + objBranch.display = "block"; + } + + //display / hide buttonEdit element + var element = document.getElementById("view" + sufix); + if (element != null) { + var objBranch = element.style; + if ("view" == view) { + objBranch.display = "block"; + } else { + objBranch.display = "none"; + } + } + + //Hide display OISG show view + var element = document.getElementById("OISGView" + sufix); + if (element != null) { + var objBranch = element.style; + if (view == "view") { + objBranch.display = "block"; + } + else { + objBranch.display = "none"; + } + } + } +} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/DemoBlogPubPtData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/DemoBlogPubPtData.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/DemoBlogPubPtData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/data/DemoBlogPubPtData.xml Mon Dec 8 10:21:56 2014 @@ -34,7 +34,7 @@ under the License. <ContentAssoc contentId="BLOGROOT" contentIdTo="BLOGROOTBIGAL" - contentAssocTypeId="PUBLISH_LINK" + contentAssocTypeId="SUB_CONTENT" fromDate="2004-11-22 17:32:33.987" createdByUserLogin="admin" lastModifiedByUserLogin="admin" @@ -56,7 +56,7 @@ under the License. <ContentAssoc contentId="BLOGROOT" contentIdTo="BLOGROOTMADMAX" - contentAssocTypeId="PUBLISH_LINK" + contentAssocTypeId="SUB_CONTENT" fromDate="2004-11-22 17:32:33.987" createdByUserLogin="admin" lastModifiedByUserLogin="admin" Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Mon Dec 8 10:21:56 2014 @@ -564,7 +564,7 @@ public class ContentManagementWorker { List<String> contentTypes = null; // String fromDate = null; // String thruDate = null; - Map<String, Object> results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, null, "To", null, null, assocTypes, contentTypes, Boolean.TRUE, null); + Map<String, Object> results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, null, "To", null, null, assocTypes, contentTypes, Boolean.TRUE, null, null); List<GenericValue> valueList = UtilGenerics.checkList(results.get("entityList")); if (valueList.size() > 0) { GenericValue value = valueList.get(0); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Mon Dec 8 10:21:56 2014 @@ -31,6 +31,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -186,7 +187,7 @@ public class ContentServicesComplex { Boolean nullThruDatesOnly = (Boolean)context.get("nullThruDatesOnly"); Map<String, Object> results = null; try { - results = getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, mapKey, direction, fromDate, fromDateStr, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId); + results = getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, mapKey, direction, fromDate, fromDateStr, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId, null); } catch (GenericEntityException e) { return ServiceUtil.returnError(e.getMessage()); } catch (MiniLangException e2) { @@ -195,57 +196,47 @@ public class ContentServicesComplex { return results; } - - public static Map<String, Object> getAssocAndContentAndDataResourceCacheMethod(Delegator delegator, String contentId, String mapKey, String direction, - Timestamp fromDate, String fromDateStr, List<String> assocTypes, List<String> contentTypes, Boolean nullThruDatesOnly, String contentAssocPredicateId) throws GenericEntityException, MiniLangException { - Map<String, Object> results = getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, mapKey, direction, fromDate, fromDateStr, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId, null); - return results; - } - public static Map<String, Object> getAssocAndContentAndDataResourceCacheMethod(Delegator delegator, String contentId, String mapKey, String direction, Timestamp fromDate, String fromDateStr, List<String> assocTypes, List<String> contentTypes, Boolean nullThruDatesOnly, String contentAssocPredicateId, String orderBy) throws GenericEntityException, MiniLangException { - - //List exprList = FastList.newInstance(); - //EntityExpr joinExpr = null; - //EntityExpr expr = null; + EntityExpr joinExpr = null; String viewName = null; String contentFieldName = null; if (direction != null && direction.equalsIgnoreCase("From")) { - contentFieldName = "contentIdTo"; + contentFieldName = "caContentIdTo"; + joinExpr = EntityCondition.makeCondition("caContentIdTo", EntityOperator.EQUALS, contentId); } else { - contentFieldName = "contentId"; + contentFieldName = "caContentId"; + joinExpr = EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId); } if (direction != null && direction.equalsIgnoreCase("From")) { viewName = "ContentAssocDataResourceViewFrom"; } else { viewName = "ContentAssocDataResourceViewTo"; } - //if (Debug.infoOn()) Debug.logInfo("in getAssocAndContent...Cache, assocTypes:" + assocTypes, module); List<EntityCondition> conditionList = new ArrayList<EntityCondition>(); + conditionList.add(joinExpr); if (UtilValidate.isNotEmpty(mapKey)) { String mapKeyValue = "is null".equalsIgnoreCase(mapKey) ? null : mapKey; - conditionList.add(EntityCondition.makeCondition("mapKey", mapKeyValue)); + conditionList.add(EntityCondition.makeCondition("caMapKey", mapKeyValue)); } if (UtilValidate.isNotEmpty(contentAssocPredicateId)) { String contentAssocPredicateIdValue = "is null".equalsIgnoreCase(contentAssocPredicateId) ? null : contentAssocPredicateId; - conditionList.add(EntityCondition.makeCondition("mapKey", contentAssocPredicateIdValue)); + conditionList.add(EntityCondition.makeCondition("caMapKey", contentAssocPredicateIdValue)); } if (nullThruDatesOnly != null && nullThruDatesOnly) { - conditionList.add(EntityCondition.makeCondition("thruDate", null)); + conditionList.add(EntityCondition.makeCondition("caThruDate", null)); } if (UtilValidate.isNotEmpty(assocTypes)) { - conditionList.add(EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.IN, assocTypes)); + conditionList.add(EntityCondition.makeCondition("caContentAssocTypeId", EntityOperator.IN, assocTypes)); } if (fromDate == null && fromDateStr != null) { fromDate = UtilDateTime.toTimestamp(fromDateStr); } - List<GenericValue> contentAssocsTypeFiltered = EntityQuery.use(delegator).from("ContentAssoc") - .where(conditionList).orderBy("sequenceNum", "-fromDate") - .filterByDate(fromDate).cache().queryList(); - + List<GenericValue> contentAssocsTypeFiltered = EntityQuery.use(delegator).from(viewName) + .where(conditionList).orderBy("caSequenceNum", "-caFromDate").cache().queryList(); String assocRelationName = null; if (direction != null && direction.equalsIgnoreCase("To")) { @@ -259,7 +250,11 @@ public class ContentServicesComplex { GenericValue dataResource = null; List<GenericValue> contentAssocDataResourceList = FastList.newInstance(); Locale locale = Locale.getDefault(); // TODO: this needs to be passed in - for (GenericValue contentAssoc : contentAssocsTypeFiltered) { + try{ + for (GenericValue contentAssocView : contentAssocsTypeFiltered) { + GenericValue contentAssoc = EntityQuery.use(delegator).from("ContentAssoc").where(UtilMisc.toMap("contentId", contentAssocView.getString("contentId"), + "contentIdTo", contentAssocView.getString(contentFieldName), "contentAssocTypeId", contentAssocView.getString("caContentAssocTypeId"), + "fromDate", contentAssocView.getTimestamp("caFromDate"))).queryOne(); content = contentAssoc.getRelatedOne(assocRelationName, true); if (UtilValidate.isNotEmpty(contentTypes)) { String contentTypeId = (String)content.get("contentTypeId"); @@ -272,24 +267,21 @@ public class ContentServicesComplex { contentAssocDataResourceView.setAllFields(content, true, null, null); } SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, FastList.newInstance(), locale); - //if (Debug.infoOn()) Debug.logInfo("contentAssoc:" + contentAssoc, module); - //contentAssocDataResourceView.setAllFields(contentAssoc, false, null, null); String dataResourceId = content.getString("dataResourceId"); if (UtilValidate.isNotEmpty(dataResourceId)) dataResource = content.getRelatedOne("DataResource", true); - //if (Debug.infoOn()) Debug.logInfo("dataResource:" + dataResource, module); - //if (Debug.infoOn()) Debug.logInfo("contentAssocDataResourceView:" + contentAssocDataResourceView, module); if (dataResource != null) { - //contentAssocDataResourceView.setAllFields(dataResource, false, null, null); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceView, FastList.newInstance(), locale); } - //if (Debug.infoOn()) Debug.logInfo("contentAssocDataResourceView:" + contentAssocDataResourceView, module); contentAssocDataResourceList.add(contentAssocDataResourceView); } - - List<String> orderByList = null; + } catch (GenericEntityException e) { + Debug.logError(e, module); + return ServiceUtil.returnError(e.getMessage()); + } + if (UtilValidate.isNotEmpty(orderBy)) { - orderByList = StringUtil.split(orderBy, "|"); + List<String> orderByList = StringUtil.split(orderBy, "|"); contentAssocDataResourceList = EntityUtil.orderBy(contentAssocDataResourceList, orderByList); } Map<String, Object> results = FastMap.newInstance(); @@ -299,45 +291,4 @@ public class ContentServicesComplex { } return results; } - -/* - public static Map getSubContentAndDataResource(Delegator delegator, String contentId, String direction, Timestamp fromDate, String assocType, String contentType, String orderBy) throws GenericEntityException { - - List exprList = FastList.newInstance(); - EntityExpr joinExpr = null; - EntityExpr expr = null; - String viewName = null; - GenericValue contentAssoc = null; - String contentFieldName = null; - if (direction != null && direction.equalsIgnoreCase("From")) { - viewName = "ContentAssocDataResourceViewFrom"; - contentFieldName = "contentIdTo"; - joinExpr = EntityCondition.makeCondition("caContentIdTo", EntityOperator.EQUALS, contentId); - } else { - viewName = "ContentAssocDataResourceViewTo"; - contentFieldName = "contentId"; - joinExpr = EntityCondition.makeCondition("caContentId", EntityOperator.EQUALS, contentId); - } - exprList.add(joinExpr); - - if (UtilValidate.isNotEmpty(assocType)) { - expr = EntityCondition.makeCondition("caContentAssocTypeId", EntityOperator.EQUALS, assocType); - exprList.add(expr); - } - - if (UtilValidate.isNotEmpty(contentType)) { - expr = EntityCondition.makeCondition("caContentTypeId", EntityOperator.EQUALS, contentType); - exprList.add(expr); - } - - List orderByList = null; - if (UtilValidate.isNotEmpty(orderBy)) { - orderByList = StringUtil.split(orderBy, "|"); - contentAssocDataResourceList = EntityUtil.orderBy(contentAssocDataResourceList, orderByList); - } - HashMap results = FastMap.newInstance(); - results.put("entityList", contentAssocDataResourceList); - return results; - } -*/ } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java Mon Dec 8 10:21:56 2014 @@ -691,7 +691,7 @@ public class ContentWorker implements or Boolean nullThruDatesOnly = Boolean.TRUE; Map<String, Object> results = null; try { - results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, parentContentId, mapKey, direction, null, null, assocTypeList, contentTypeList, nullThruDatesOnly, contentAssocPredicateId); + results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, parentContentId, mapKey, direction, null, null, assocTypeList, contentTypeList, nullThruDatesOnly, contentAssocPredicateId, null); } catch (GenericEntityException e) { throw new RuntimeException(e.getMessage()); } catch (MiniLangException e2) { @@ -1110,7 +1110,7 @@ public class ContentWorker implements or try { // NOTE DEJ20060610: Changed "From" to "To" because it makes the most sense for sub-content renderings using a root-contentId and mapKey to determine the sub-contentId to have the ContentAssoc go from the root to the sub, ie try to determine the contentIdTo from the contentId and mapKey // This shouldn't be changed from "To" to "From", but if desired could be parameterized to make this selectable in higher up calling methods - results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, mapKey, "To", fromDate, null, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId); + results = ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod(delegator, contentId, mapKey, "To", fromDate, null, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId, null); } catch (MiniLangException e) { throw new RuntimeException(e.getMessage()); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Dec 8 10:21:56 2014 @@ -914,9 +914,13 @@ public class DataResourceWorker impleme mimeContext.put("textData", textData); String mimeString = DataResourceWorker.renderMimeTypeTemplate(mimeTypeTemplate, mimeContext); - out.append(mimeString); + if (mimeString != null) { + out.append(mimeString); + } } else { - out.append(textData); + if (textData != null) { + out.append(textData); + } } } else { out.append(textData); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Mon Dec 8 10:21:56 2014 @@ -21,52 +21,6 @@ <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> - <!-- Party Qualification --> - <simple-method method-name="createPartyQual" short-description="Create a Party Qualification"> - <make-value entity-name="PartyQual" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <field-to-result field="newEntity.partyId" result-name="partyId"/> - <field-to-result field="newEntity.partyQualTypeId" result-name="partyQualTypeId"/> - <field-to-result field="newEntity.fromDate" result-name="fromDate"/> - <create-value value-field="newEntity"/> - </simple-method> - - <!-- Ability Group --> - <simple-method method-name="updatePartyQual" short-description="Update Qualification of a Party"> - <entity-one entity-name="PartyQual" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePartyQual" short-description="Delete Qualification of a Party"> - <entity-one entity-name="PartyQual" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPartyResume" short-description="Create Resume for Party"> - <make-value entity-name="PartyResume" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="PartyResume" field="newEntity.resumeId"/> - <field-to-result field="resumeId" result-name="newEntity.resumeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePartyResume" short-description="Update a Resume of a Party"> - <entity-one entity-name="PartyResume" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePartyResume" short-description="Delete a Resume of a Party"> - <entity-one entity-name="PartyResume" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="createPartySkill" short-description="Create Party Skills"> <make-value entity-name="PartySkill" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -91,86 +45,8 @@ </if> </simple-method> - <simple-method method-name="updatePartySkill" short-description="Update Party Skills"> - <entity-one entity-name="PartySkill" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePartySkill" short-description="Delete a Skill of Party"> - <entity-one entity-name="PartySkill" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPerfReview" short-description="Create a Performance Review"> - <make-value entity-name="PerfReview" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="PerfReview" field="newEntity.perfReviewId"/> - <create-value value-field="newEntity"/> - <field-to-result field="newEntity.perfReviewId" result-name="perfReviewId"/> - <field-to-result field="newEntity.employeePartyId" result-name="employeePartyId"/> - <field-to-result field="newEntity.employeeRoleTypeId" result-name="employeeRoleTypeId"/> - </simple-method> - - <simple-method method-name="updatePerfReview" short-description="Update Performance Review"> - <entity-one entity-name="PerfReview" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - <field-to-result field="lookedUpValue.perfReviewId" result-name="perfReviewId"/> - <field-to-result field="lookedUpValue.employeePartyId" result-name="employeePartyId"/> - <field-to-result field="lookedUpValue.employeeRoleTypeId" result-name="employeeRoleTypeId"/> - </simple-method> - - <simple-method method-name="deletePerfReview" short-description="Delete Performance Review"> - <entity-one entity-name="PerfReview" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPerfReviewItem" short-description="Create Performance Review Items"> - <make-value entity-name="PerfReviewItem" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <make-next-seq-id value-field="newEntity" seq-field-name="perfReviewItemSeqId"/> - <field-to-result field="perfReviewItemSeqId" result-name="perfReviewItemSeqId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePerfReviewItem" short-description="Update Performance Review Items"> - <entity-one entity-name="PerfReviewItem" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePerfReviewItem" short-description="Delete Performance Review Items"> - <entity-one entity-name="PerfReviewItem" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPerformanceNote" short-description="Create Performance Note"> - <make-value entity-name="PerformanceNote" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePerformanceNote" short-description="Update Performance Note"> - <entity-one entity-name="PerformanceNote" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePerformanceNote" short-description="Delete Performance Note"> - <entity-one entity-name="PerformanceNote" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- Employment Group --> - <simple-method method-name="createEmployment" short-description="Create Employment"> + <simple-method method-name="createEmployment" short-description="Create Employment"><!--entity-auto--> <make-value entity-name="Employment" value-field="newEntity"/> <set-pk-fields value-field="newEntity" map="parameters"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> @@ -180,106 +56,10 @@ </if-empty> <create-value value-field="newEntity"/> - <set-service-fields service-name="createPayHistory" map="newEntity" to-map="createPayHistoryMap"/> + <set-service-fields service-name="createPayHistory" map="newEntity" to-map="createPayHistoryMap"/><!--create by seca--> <call-service service-name="createPayHistory" in-map-name="createPayHistoryMap"/> </simple-method> - <simple-method method-name="updateEmployment" short-description="Update Employment"> - <entity-one entity-name="Employment" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmployment" short-description="Delete Employment"> - <entity-one entity-name="Employment" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createEmploymentApp" short-description="Create an Employment Application"> - <make-value entity-name="EmploymentApp" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="EmploymentApp" field="newEntity.applicationId"/> - <field-to-result field="newEntity.applicationId" result-name="applicationId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmploymentApp" short-description="Update EmploymentApp"> - <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmploymentApp" short-description="Delete EmploymentApp"> - <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPartyBenefit" short-description="Create Party Benefit"> - <make-value entity-name="PartyBenefit" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePartyBenefit" short-description="Update Party Benefit"> - <entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePartyBenefit" short-description="Delete Party Benefit"> - <now-timestamp field="nowTimeStamp"/> - <entity-one entity-name="PartyBenefit" value-field="lookedUpValue"/> - <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> - <store-value value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPayGrade" short-description="Create a Pay Grade"> - <make-value entity-name="PayGrade" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-not-empty field="parameters.payGradeId"> - <set field="newEntity.payGradeId" from-field="parameters.payGradeId"/> - <else> - <sequenced-id sequence-name="PayGrade" field="newEntity.payGradeId"/> - </else> - </if-not-empty> - <field-to-result field="newEntity.payGradeId" result-name="payGradeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePayGrade" short-description="Update Pay Grade"> - <entity-one entity-name="PayGrade" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePayGrade" short-description="Delete Pay Grade"> - <entity-one entity-name="PayGrade" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createPayHistory" short-description="Create Pay History"> - <make-value entity-name="PayHistory" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePayHistory" short-description="Update Pay History"> - <entity-one entity-name="PayHistory" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deletePayHistory" short-description="Delete Pay History"> <now-timestamp field="nowTimeStamp"/> <entity-one entity-name="PayHistory" value-field="lookedUpValue"/> @@ -288,131 +68,6 @@ <remove-value value-field="lookedUpValue"/> </simple-method> - <simple-method method-name="createPayrollPreference" short-description="Create a Payroll Preference"> - <make-value entity-name="PayrollPreference" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="PayrollPreference" field="newEntity.payrollPreferenceSeqId"/> - <field-to-result field="payrollPreferenceSeqId" result-name="payrollPreferenceSeqId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updatePayrollPreference" short-description="Update Payroll Preference"> - <entity-one entity-name="PayrollPreference" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deletePayrollPreference" short-description="Delete Payroll Preference"> - <entity-one entity-name="PayrollPreference" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createSalaryStep" short-description="Create a Salary Step"> - <make-value entity-name="SalaryStep" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="SalaryStep" field="newEntity.salaryStepSeqId"/> - <field-to-result field="salaryStepSeqId" result-name="salaryStepSeqId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateSalaryStep" short-description="Update Salary Step"> - <entity-one entity-name="SalaryStep" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteSalaryStep" short-description="Delete Salary Step"> - <entity-one entity-name="SalaryStep" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createTerminationReason" short-description="Create a Termination Reason"> - <make-value entity-name="TerminationReason" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.terminationReasonId"> - <sequenced-id sequence-name="TerminationReason" field="newEntity.terminationReasonId"/> - </if-empty> - <field-to-result field="newEntity.terminationReasonId" result-name="terminationReasonId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateTerminationReason" short-description="Update Termination Reason"> - <entity-one entity-name="TerminationReason" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteTerminationReason" short-description="Delete Termination Reason"> - <entity-one entity-name="TerminationReason" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createUnemploymentClaim" short-description="Create a Unemployment Claim"> - <make-value entity-name="UnemploymentClaim" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="UnemploymentClaim" field="newEntity.unemploymentClaimId"/> - <field-to-result field="newEntity.unemploymentClaimId" result-name="unemploymentClaimId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateUnemploymentClaim" short-description="Update Unemployment Claim"> - <entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteUnemploymentClaim" short-description="Delete Unemployment Claim"> - <now-timestamp field="nowTimeStamp"/> - <entity-one entity-name="UnemploymentClaim" value-field="lookedUpValue"/> - <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <!-- Employee Position Group --> - <simple-method method-name="createEmplPosition" short-description="Create a Employee Position"> - <make-value entity-name="EmplPosition" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="EmplPosition" field="newEntity.emplPositionId"/> - <field-to-result field="newEntity.emplPositionId" result-name="emplPositionId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplPosition" short-description="Update Employee Position"> - <entity-one entity-name="EmplPosition" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplPosition" short-description="Delete Employee Position"> - <entity-one entity-name="EmplPosition" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createEmplPositionFulfillment" short-description="Create a Emplyoee Position Fulfillment"> - <make-value entity-name="EmplPositionFulfillment" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplPositionFulfillment" short-description="Update Employee Position Fulfillment"> - <entity-one entity-name="EmplPositionFulfillment" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplPositionFulfillment" short-description="Delete Employee Position Fulfillment"> - <entity-one entity-name="EmplPositionFulfillment" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="createEmplPositionReportingStruct" short-description="Create a Employee Position Reporting Structure"> <make-value entity-name="EmplPositionReportingStruct" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -437,83 +92,6 @@ </if> </simple-method> - <simple-method method-name="updateEmplPositionReportingStruct" short-description="Update Employee Position Reporting Structure"> - <entity-one entity-name="EmplPositionReportingStruct" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplPositionReportingStruct" short-description="Delete Employee Position Reporting Structure"> - <entity-one entity-name="EmplPositionReportingStruct" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createEmplPositionResponsibility" short-description="Create a Employee Position Responsibility"> - <make-value entity-name="EmplPositionResponsibility" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplPositionResponsibility" short-description="Update Employee Position Responsibility"> - <entity-one entity-name="EmplPositionResponsibility" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplPositionResponsibility" short-description="Delete Employee Position Responsibility"> - <entity-one entity-name="EmplPositionResponsibility" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createValidResponsibility" short-description="Create a Valid Responsibility"> - <make-value entity-name="ValidResponsibility" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimeStamp"/> - <set field="newEntity.fromDate" from-field="nowTimeStamp"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateValidResponsibility" short-description="Update Valid Responsibility"> - <entity-one entity-name="ValidResponsibility" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteValidResponsibility" short-description="Delete Valid Responsibility"> - <entity-one entity-name="ValidResponsibility" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- Skill Types --> - <simple-method method-name="createSkillType" short-description="Create a SkillType"> - <make-value entity-name="SkillType" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.skillTypeId"> - <sequenced-id sequence-name="SkillType" field="newEntity.skillTypeId"/> - </if-empty> - <field-to-result field="newEntity.skillTypeId" result-name="skillTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateSkillType" short-description="Update SkillType"> - <entity-one entity-name="SkillType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteSkillType" short-description="Delete SkillType"> - <entity-one entity-name="SkillType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="createEmployee" short-description="Create New Employee"> <set field="parameters.roleTypeId" value="EMPLOYEE"/> <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"/> @@ -534,72 +112,6 @@ <field-to-result field="partyId"/> </simple-method> - <!-- Responsibility Types --> - <simple-method method-name="createResponsibilityType" short-description="Create a ResponsibilityType"> - <make-value entity-name="ResponsibilityType" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.responsibilityTypeId"> - <sequenced-id sequence-name="ResponsibilityType" field="newEntity.responsibilityTypeId"/> - </if-empty> - <field-to-result field="newEntity.responsibilityTypeId" result-name="responsibilityTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateResponsibilityType" short-description="Update ResponsibilityType"> - <entity-one entity-name="ResponsibilityType" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteResponsibilityType" short-description="Delete ResponsibilityType"> - <entity-one entity-name="ResponsibilityType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createTerminationType" short-description="Create a TerminationType"> - <make-value entity-name="TerminationType" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.terminationTypeId"> - <sequenced-id sequence-name="TerminationType" field="newEntity.terminationTypeId"/> - </if-empty> - <field-to-result field="newEntity.terminationTypeId" result-name="terminationTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateTerminationType" short-description="Update TerminationType"> - <entity-one entity-name="TerminationType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteTerminationType" short-description="Delete TerminationType"> - <entity-one entity-name="TerminationType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createEmplPositionType" short-description="Create a PositionType"> - <make-value entity-name="EmplPositionType" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.emplPositionTypeId"> - <sequenced-id sequence-name="EmplPositionType" field="newEntity.emplPositionTypeId"/> - </if-empty> - <field-to-result field="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplPositionType" short-description="Update PositionType"> - <entity-one entity-name="EmplPositionType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplPositionType" short-description="Delete EmplPositionType"> - <entity-one entity-name="EmplPositionType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="updateEmplPositionTypeRate" short-description="Update/create EmplPositionTypeRate"> <entity-one entity-name="EmplPositionTypeRate" value-field="lookedUpValue"/> <!-- check if already exist is so expire current record --> @@ -635,25 +147,6 @@ <call-service service-name="deleteRateAmount" in-map-name="delRateAmount"/> </simple-method> - <simple-method method-name="createAgreementEmploymentAppl" short-description="Create Agreement Employment Appl"> - <make-value entity-name="AgreementEmploymentAppl" value-field="agreementEmploymentAppl"/> - <set-pk-fields value-field="agreementEmploymentAppl" map="parameters"/> - <set-nonpk-fields value-field="agreementEmploymentAppl" map="parameters"/> - <create-value value-field="agreementEmploymentAppl"/> - <check-errors/> - </simple-method> - - <simple-method method-name="updateAgreementEmploymentAppl" short-description="update an Agreement Employment Appl"> - <entity-one entity-name="AgreementEmploymentAppl" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteAgreementEmploymentAppl" short-description="Delete Agreement Employment Appl"> - <entity-one entity-name="AgreementEmploymentAppl" value-field="agreementEmploymentAppl"/> - <remove-value value-field="agreementEmploymentAppl"/> - </simple-method> - <simple-method method-name="createEmplLeave" short-description="Create Employee Leave"> <make-value entity-name="EmplLeave" value-field="newEntity"/> <set-pk-fields value-field="newEntity" map="parameters"/> @@ -664,39 +157,6 @@ <field-to-result field="responseMessage" result-name="successMessage"/> </simple-method> - <simple-method method-name="updateEmplLeave" short-description="Update Employee Leave"> - <entity-one entity-name="EmplLeave" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplLeave" short-description="Delete Employee Leave"> - <entity-one entity-name="EmplLeave" value-field="emplLeave"/> - <remove-value value-field="emplLeave"/> - </simple-method> - - <simple-method method-name="createEmplLeaveType" short-description="Create a LeaveType"> - <make-value entity-name="EmplLeaveType" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.leaveTypeId"> - <sequenced-id sequence-name="EmplLeaveType" field="newEntity.leaveTypeId"/> - </if-empty> - <field-to-result field="newEntity.leaveTypeId" result-name="leaveTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplLeaveType" short-description="Update leaveType"> - <entity-one entity-name="EmplLeaveType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplLeaveType" short-description="Delete leaveType"> - <entity-one entity-name="EmplLeaveType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="getCurrentPartyEmploymentData" short-description="Get all current employment information for a certain partyId"> <!-- party benefit --> <entity-and entity-name="BenefitTypeAndParty" list="partyBenefitTypes" filter-by-date="true"> @@ -732,104 +192,7 @@ <first-from-list entry="rateAmount" list="rateAmounts"/> <field-to-result field="rateAmount" result-name="emplPositionRateAmount"/> </simple-method> - - <simple-method method-name="createJobRequisition" short-description="Create Job Requisition"> - <make-value entity-name="JobRequisition" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="JobRequisition" field="newEntity.jobRequisitionId"/> - <field-to-result field="newEntity.jobRequisitionId" result-name="jobRequisitionId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateJobRequisition" short-description="Update Job Requisition"> - <entity-one entity-name="JobRequisition" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteJobRequisition" short-description="Delete Job Requisition"> - <entity-one entity-name="JobRequisition" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createInternalJobPosting" short-description="Create Internal Job Posting"> - <make-value entity-name="EmploymentApp" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="EmploymentApp" field="newEntity.applicationId"/> - <field-to-result field="newEntity.applicationId" result-name="applicationId"/> - <if-empty field="newEntity.applicationDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.applicationDate"/> - </if-empty> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateInternalJobPosting" short-description="Update Internal Job Posting"> - <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteInternalJobPosting" short-description="Delete Internal Job Posting"> - <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createJobInterview" short-description="Create Job Interview"> - <make-value entity-name="JobInterview" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <sequenced-id sequence-name="JobInterview" field="newEntity.jobInterviewId"/> - <field-to-result field="newEntity.jobInterviewId" result-name="jobInterviewId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateJobInterview" short-description="Update Job Interview"> - <entity-one entity-name="JobInterview" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteJobInterview" short-description="Delete Job Interview"> - <entity-one entity-name="JobInterview" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createJobInterviewType" short-description="Create Job Interview Type"> - <make-value entity-name="JobInterviewType" value-field="newEntity" /> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="parameters.jobInterviewTypeId"> - <sequenced-id sequence-name="JobInterviewType" field="newEntity.jobInterviewTypeId"/> - <else> - <set from-field="parameters.jobInterviewTypeId" field="newEntity.jobInterviewTypeId"/> - </else> - </if-empty> - <field-to-result field="newEntity.jobInterviewTypeId" result-name="jobInterviewTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateJobInterviewType" short-description="Update Interview Type"> - <entity-one entity-name="JobInterviewType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteJobInterviewType" short-description="Delete Interview Type"> - <entity-one entity-name="JobInterviewType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="updateApprovalStatus" short-description="Update Approval Status"> - <entity-one entity-name="EmploymentApp" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="updateTrainingStatus" short-description="Update Training Status"> - <entity-one entity-name="PersonTraining" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - + <simple-method method-name="applyTraining" short-description="Apply Training"> <make-value entity-name="TrainingRequest" value-field="trainingRequest"/> <make-next-seq-id value-field="trainingRequest" seq-field-name="trainingRequestId"/> @@ -844,6 +207,7 @@ <create-value value-field="personTraining"/> <check-errors/> </simple-method> + <simple-method method-name="assignTraining" short-description="Assign Training"> <make-value entity-name="TrainingRequest" value-field="trainingRequest"/> <make-next-seq-id value-field="trainingRequest" seq-field-name="trainingRequestId"/> @@ -857,51 +221,5 @@ <create-value value-field="personTraining"/> <check-errors/> </simple-method> - - <simple-method method-name="createTrainingTypes" short-description="Create Training Types"> - <make-value entity-name="TrainingClassType" value-field="newEntity"/> - <set-pk-fields value-field="newEntity" map="parameters"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateTrainingTypes" short-description="Update Training Types"> - <entity-one entity-name="TrainingClassType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteTrainingTypes" short-description="Delete Training Types"> - <entity-one entity-name="TrainingClassType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="createEmplLeaveReasonType" short-description="Create a Leave Reason Type"> - <make-value entity-name="EmplLeaveReasonType" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <if-empty field="newEntity.emplLeaveReasonTypeId"> - <sequenced-id sequence-name="EmplLeaveReasonType" field="newEntity.emplLeaveReasonTypeId"/> - </if-empty> - <field-to-result field="newEntity.emplLeaveReasonTypeId" result-name="emplLeaveReasonTypeId"/> - <create-value value-field="newEntity"/> - </simple-method> - - <simple-method method-name="updateEmplLeaveReasonType" short-description="Update leave Reason Type"> - <entity-one entity-name="EmplLeaveReasonType" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="deleteEmplLeaveReasonType" short-description="Delete leave Reason Type"> - <entity-one entity-name="EmplLeaveReasonType" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <simple-method method-name="updateEmplLeaveStatus" short-description="Update Leave Approval Status"> - <entity-one entity-name="EmplLeave" value-field="lookedUpValue"/> - <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - + </simple-methods> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |