You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/28 17:25:39 UTC

svn commit: r660980 [2/5] - in /ofbiz/trunk/applications/humanres: config/ webapp/humanres/WEB-INF/ widget/ widget/forms/

Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=660980&r1=660979&r2=660980&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Wed May 28 08:25:38 2008
@@ -30,7 +30,7 @@
                 <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
                 <set field="partyIdTo" from-field="parameters.partyIdTo"/>
                 <set field="fromDate" from-field="parameters.fromDate"/>                                                
-                <entity-one entity-name="Employment" value-name="employment"/>
+                <set field="employmentCtx" from-field="parameters"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
@@ -40,7 +40,7 @@
                                 <section>
                                     <widgets>
                                         <container style="button-bar">
-                                            <link target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;fromDate=${fromDate}" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
+                                            <link target="EditEmployment" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
                                         </container>
                                     </widgets>
                                 </section>
@@ -63,11 +63,7 @@
                 <set field="titleProperty" value="HumanResEditEmployment"/>
                 <set field="headerItem" value="Employment"/>
                 <set field="tabButtonItem" value="EditEmployment"/>
-                <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
-                <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
-                <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
-                <set field="partyIdTo" from-field="parameters.partyIdTo"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>                                                
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>                                                
                 <entity-one entity-name="Employment" value-name="employment"/>
             </actions>
             <widgets>
@@ -92,71 +88,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="FindEmploymentApp">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResFindEmploymentApp"/>
-                <set field="headerItem" value="EmploymentApp"/>
-                <set field="employmentAppCtx" from-field="parameters"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResFindEmploymentApp}">
-                            <section>
-                                <widgets>
-                                    <container>
-                                        <link target="NewEmploymentApp" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmploymentApp}" style="buttontext"/>
-                                    </container>
-                                    <include-form name="FindEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmploymentApp}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>    
-    <screen name="NewEmploymentApp">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResNewEmploymentApp"/>
-                <set field="headerItem" value="EmploymentApp"/>
-                <set field="applicationId" from-field="parameters.applicationId"/>
-                <entity-one entity-name="EmploymentApp" value-name="employmentApp"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResNewEmploymentApp}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <container>
-                                            <link text="${uiLabelMap.HumanResNewEmploymentApp}" target="NewEmploymentApp" style="buttontext"/>
-                                        </container>
-                                        <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>                        
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>    
     <screen name="ListPayHistories">
         <section>
             <actions>
@@ -167,20 +98,13 @@
             <widgets>
                 <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResListPayHistories}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="ListPayHistories" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>  
+                        <screenlet title="${uiLabelMap.HumanResListPayHistories}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListPayHistories" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                </widgets>
+                            </section>                            
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -196,39 +120,25 @@
                 <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
                 <set field="partyIdTo" from-field="parameters.partyIdTo"/>
                 <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResListPartyBenefits}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResNewPartyBenefit}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.HumanResListPartyBenefits}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.HumanResAddPartyBenefit}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -240,6 +150,11 @@
                 <set field="titleProperty" value="HumanResListPayrollPreferences"/>
                 <set field="headerItem" value="Employment"/>
                 <set field="tabButtonItem" value="EditPayrollPreference"/>
+                <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
+                <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
+                <set field="partyIdTo" from-field="parameters.partyIdTo"/>
+                <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <set field="payrollPreferenceSeqId" from-field="parameters.payrollPreferenceSeqId"/>
                 <set field="partyId" from-field="parameters.partyIdTo"/>
                 <set field="roleTypeId" from-field="parameters.roleTypeIdTo"/>                
@@ -248,123 +163,26 @@
             <widgets>
                 <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResListPayrollPreferences}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResNewPayrollPreferences}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>    
-    <screen name="EditPayGrade">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResEditPayGrade"/>
-                <set field="headerItem" value="PayGrade"/>
-                <set field="tabButtonItem" value="EditPayGrade"/>
-                <set field="payGradeId" from-field="parameters.payGradeId"/>
-                <entity-one entity-name="PayGrade" value-name="payGrade"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResEditPayGrade}">
+                        <screenlet title="${uiLabelMap.HumanResListPayrollPreferences}">
                             <section>
                                 <widgets>
-                                    <include-form name="EditPayGrade" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                    <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                 </widgets>
                             </section>
                         </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditSalarySteps">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResEditSalaryStep"/>
