Author: hansbak
Date: Mon Jan 17 05:41:54 2011
New Revision: 1059755
URL: http://svn.apache.org/viewvc?rev=1059755&view=rev
Log:
more enhancements to performance review
Modified:
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
Modified:
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=1059755&r1=1059754&r2=1059755&view=diff
==============================================================================
---
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
(original)
+++
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
Mon Jan 17 05:41:54 2011
@@ -107,14 +107,19 @@
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<sequenced-id sequence-name="PerfReview"
field="newEntity.perfReviewId"/>
- <field-to-result field="perfReviewId" result-name="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">
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=1059755&r1=1059754&r2=1059755&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Mon Jan 17
05:41:54 2011
@@ -100,16 +100,18 @@ under the License.
location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml"
invoke="createPerfReview" auth="true">
<description>Create an Performance Review</description>
<permission-service service-name="humanResManagerPermission"
main-action="CREATE"/>
- <auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
- <override type="String" mode="IN" name="perfReviewId" optional="true"/>
+ <attribute mode="IN" type="String" name="perfReviewId"
optional="true"/>
+ <attribute mode="OUT" type="String" name="perfReviewId"
optional="false"/>
+ <attribute mode="INOUT" type="String" name="employeePartyId"
optional="false"/>
+ <attribute mode="INOUT" type="String" name="employeeRoleTypeId"
optional="false"/>
</service>
<service name="updatePerfReview" engine="simple"
default-entity-name="PerfReview"
location="component://humanres/script/org/ofbiz/humanres/HumanResServices.xml"
invoke="updatePerfReview" auth="true">
<description>Update a Performance Review</description>
<permission-service service-name="humanResManagerPermission"
main-action="UPDATE"/>
- <auto-attributes mode="IN" include="pk" optional="false"/>
+ <auto-attributes mode="INOUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1059755&r1=1059754&r2=1059755&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
Mon Jan 17 05:41:54 2011
@@ -142,12 +142,14 @@ under the License.
<request-map uri="createPerfReview">
<security https="true" auth="true"/>
<event type="service" invoke="createPerfReview"/>
- <response name="success" type="view" value="EditPerfReviews"/>
+ <response name="error" type="view" value="EditPerfReviews"/>
+ <response name="success" type="request-redirect"
value="EditPerfReview"/>
</request-map>
<request-map uri="updatePerfReview">
<security https="true" auth="true"/>
<event type="service" invoke="updatePerfReview"/>
- <response name="success" type="view" value="EditPerfReviews"/>
+ <response name="error" type="view" value="EditPerfReviews"/>
+ <response name="success" type="view" value="EditPerfReview"/>
</request-map>
<request-map uri="deletePerfReview">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1059755&r1=1059754&r2=1059755&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Mon Jan
17 05:41:54 2011
@@ -56,7 +56,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="perfReview==null" target="createPerfReview"/>
<auto-fields-service service-name="updatePerfReview"
map-name="perfReview"/>
- <field name="perfReviewId" use-when="perfReview==null"
tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup
target-form-name="LookupPerfReview"/></field>
+ <field name="perfReviewId" use-when="perfReview==null"><text/></field>
<field name="perfReviewId" use-when="perfReview!=null"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="employeePartyId" use-when="perfReview==null"
tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup
target-form-name="LookupPartyName"/></field>
<field name="employeePartyId" use-when="perfReview!=null"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
