Author: hansbak
Date: Sat Jan 15 08:13:59 2011
New Revision: 1059271
URL: http://svn.apache.org/viewvc?rev=1059271&view=rev
Log:
revert 1058891, agreed with jacopo so he can implement a better solution.
Modified:
ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Sat Jan 15
08:13:59 2011
@@ -153,17 +153,5 @@ under the License.
<EmplLeaveReasonType description="Medical" hasTable="N" parentTypeId=""
emplLeaveReasonTypeId="Fever"/>
<EmplLeaveReasonType description="Casual" hasTable="N" parentTypeId=""
emplLeaveReasonTypeId="Personal Work"/>
-
- <PerfReviewItemType perfRatingTypeId="TECH" hasTable="N"
description="Technical skills"/>
- <PerfReviewItemType perfRatingTypeId="RESP" hasTable="N"
description="Responsibility"/>
- <PerfReviewItemType perfRatingTypeId="ATT" hasTable="N"
description="Attitude"/>
- <PerfReviewItemType perfRatingTypeId="COMM" hasTable="N"
description="Communication skills"/>
- <PerfReviewItemType perfRatingTypeId="JOBSAT" hasTable="N"
description="Job Satisfaction"/>
-
- <PerfRatingType perfRatingTypeId="1" hasTable="N" description="Fails to
Meet Expectations"/>
- <PerfRatingType perfRatingTypeId="2" hasTable="N"
description="Inconsistently Fulfills"/>
- <PerfRatingType perfRatingTypeId="3" hasTable="N" description="Fulfilled
Expectations"/>
- <PerfRatingType perfRatingTypeId="4" hasTable="N" description="Frequently
Exceeds"/>
- <PerfRatingType perfRatingTypeId="5" hasTable="N"
description="Consistently Exceeds"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Sat Jan 15
08:13:59 2011
@@ -164,13 +164,15 @@ under the License.
<entity entity-name="PerfReviewItem"
package-name="org.ofbiz.humanres.ability"
title="Performance Review Item Entity">
+ <field name="employeePartyId" type="id-ne"></field>
+ <field name="employeeRoleTypeId" type="id"></field>
<field name="perfReviewId" type="id-ne"></field>
<field name="perfReviewItemSeqId" type="id-ne"></field>
<field name="perfRatingTypeId" type="id"></field>
<field name="perfReviewItemTypeId" type="id"></field>
- <field name="employeePartyId" type="id-ne"></field>
- <field name="employeeRoleTypeId" type="id"></field>
<field name="comments" type="comment"></field>
+ <prim-key field="employeePartyId"/>
+ <prim-key field="employeeRoleTypeId"/>
<prim-key field="perfReviewId"/>
<prim-key field="perfReviewItemSeqId"/>
<relation type="one" fk-name="PERF_RVITM_PFRV"
rel-entity-name="PerfReview">
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat Jan 15
08:13:59 2011
@@ -216,7 +216,6 @@ under the License.
</condition>
<widgets>
<include-menu name="PartyBar"
location="component://humanres/widget/HumanresMenus.xml"/>
- <label style="h1"
text="${uiLabelMap.HumanResPerfReview} ${uiLabelMap.CommonId} ${perfReviewId}"/>
</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=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Sat Jan 15
08:13:59 2011
@@ -122,11 +122,6 @@
</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-item name="EditPerfReview"
title="${uiLabelMap.HumanResPerfReview}">
- <link target="EditPerfReview">
- <parameter param-name="perfReviewId"/>
- </link>
- </menu-item>
<menu-item name="EditPerfReviewItems"
title="${uiLabelMap.HumanResEditPerfReviewItems}">
<link target="EditPerfReviewItems">
<parameter param-name="perfReviewId"/>
Modified: ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml Sat Jan 15
08:13:59 2011
@@ -62,7 +62,7 @@
<entity-one entity-name="PerfReview" value-field="perfReview"/>
</actions>
<widgets>
- <decorator-screen name="CommonPerfReviewDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.CommonEdit}
${uiLabelMap.HumanResPerfReview}">
<section>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=1059271&r1=1059270&r2=1059271&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Jan
15 08:13:59 2011
@@ -101,7 +101,7 @@ under the License.
<form name="AddPerfReviewItem" type="single" target="createPerfReviewItem"
title=""
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPerfReviewItem"/>
- <field name="perfReviewId"><hidden
value="${parameters.perfReviewId}"/></field>
+ <field name="perfReviewId"><hidden/></field>
<field name="perfReviewItemSeqId"><ignored/></field>
<field name="employeePartyId"><hidden/></field>
<field name="employeeRoleTypeId"><hidden/></field>