-                <set field="headerItem" value="PayGrade"/>
-                <set field="tabButtonItem" value="EditSalaryStep"/>                
-                <set field="payGradeId" from-field="parameters.payGradeId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleListSalarySteps}">
-                            <include-form name="ListSalarySteps" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResAddSalaryStep}">
-                            <include-form name="AddSalaryStep" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section> 
-    </screen>
-    <screen name="EditTerminationReason">
-        <section>            
-            <actions>
-                <set field="titleProperty" value="HumanResAddTerminationReason"/>
-                <set field="tabButtonItem" value="TerminationReason"/>
-                <set field="terminationReasonId" from-field="parameters.terminationReasonId" />
-                <entity-one entity-name="TerminationReason" value-name="terminationReason" />
-            </actions>            
-            <widgets>
-                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                        
-                        <screenlet title="${uiLabelMap.HumanResListTerminationReasons}">
+                        <screenlet title="${uiLabelMap.HumanResAddPayrollPreference}">
                             <section>
                                 <widgets>
-                                    <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                    <include-form name="AddPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                 </widgets>
                             </section>
                         </screenlet>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResAddTerminationReason}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddTerminationReason" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
                     </decorator-section>
                 </decorator-screen>
-            </widgets>                              
+            </widgets>
         </section>
     </screen>    
-    <screen name="EditUnemploymentClaim">
+    <screen name="EditUnemploymentClaims">
         <section>            
             <actions>
                 <set field="titleProperty" value="HumanResAddUnemploymentClaim"/>
@@ -375,7 +193,7 @@
                 <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
                 <set field="partyIdTo" from-field="parameters.partyIdTo"/>
                 <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
-                <set field="fromDate" from-field="parameters.fromDate"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
                 <entity-one entity-name="UnemploymentClaim" value-name="unemploymentClaim" />
             </actions>            
             <widgets>
@@ -388,245 +206,16 @@
                                 </widgets>
                             </section>
                         </screenlet>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.HumanResAddUnemploymentClaim}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>                              
-        </section>
-    </screen>
-    <screen name="FindEmployee">
-        <section>                        
-            <actions>
-                <set field="titleProperty" value="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployee}"/>
-                <set field="headerItem" value="Employee"/>
-            </actions>            
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                                                       
-                        <section>
-                            <actions>
-                                <service service-name="findParty" auto-field-map="true"/>
-                                <set field="tabButtonItem" value="Employee"/>
-                            </actions>
-                            <widgets>
-                                <container>
-                                    <link target="CreateEmployee" text="${uiLabelMap.PartyCreateNewEmployee}" style="buttontext" />
-                                </container>
-                                <section>
-                                    <widgets>
-                                        <platform-specific>
-                                            <html><html-template location="component://humanres/webapp/humanres/humanres/findEmployee.ftl"/></html>
-                                        </platform-specific>                                        
-                                    </widgets>
-                                </section>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>            
-        </section>
-    </screen>
-    <screen name="CreateEmployee">
-        <section>                        
-            <actions>
-                <set field="titleProperty" value="PartyCreateNewEmployee"/>
-                <set field="headerItem" value="Employee"/>
-                <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
-            </actions>            
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">                                                                                       
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.PartyCreateNewEmployee}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="CreateEmployee" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>            
-        </section>
-    </screen> 
-    <screen name="EditPartySkills">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResViewPartySkill"/>
-                <set field="headerItem" value="Employee"/>            
-                <set field="tabButtonItem" value="EditPartySkills"/>    
-                <set field="partyId" from-field="parameters.partyId"/>
-                <set field="skillTypeId" from-field="parameters.skillTypeId"/>
-                <set field="partySkillsCtx.partyId" from-field="parameters.partyId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResListPartySkill}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewPartySkill}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section> 
-    </screen>
-    <screen name="EditPersonTrainings">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResViewPersonTraining"/>
-                <set field="headerItem" value="Employee"/>
-                <set field="tabButtonItem" value="EditPersonTrainings"/>
-                <set field="partyId" from-field="parameters.partyId"/>
-                <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/>
-                <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResListPersonTraining}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewPersonTraining}">
+                        <screenlet title="${uiLabelMap.HumanResAddUnemploymentClaim}">
                             <section>
                                 <widgets>
-                                    <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+                                    <include-form name="AddUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                 </widgets>
-                            </section>
+                            </section>                            
                         </screenlet>
                     </decorator-section>
                 </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditPartyResumes">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResViewPartyResume"/>
