svn commit: r655778 - in /ofbiz/trunk/applications: accounting/widget/ humanres/config/ humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r655778 - in /ofbiz/trunk/applications: accounting/widget/ humanres/config/ humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/

mor-2
Author: mor
Date: Tue May 13 01:27:14 2008
New Revision: 655778

URL: http://svn.apache.org/viewvc?rev=655778&view=rev
Log:
continuing cleanups in HR module - patch from Harsha Chadhar & Parimal Gain

Modified:
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
    ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue May 13 01:27:14 2008
@@ -86,7 +86,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindInvoice}"/>
+                                    <label text="${uiLabelMap.PageTitleListInvoices}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Tue May 13 01:27:14 2008
@@ -348,12 +348,21 @@
         <value xml:lang="it">Anni di Esperienza</value>
         <value xml:lang="th">ประสบการณ์(ปี)</value>
     </property>
+    <property key="HumanResAddEmplPositionFulfillment">
+        <value xml:lang="en">Add Position Fulfillment</value>
+    </property>
+    <property key="HumanResAddEmplPositionResponsibility">
+        <value xml:lang="en">Add Position Responsibility</value>
+    </property>
     <property key="HumanResAddReportedToEmplPositionReportingStruct">
         <value xml:lang="en">Add Empl Position Reporting Struct [Reported To ${parameters.emplPositionId}]</value>
     </property>
     <property key="HumanResAddReportsToEmplPositionReportingStruct">
         <value xml:lang="en">Add Empl Position Reporting Struct [${parameters.emplPositionId} Reports To]</value>
     </property>
+    <property key="HumanResAddValidResponsibility">
+        <value xml:lang="en">Add Valid Responsibility</value>
+    </property>
     <property key="HumanResApplicationId">
         <value xml:lang="en">Application Id</value>
         <value xml:lang="it">Codice Applicazione</value>
@@ -387,11 +396,6 @@
     <property key="HumanResEmplPosition">
         <value xml:lang="en">Employee Position</value>
     </property>
-    <property key="HumanResEditEmplPositionFulfillment">
-        <value xml:lang="en">Edit Position Fulfillment</value>
-        <value xml:lang="it">Aggiorna Posizione Adempimento</value>
-        <value xml:lang="th">แก้ไขตำแหน่งการปฏิบัติภารกิจ</value>
-    </property>
     <property key="HumanResEditEmplPositionReportingStruct">
         <value xml:lang="en">Edit EmplPosition Reporting Structure</value>
         <value xml:lang="it">Aggiorna Struttura Stampa Posizione Impiegati</value>
@@ -400,11 +404,6 @@
     <property key="HumanResEmplPositionReportingStruct">
         <value xml:lang="en">Reporting Structure</value>
     </property>
-    <property key="HumanResEditEmplPositionResponsibility">
-        <value xml:lang="en">Edit Position Responsibility</value>
-        <value xml:lang="it">Aggiorna Posizione Responsabilità</value>
-        <value xml:lang="th">แก้ไขตำแหน่งที่รับผิดชอบ</value>
-    </property>
     <property key="HumanResEmplPositionResponsibilities">
         <value xml:lang="en">Responsibilities</value>
     </property>
@@ -478,11 +477,6 @@
         <value xml:lang="it">Aggiorna Reclamo Disoccupazione</value>
         <value xml:lang="th">แก้ไขจำนวนผู้ว่าจ้างเรียกร้อง</value>
     </property>
-    <property key="HumanResEditValidResponsibility">
-        <value xml:lang="en">Edit Valid Responsibility</value>
-        <value xml:lang="it">Aggiorna Validità Responsibilità</value>
-        <value xml:lang="th">แก้ไขหน้าที่รับผิดชอบ</value>
-    </property>
     <property key="HumanResEmployee">
         <value xml:lang="en">Employee</value>
     </property>    

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=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Tue May 13 01:27:14 2008
@@ -125,7 +125,7 @@
     <request-map uri="updatePartySkill">
         <security https="true" auth="true"/>
         <event type="service" invoke="updatePartySkill"/>
-        <response name="success" type="view" value="EditPartySkills"/>
+        <response name="success" type="view" value="ListPartySkills"/>
     </request-map>
     <request-map uri="deletePartySkill">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Tue May 13 01:27:14 2008
@@ -115,13 +115,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditEmplPositionFulfillment}"/>
+                                    <label text="${uiLabelMap.HumanResAddEmplPositionFulfillment}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="EditEmplPositionFulfillment" location="component://humanres/widget/forms/EmplPositionForms.xml"/>    
+                                        <include-form name="AddEmplPositionFulfillment" location="component://humanres/widget/forms/EmplPositionForms.xml"/>    
                                     </widgets>
                                 </section>
                             </container>
