Author: hansbak
Date: Sun Jan 16 13:39:29 2011
New Revision: 1059556
URL: http://svn.apache.org/viewvc?rev=1059556&view=rev
Log:
some more improvements to the peformance review item list
Modified:
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/HumanresMenus.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=1059556&r1=1059555&r2=1059556&view=diff
==============================================================================
---
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
(original)
+++
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
Sun Jan 16 13:39:29 2011
@@ -126,7 +126,7 @@
<make-value entity-name="PerfReviewItem" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <sequenced-id sequence-name="PerfReviewItem"
field="newEntity.perfReviewItemSeqId"/>
+ <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>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1059556&r1=1059555&r2=1059556&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sun Jan 16
13:39:29 2011
@@ -205,17 +205,22 @@ under the License.
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
- <!-- do check for PartyAbility, _VIEW permission
-->
<condition>
<if-has-permission permission="HUMANRES"
action="_VIEW"/>
</condition>
<widgets>
<section>
<condition>
- <not><if-empty
field="perfReviewId"/></not>
+ <not><if-empty
field="perfReview"/></not>
</condition>
+ <actions>
+ <entity-one
value-field="partyNameView" entity-name="PartyNameView">
+ <field-map field-name="partyId"
from-field="perfReview.employeePartyId"/>
+ </entity-one>
+ </actions>
<widgets>
- <include-menu name="PartyBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <include-menu name="PerfReviewBar"
location="component://humanres/widget/HumanresMenus.xml"/>
+ <label style="h1"
text="${uiLabelMap.HumanResPerfReview} [${perfReview.perfReviewId}]
${partyNameView.lastName} ${partyNameView.firstName}
${partyNameView.middleName}"></label>
</widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml?rev=1059556&r1=1059555&r2=1059556&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Sun Jan 16
13:39:29 2011
@@ -120,8 +120,7 @@
</link>
</menu-item>
</menu>
- <menu name="PartyBar" default-menu-item-name="EditPerfReviewItems"
default-selected-style="selected"
- type="simple" menu-container-style="button-bar tab-bar"
selected-menuitem-context-field-name="tabButtonItem">
+ <menu name="PerfReviewBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="EditPerfReview"
title="${uiLabelMap.HumanResPerfReview}">
<link target="EditPerfReview">
<parameter param-name="employeePartyId"/>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1059556&r1=1059555&r2=1059556&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sun Jan
16 13:39:29 2011
@@ -81,6 +81,11 @@ under the License.
</entity-condition>
</actions>
<auto-fields-service default-field-type="display"
service-name="updatePerfReviewItem"/>
+ <field name="employeePartyId"><ignored/></field>
+ <field name="employeeRoleTypeId"><ignored/></field>
+ <field name="perfReviewId"><ignored/></field>
+ <field name="perfReviewItemTypeId"><display-entity
entity-name="PerfReviewItemType"></display-entity></field>
+ <field name="perfRatingTypeId"><display-entity
entity-name="PerfRatingType"></display-entity></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
<hyperlink target="deletePerfReviewItem"
description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="perfReviewId"/>