-                <set field="headerItem" value="Employee"/>
-                <set field="tabButtonItem" value="EditPartyResumes"/>
-                <set field="partyId" from-field="parameters.partyId"/>
-                <set field="partyResumeCtx.resumeId" from-field="parameters.resumeId"/>
-                <set field="resumeId" from-field="parameters.resumeId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResListPartyResumes}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewPartyResume}">
-                            <section>
-                                <widgets>
-                                    <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditEmploymentApps">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResViewEmploymentApp"/>
-                <set field="headerItem" value="Employee"/>
-                <set field="tabButtonItem" value="EditEmploymentApps"/>
-                <set field="referredByPartyId" from-field="parameters.partyId"/>
-                <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/> 
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmploymentApp}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditPartyQuals">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResViewPartyQual"/>
-                <set field="headerItem" value="Employee"/>
-                <set field="tabButtonItem" value="EditPartyQuals"/>
-                <set field="partyId" from-field="parameters.partyId"/>
-                <set field="partyQualCtx.partyId" from-field="parameters.partyId"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.HumanResListPartyQual}">
-                            <section>
-                                <widgets>
-                                    <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResAddPartyQual}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
+            </widgets>                              
         </section>
     </screen>
     <screen name="EditPerformanceNotes">
@@ -659,79 +248,40 @@
             </widgets>
         </section>
     </screen>
-    <screen name="FindPayGrades">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResFindPayGrade"/>
-                <set field="headerItem" value="PayGrade"/>
-                <set field="payGradeId" from-field="parameters.payGradeId"/>
-                <set field="payGradeCtx" from-field="parameters"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
-                            <decorator-section name="menu-bar">
-                                <section>
-                                    <widgets>
-                                        <container style="button-bar">
-                                            <link target="EditPayGrade" text="${uiLabelMap.HumanResNewPayGrade}" style="buttontext"/>
-                                        </container>
-                                    </widgets>
-                                </section>
-                            </decorator-section>
-                            <decorator-section name="search-options">
-                                <include-form name="FindPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                            </decorator-section>
-                            <decorator-section name="search-results">
-                                <include-form name="ListPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml" />
-                            </decorator-section>
-                        </decorator-screen>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="EditAgreementEmploymentAppls">
         <section>                        
             <actions>
-                <set field="headerItem" value="AgreementEmploymentAppl"/>
                 <set field="titleProperty" value="EditAgreementEmploymentAppls"/>
+                <set field="headerItem" value="Employment"/>
+                <set field="tabButtonItem" value="EditAgreementEmploymentAppls"/>
+                <set field="agreementId" from-field="parameters.agreementId"/>
+                <set field="agreementItemSeqId" from-field="parameters.agreementItemSeqId"/>
+                <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/>
+                <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/>
+                <set field="partyIdTo" from-field="parameters.partyIdTo"/>
+                <set field="partyIdFrom" from-field="parameters.partyIdFrom"/>
+                <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/>
             </actions>            
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">                                                                                       
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.CommonList} ${uiLabelMap.HumanResAgreementEmploymentAppl}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/EmploymentForms.xml"/>
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <container style="h3">
-                                    <label text="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResAgreementEmploymentAppl}"/>
-                                </container>
-                            </container>
-                            <container style="screenlet-body">
-                                <section>
-                                    <widgets>
-                                        <include-form name="AddAgreementEmploymentAppl" location="component://humanres/widget/forms/EmploymentForms.xml" />
-                                    </widgets>
-                                </section>
-                            </container>
-                        </container>
+                        <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResAgreementEmploymentAppl}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResAgreementEmploymentAppl}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddAgreementEmploymentAppl" location="component://humanres/widget/forms/EmploymentForms.xml" />
+                                </widgets>
+                            </section>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>            
         </section>
     </screen>
-</screens>
+</screens>
\ No newline at end of file