@@ -161,13 +161,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditEmplPositionResponsibility}"/>
+                                    <label text="${uiLabelMap.HumanResAddEmplPositionResponsibility}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="EditEmplPositionResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+                                        <include-form name="AddEmplPositionResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>
@@ -200,7 +200,7 @@
                         <screenlet title="${uiLabelMap.HumanResAddReportsToEmplPositionReportingStruct}">
                             <section>
                                 <widgets>
-                                    <include-form name="EditReportsToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>  
+                                    <include-form name="AddReportsToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>  
                                 </widgets>
                             </section>
                         </screenlet>
@@ -214,7 +214,7 @@
                         <screenlet title="${uiLabelMap.HumanResAddReportedToEmplPositionReportingStruct}">
                             <section>
                                 <widgets>
-                                    <include-form name="EditReportedToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+                                    <include-form name="AddReportedToEmplPositionReportingStruct" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
                                 </widgets>
                             </section>
                         </screenlet>
@@ -264,7 +264,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditValidResponsibility}"/>
+                                    <label text="${uiLabelMap.HumanResAddValidResponsibility}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -273,7 +273,7 @@
                                         <container>
                                              <link target="EditValidResponsibility" text="${uiLabelMap.HumanResNewValidResponsibility}" style="buttontext"/>
                                         </container>
-                                        <include-form name="EditValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>  
+                                        <include-form name="AddValidResponsibility" location="component://humanres/widget/forms/EmplPositionForms.xml"/>  
                                     </widgets>
                                 </section>
                             </container>

Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Tue May 13 01:27:14 2008
@@ -86,7 +86,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditEmployment}"/>
+                                    <label text="${uiLabelMap.HumanResNewEmployment}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -95,7 +95,7 @@
                                         <container>
                                             <link text="${uiLabelMap.HumanResNewEmployment}" target="EditEmployment" style="buttontext"/>
                                         </container>
-                                        <include-form name="EditEmployment" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                        <include-form name="AddEmployment" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>
@@ -225,9 +225,6 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <container>
-                                            <link text="${uiLabelMap.HumanResNewPartyBenefit}" target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" style="buttontext"/>
-                                        </container>
                                         <include-form name="ListPartyBenefits" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                     </widgets>
                                 </section>
@@ -236,13 +233,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditPartyBenefit}"/>
+                                    <label text="${uiLabelMap.HumanResNewPartyBenefit}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="EditPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+                                        <include-form name="AddPartyBenefit" location="component://humanres/widget/forms/EmploymentForms.xml"/>
                                     </widgets>
                                 </section>
                             </container>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Tue May 13 01:27:14 2008
@@ -43,7 +43,7 @@
         </menu-item>
     </menu>
     <menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar">
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}">
             <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
         </menu-item>
@@ -71,7 +71,7 @@
         </menu-item>
     </menu>
     <menu name="PartyBar" default-menu-item-name="EditPerfReviewItems" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar">
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}">
             <link target="EditPerfReviewItems?perfReviewId=${perfReviewId}"/>
         </menu-item>
@@ -83,10 +83,10 @@
         </menu-item>
     </menu>
     <menu name="SalaryBar" default-menu-item-name="EditSalaryStep" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar">
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}">
             <link target="EditSalarySteps?payGradeId=${payGradeId}"/>
         </menu-item>        
     </menu>
-    <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected"/>
+    <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"/>
 </menus>
\ No newline at end of file

Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Tue May 13 01:27:14 2008
@@ -225,13 +225,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.HumanResEditPartySkill}"/>
+                                    <label text="${uiLabelMap.HumanResNewPartySkill}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="EditPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>    
+                                        <include-form name="AddPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>    
                                     </widgets>
                                 </section>
                             </container>
@@ -306,13 +306,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleEditSkillType}"/>
+                                    <label text="${uiLabelMap.HumanResNewSkillType}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <include-form name="EditSkillType" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
+                                        <include-form name="AddSkillType" location="component://humanres/widget/forms/PartyAbilityForms.xml" />
                                     </widgets>
                                 </section>
                             </container>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Tue May 13 01:27:14 2008
@@ -96,7 +96,7 @@
             <hyperlink target="deleteEmplPositionFulfillment?emplPositionId=${emplPositionId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditEmplPositionFulfillment" type="single" target="createEmplPositionFulfillment" title=""
+    <form name="AddEmplPositionFulfillment" type="single" target="createEmplPositionFulfillment" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createEmplPositionFulfillment"/>
         <field name="emplPositionId"><hidden /></field>
@@ -124,7 +124,7 @@
             <hyperlink target="deleteEmplPositionReportingStruct?emplPositionIdReportingTo=${emplPositionIdReportingTo}&amp;emplPositionIdManagedBy=${emplPositionIdManagedBy}&amp;fromDate=${fromDate}&amp;emplPositionId=${parameters.emplPositionId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>        
     </form>
-    <form name="EditReportsToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""
+    <form name="AddReportsToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createEmplPositionReportingStruct"/>
         <field name="emplPositionId"><hidden value="${parameters.emplPositionId}"/></field>