Added: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml?rev=660980&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (added)
+++ ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml Wed May 28 08:25:38 2008
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+    <screen name="EditSkillTypes">
+        <section>                        
+            <actions>
+                <set field="headerItem" value="SkillType"/>
+                <set field="titleProperty" value="PageTitleListSkillTypes"/>
+                <set field="skillTypeId" from-field="parameters.skillTypeId"/>
+                <entity-one entity-name="SkillType" value-name="skillType" />
+            </actions>            
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                                                       
+                        <screenlet title="${uiLabelMap.PageTitleListSkillTypes}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListSkillTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>                            
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.ProjectMgrSkillType}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddSkillType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
+                                </widgets>
+                            </section>
+                        </screenlet> 
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>            
+        </section>
+    </screen>
+    <screen name="EditResponsibilityTypes">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditResponsibilityType"/>
+                <set field="tabButtonItem" value="ResponsibilityType"/>
+                <set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/>
+                <entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.${titleProperty}}">
+                                     <section>
+                                         <widgets>
+                                             <include-form name="ListResponsibilityTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                         </widgets>
+                                     </section>                                    
+                                </screenlet>
+                                <screenlet title="${uiLabelMap.HumanResAddEmplPositionResponsibility}">
+                                    <section>
+                                        <widgets>
+                                            <include-form name="AddResponsibilityType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
+                                        </widgets>
+                                        <fail-widgets>
+                                            <label style="h3">${uiLabelMap.HumanResViewPermissionError}</label>
+                                        </fail-widgets>
+                                    </section>                                    
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditTerminationTypes">
+        <section>                        
+            <actions>
+                <set field="tabButtonItem" value="TerminationType"/>
+                <set field="titleProperty" value="HumanResTerminationTypes"/>
+                <set field="terminationTypeId" from-field="parameters.terminationTypeId"/>
+                <entity-one entity-name="TerminationType" value-name="terminationType" />
+            </actions>            
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                                                                                       
+                        <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResTerminationType}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListTerminationTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResTerminationType}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddTerminationType" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
+                                </widgets>
+                            </section>                            
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>            
+        </section>
+    </screen>
+    <screen name="FindEmplPositionTypes">
+        <section>
+            <actions>
+                <set field="titleProperty" value="FindPositionTypes"/>
+                <set field="headerItem" value="EmplPositionTypes"/>
+                <set field="tabButtonItem" value="EmplPositionTypes"/>                
+                <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
+                <set field="emplPositionTypeCtx" from-field="parameters"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="menu-bar">
+                                <container style="button-bar">
+                                    <link target="EditEmplPositionTypes" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplPositionType}" style="buttontext"/>
+                                </container>
+                            </decorator-section>
+                            <decorator-section name="search-options">
+                                <include-form name="FindEmplPositionTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <include-form name="ListEmplPositionTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                            </decorator-section>
+                        </decorator-screen>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditEmplPositionTypes">
+        <section>
+            <actions>
+                <set field="titleProperty" value="FindPositionTypes"/>
+                <set field="headerItem" value="EmplPositionTypes"/>
+                <set field="tabButtonItem" value="EmplPositionTypes"/>  
+                <set field="tabButtonItem2" value="EditEmplPositionType"/>
+                <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
+                <entity-one entity-name="EmplPositionType" value-name="emplPositionType"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <condition>
+                                <not>
+                                    <if-empty field-name="emplPositionTypeId"/>
+                                </not>                                
+                            </condition>
+                            <widgets>
+                                <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/>
+                            </widgets>
+                        </section>
+                        <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.HumanResEmplPositionType}">
+                            <section>
+                                <widgets>
+                                    <include-form name="EditEmplPositionTypes" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditEmplPositionTypeRates">
+        <section>
+            <actions>
+                <set field="titleProperty" value="EditEmplPositionTypeRate"/>
+                <set field="headerItem" value="EmplPositionTypes"/>
+                <set field="tabButtonItem" value="EmplPositionTypes"/> 
+                <set field="tabButtonItem2" value="EditEmplPositionTypeRate"/>
+                <set field="emplPositionTypeId" from-field="parameters.emplPositionTypeId"/>
+                <entity-one entity-name="EmplPositionTypeRate" value-name="emplPositionTypeRate"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-menu location="component://humanres/widget/Menus.xml" name="EmplPositionTypeTabBar"/>                                                                
+                        <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListEmplPositionTypeRates" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmplPositionType} ${uiLabelMap.CommonRate}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddEmplPositionTypeRate" location="component://humanres/widget/forms/GlobalHRSettingForms.xml" />
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="EditTerminationReasons">
+        <section>            
+            <actions>
+                <set field="titleProperty" value="HumanResAddTerminationReason"/>
+                <set field="tabButtonItem" value="TerminationReason"/>
+                <set field="terminationReasonId" from-field="parameters.terminationReasonId" />
+                <entity-one entity-name="TerminationReason" value-name="terminationReason" />
+            </actions>            
+            <widgets>
+                <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">                        
+                        <screenlet title="${uiLabelMap.HumanResListTerminationReasons}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.HumanResAddTerminationReason}">
+                            <section> 
+                                <widgets>
+                                    <include-form name="AddTerminationReason" location="component://humanres/widget/forms/GlobalHRSettingForms.xml"/>
+                                </widgets>
+                            </section>                            
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>                              
+        </section>
+    </screen>
+</screens>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=660980&r1=660979&r2=660980&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Wed May 28 08:25:38 2008
@@ -25,14 +25,14 @@
         <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
         <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item>
         <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
-        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item>
+        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPositions"/></menu-item>
         <menu-item name="PartySkills" title="${uiLabelMap.HumanResPartySkills}"><link target="FindPartySkills"/></menu-item>
-        <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQual"/></menu-item>
+        <menu-item name="PartyQual" title="${uiLabelMap.HumanResPartyQualification}"><link target="FindPartyQuals"/></menu-item>
         <menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></menu-item>
-        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item>
-        <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item>
+        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApps"/></menu-item>
+        <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResumes"/></menu-item>
         <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrades"/></menu-item>
-        <menu-item name="PerfReview" title="${uiLabelMap.HumanResPerfReview}"><link target="FindPerfReview"/></menu-item>
+        <menu-item name="PerfReview" title="${uiLabelMap.HumanResPerfReview}"><link target="FindPerfReviews"/></menu-item>
         <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
             <link target="logout"/>
@@ -41,7 +41,7 @@
             <condition><if-empty field-name="userLogin"/></condition>
             <link target="${checkLoginUrl}"/>
         </menu-item>
-        <menu-item name="GlobalHRSettings" title="${uiLabelMap.HumanResGlobalHRSettings}" selected-style="selected"><link target="globalHRSetting"/></menu-item>
+        <menu-item name="GlobalHRSettings" title="${uiLabelMap.HumanResGlobalHRSettings}" selected-style="selected"><link target="globalHRSettings"/></menu-item>
     </menu>
     <menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected"
         type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
@@ -57,9 +57,11 @@
         <menu-item name="EditPayHistory" title="${uiLabelMap.HumanResEditPayHistory}">
             <link target="ListPayHistories?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
         </menu-item>
-        <menu-item name="EditUnemploymentClaim" title="${uiLabelMap.HumanResEditUnemploymentClaim}">
-            <link target="EditUnemploymentClaim?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
+        <menu-item name="EditUnemploymentClaims" title="${uiLabelMap.HumanResEditUnemploymentClaim}">
+            <link target="EditUnemploymentClaims?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
         </menu-item>
+        <menu-item name="EditAgreementEmploymentAppls" title="${uiLabelMap.HumanResAgreementEmploymentAppl}">
+            <link target="EditAgreementEmploymentAppls?agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/></menu-item>
     </menu>
     <menu name="EmplPostionBar" default-menu-item-name="EmplPositionView" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EmplPositionView" title="${uiLabelMap.CommonSummary}">
@@ -99,13 +101,13 @@
             <link target="EditSkillTypes"/>
         </menu-item>      
         <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}">
-            <link target="EditResponsibilityType"/>
+            <link target="EditResponsibilityTypes"/>
         </menu-item> 
         <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}">
-            <link target="FindTerminationReason"/>
+            <link target="EditTerminationReasons"/>
         </menu-item>
-        <menu-item name="TerminationType" title="${uiLabelMap.HumanResTerminationType}">
-            <link target="findTerminationTypes"/>
+        <menu-item name="TerminationType" title="${uiLabelMap.HumanResTerminationTypes}">
+            <link target="EditTerminationTypes"/>
         </menu-item>
         <menu-item name="EmplPositionTypes" title="${uiLabelMap.HumanResEmplPositionType}">
             <link target="FindEmplPositionTypes"/>
@@ -139,11 +141,11 @@
     
     <menu name="EmplPositionTypeTabBar" default-menu-item-name="EditEmplPositionType" default-selected-style="selected"
         menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem2">
-        <menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEditEmplPositionType}">
+        <menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEmplPositionType}">
             <link target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/>
         </menu-item>
         <menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}">
-            <link target="EditEmplPositionTypeRate?emplPositionTypeId=${emplPositionTypeId}"/>
+            <link target="EditEmplPositionTypeRates?emplPositionTypeId=${emplPositionTypeId}"/>
         </menu-item>
     </menu>
 </menus>
\ No newline at end of file