@@ -152,7 +152,7 @@
             <hyperlink target="deleteEmplPositionReportingStruct?emplPositionIdReportingTo=${emplPositionIdReportingTo}&amp;emplPositionIdManagedBy=${emplPositionIdManagedBy}&amp;fromDate=${fromDate}&amp;emplPositionId=${parameters.emplPositionId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditReportedToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""
+    <form name="AddReportedToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createEmplPositionReportingStruct"/>
         <field name="emplPositionId"><hidden value="${parameters.emplPositionId}"/></field>
@@ -175,7 +175,7 @@
             <hyperlink target="deleteEmplPositionResponsibility?emplPositionId=${emplPositionId}&amp;responsibilityTypeId=${responsibilityTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>        
     </form>
-    <form name="EditEmplPositionResponsibility" type="single" target="createEmplPositionResponsibility" title=""
+    <form name="AddEmplPositionResponsibility" type="single" target="createEmplPositionResponsibility" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createEmplPositionResponsibility"/>
         <field name="emplPositionId"><hidden /></field>
@@ -202,7 +202,7 @@
             <hyperlink target="deleteValidResponsibility?emplPositionTypeId=${emplPositionId}&amp;responsibilityTypeId=${responsibilityTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditValidResponsibility" type="single" target="createValidResponsibility" title=""
+    <form name="AddValidResponsibility" type="single" target="createValidResponsibility" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createValidResponsibility"/>        
         <field name="emplPositionTypeId">

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Tue May 13 01:27:14 2008
@@ -46,7 +46,7 @@
             <hyperlink target="deleteEmployment?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    <form name="EditEmployment" type="single" target="createEmployment"
+    <form name="AddEmployment" type="single" target="createEmployment"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createEmployment"/>      
         <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
@@ -178,7 +178,7 @@
             <hyperlink target="deletePartyBenefit?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}&amp;benefitTypeId=${benefitTypeId}" description="${uiLabelMap.CommonDelete}"/>
         </field>            
     </form>
-    <form name="EditPartyBenefit" type="single" target="createPartyBenefit" title=""
+    <form name="AddPartyBenefit" type="single" target="createPartyBenefit"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createPartyBenefit"/>                          
         <field name="roleTypeIdFrom"><hidden/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=655778&r1=655777&r2=655778&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Tue May 13 01:27:14 2008
@@ -91,23 +91,19 @@
         </actions>
         <auto-fields-service default-field-type="display" service-name="updatePartySkill"/>        
         <field name="partyId"><display/></field>                
-        <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${skillTypeId}" target="updatePartySkill?skillTypeId=${skillTypeId}&amp;partyId=${partyId}"/>
-        </field>
-        <field name="yearsExperience"><display/></field>
-        <field name="rating"><display/></field>
-        <field name="skillLevel"><display/></field>
+        <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}"></field>
+        <field name="yearsExperience"><text/></field>
+        <field name="rating"><text/></field>
+        <field name="skillLevel"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="deletePartySkill?partyId=${partyId}&amp;skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>      
-    <form name="EditPartySkill" type="single" target="updatePartySkill" title="createPartySkill" default-map-name="partySkill"
+    <form name="AddPartySkill" type="single" target="createPartySkill" title="createPartySkill" default-map-name="partySkill"
         header-row-style="header-row" default-table-style="basic-table">
-        <alt-target use-when="partySkill==null" target="createPartySkill"/>
         <auto-fields-service service-name="createPartySkill"/>
-        <field name="partyId" use-when="partyId==null"><lookup target-form-name="LookupPartyName"/></field>        
-        <field use-when="partyId!=null" name="partyId"><ignored/></field>
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>        
         <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="false">
                 <entity-options description="${description}" key-field-name="skillTypeId" entity-name="SkillType">
@@ -302,16 +298,11 @@
             <hyperlink target="deleteSkillType?skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>            
-    <form name="EditSkillType" type="single" target="updateSkillType" title="" default-map-name="skillType"
+    <form name="AddSkillType" type="single" target="createSkillType" default-map-name="skillType"
         header-row-style="header-row" default-table-style="basic-table">
-        <alt-target use-when="skillType==null" target="createSkillType"/>
-        <auto-fields-service service-name="createSkillType"/>
-        <field use-when="skillType!=null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="skillType==null&amp;&amp;skillTypeId==null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><ignored/></field>
-        <field use-when="skillType==null&amp;&amp;skillTypeId!=null" name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${skillTypeId}]"><display/></field>        
+        <auto-fields-service service-name="createSkillType" default-field-type="hidden"/>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
-        <field name="submitButton" use-when="skillType==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="submitButton" use-when="skillType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
     <form name="ListResponsibilityTypes" type="list" list-name="responsibilityTypes" paginate-target="FindResponsibilityType">
         <actions>