svn commit: r662162 - in /ofbiz/trunk/applications: humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/ party/webapp/partymgr/WEB-INF/ party/widget/partymgr/

[ashish-18]

Author: ashish
Date: Sun Jun  1 00:46:13 2008
New Revision: 662162

URL: http://svn.apache.org/viewvc?rev=662162&view=rev
Log:
Applied patch from JIRA issue OFBIZ-1659.

Few more improvements are included in this patch.
There were navigation problems in the tab's inside Employee header item.

Thanks Primal Gain for your patch.

Modified:
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
    ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
    ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml
    ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
    ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

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=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sun Jun  1 00:46:13 2008
@@ -764,6 +764,66 @@
         <response name="success" type="view" value="EditEmploymentApps"/>
         <response name="error"  type="view" value="EditEmploymentApps"/>
     </request-map>
+    <request-map uri="createPartySkillExt">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartySkill"/>
+        <response name="success" type="view" value="EditPartySkills"/>
+        <response name="error" type="view" value="EditPartySkills"/>
+    </request-map>
+    <request-map uri="updatePartySkillExt">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updatePartySkill"/>
+        <response name="success" type="view" value="EditPartySkills"/>
+        <response name="error" type="view" value="EditPartySkills"/>
+    </request-map>
+    <request-map uri="createPartyQualExt">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPartyQual"/>
+        <response name="success" type="view" value="EditPartyQuals"/>
+        <response name="error" type="view" value="EditPartyQuals"/>
+    </request-map>
+    <request-map uri="updatePartyQualExt">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updatePartyQual"/>
+        <response name="success" type="view" value="EditPartyQuals"/>
+        <response name="error" type="view" value="EditPartyQuals"/>
+    </request-map>
+    <request-map uri="createPersonTrainingExt">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPersonTraining"/>
+        <response name="success" type="view" value="EditPersonTrainings"/>
+        <response name="error" type="view" value="EditPersonTrainings"/>
+    </request-map>
+    <request-map uri="updatePersonTrainingsExt">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updatePersonTraining"/>
+        <response name="success" type="view" value="EditPersonTrainings"/>
+        <response name="error" type="view" value="EditPersonTrainings"/>
+    </request-map>
+    <request-map uri="createEmploymentAppExt">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createEmploymentApp"/>
+        <response name="success" type="view" value="EditEmploymentApps"/>
+        <response name="error" type="view" value="EditEmploymentApps"/>
+    </request-map>    
+    <request-map uri="updateEmploymentAppExt">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updateEmploymentApp"/>
+        <response name="success" type="request" value="EditEmploymentApps"/>
+        <response name="error" type="view" value="EditEmploymentApps"/>
+    </request-map>
+    <request-map uri="createEmplLeaveExt">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createEmplLeave"/>
+        <response name="success" type="view" value="EditEmplLeaves"/>
+        <response name="error" type="view" value="EditEmplLeaves"/>
+    </request-map>
+    <request-map uri="updateEmplLeaveExt">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updateEmplLeave"/>
+        <response name="success" type="view" value="EditEmplLeaves"/>
+        <response name="error" type="view" value="EditEmplLeaves"/>
+    </request-map>
     
     <!-- ===================Lookup Request===================== -->
     <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
@@ -856,10 +916,9 @@
     <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationTypes"/>    
     <view-map name="EditTerminationReasons" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationReasons"/>    
 
-    <view-map name="EditPartySkills" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartySkills"/>
-    <view-map name="EditPersonTrainings" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPersonTrainings"/>
+    <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/>
     <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/>    
-    <view-map name="EditEmploymentApps" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditEmploymentApps"/>    
+    <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/>    
     
     <view-map name="FindEmplLeaves" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#FindEmplLeaves"/>
     <view-map name="NewEmplLeave" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#NewEmplLeave"/>

Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Sun Jun  1 00:46:13 2008
@@ -85,6 +85,7 @@
                 <set field="tabButtonItem" value="EditEmplLeaves"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="emplLeaveCtx.partyId" from-field="parameters.partyId"/>
+                <set field="parameters.insideEmployee" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml Sun Jun  1 00:46:13 2008
@@ -57,7 +57,8 @@
                 <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"/>
+                <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/>
+                <set field="parameters.insideEmployee" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml Sun Jun  1 00:46:13 2008
@@ -55,7 +55,7 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditPartyQual">
+    <screen name="EditPartyQuals">
         <section>
             <actions>
                 <set field="titleProperty" value="HumanResViewPartyQual"/>
@@ -63,6 +63,7 @@
                 <set field="tabButtonItem" value="EditPartyQuals"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="partyQualCtx.partyId" from-field="parameters.partyId"/>
+                <set field="parameters.insideEmployee" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Sun Jun  1 00:46:13 2008
@@ -27,7 +27,6 @@
                 <set field="headerItem" value="PartySkills"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="partySkillsCtx" from-field="parameters"/>
-                <set field="insideParty.partySkills" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -63,6 +62,7 @@
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="skillTypeId" from-field="parameters.skillTypeId"/>
                 <set field="partySkillsCtx.partyId" from-field="parameters.partyId"/>
+                <set field="parameters.insideEmployee" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sun Jun  1 00:46:13 2008
@@ -27,7 +27,6 @@
                 <set field="headerItem" value="Training"/>
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="personTrainingsCtx" from-field="parameters"/>
-                <set field="insideParty.personTraining" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -63,6 +62,7 @@
                 <set field="partyId" from-field="parameters.partyId"/>
                 <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/>
                 <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/>
+                <set field="parameters.insideEmployee" value="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Sun Jun  1 00:46:13 2008
@@ -32,7 +32,7 @@
         <field name="noConditionFind"><hidden value="Y"/></field>    
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListEmplLeaves" type="multi" use-row-submit="true" separate-columns="true" target="updateEmplLeave" list-name="listIt" paginate-target="FindEmplLeaves"
+    <form name="ListEmplLeaves" type="multi" use-row-submit="true" separate-columns="true" target="updateEmplLeaveExt?partyId=${partyId}" list-name="listIt" paginate-target="FindEmplLeaves"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -40,7 +40,9 @@
                 <field-map field-name="entityName" value="EmplLeave"/>
                 <field-map field-name="orderBy" value="fromDate"/>
             </service>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
+        <alt-target use-when="insideEmployee==null" target="updateEmplLeave"/>
         <auto-fields-service service-name="updateEmplLeave"/>
         <field name="partyId"><display/></field>
         <field name="leaveTypeId"><display/></field>
@@ -50,6 +52,10 @@
     </form>
     <form name="AddEmplLeave" type="single" target="createEmplLeave"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+        </actions>
+        <alt-target use-when="insideEmployee != null" target="createEmplLeaveExt"/>
         <auto-fields-service service-name="createEmplLeave"/>
         <field name="partyId" use-when="emplLeaveCtx!=null"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="emplLeaveCtx==null"><lookup target-form-name="LookupPartyName"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Sun Jun  1 00:46:13 2008
@@ -19,7 +19,7 @@
 -->
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListEmploymentApps" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmploymentApp?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}" paginate-target="FindEmploymentApps"
+    <form name="ListEmploymentApps" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updateEmploymentAppExt?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}" paginate-target="FindEmploymentApps"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" >
         <actions>
             <set field="partyId" from-field="parameters.partyId"/>
@@ -30,10 +30,12 @@
                 <field-map field-name="entityName" value="EmploymentApp"/>
                 <field-map field-name="orderBy" value="applicationId"/>
             </service>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
         <row-actions>
             <set field="applicationId" from-field="applicationId"/>
         </row-actions>
+        <alt-target use-when="insideEmployee==null" target="updateEmploymentApp"/>
         <auto-fields-service default-field-type="hidden" service-name="updateEmploymentApp"/>
         <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}"><display also-hidden="true"/></field>
         <field name="statusId">
@@ -96,6 +98,10 @@
     </form>
     <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+        </actions>
+        <alt-target use-when="insideEmployee != null" target="createEmploymentAppExt"/>
         <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/>
         <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupEmploymentApp"/></field>.
         <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sun Jun  1 00:46:13 2008
@@ -233,7 +233,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
     </form>
     <form name="ListPerformanceNotes" type="list" target="updatePerformanceNote" title="" paginate-target="findPerformanceNotes"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PerformanceNote"/>
         </actions>  

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sun Jun  1 00:46:13 2008
@@ -49,7 +49,7 @@
         </field>
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListPartyQuals" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartyQual" paginate-target="FindPartyQuals"
+    <form name="ListPartyQuals" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartyQualExt?partyId=${partyId}" paginate-target="FindPartyQuals"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -57,7 +57,9 @@
                 <field-map field-name="entityName" value="PartyQual"/>
                 <field-map field-name="orderBy" value="fromDate"/>
             </service>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
+        <alt-target use-when="insideEmployee==null" target="updatePartyQual"/>
         <auto-fields-service service-name="updatePartyQual"/>        
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
@@ -92,6 +94,10 @@
     </form>
     <form name="AddPartyQual" type="single" target="createPartyQual"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+        </actions>
+        <alt-target use-when="insideEmployee != null" target="createPartyQualExt"/>
         <auto-fields-service service-name="createPartyQual"/>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual!=null"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="partyQual==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Sun Jun  1 00:46:13 2008
@@ -52,6 +52,7 @@
     </form>    
     <form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume"
         header-row-style="header-row" default-table-style="basic-table">
+        <alt-target use-when="partyResume != null" target="updatePartyResume"/>
         <field name="resumeId" use-when="resumeId!=null" title="${uiLabelMap.HumanResResumeId}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="resumeId" use-when="resumeId==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
         <field name="contentId"><lookup target-form-name="LookupContent"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Sun Jun  1 00:46:13 2008
@@ -37,7 +37,7 @@
         <field name="noConditionFind"><hidden value="Y"/></field>
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>    
-    <form name="ListPartySkills" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkill?partyId=${partyId}" paginate-target="findPartySkills"
+    <form name="ListPartySkills" type="multi" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkillExt?partyId=${partyId}" paginate-target="findPartySkills"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -46,16 +46,18 @@
                 <field-map field-name="orderBy" value="partyId"/>
                 <field-map field-name="orderBy" value="skillTypeId"/>
             </service>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
         <row-actions>
             <set field="skillTypeId" from-field="skillTypeId"/>
         </row-actions>
+        <alt-target use-when="insideEmployee==null" target="updatePartySkill"/>
         <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>        
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${partyId}" entity-name="PartyNameView">
                 <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
             </display-entity>
-        </field>      
+        </field>
         <field name="skillTypeId">
             <display-entity entity-name="SkillType" description="${description}"/>
         </field>
@@ -74,8 +76,12 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>      
-    <form name="AddPartySkills" type="single" target="createPartySkill" default-map-name="party"
+    <form name="AddPartySkills" type="single" target="createPartySkill" default-map-name="partySkill"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+        </actions>
+        <alt-target use-when="insideEmployee != null" target="createPartySkillExt"/>
         <field name="partyId" use-when="partySkill != null"><hidden/></field>
         <field name="partyId" use-when="partySkill == null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="skillTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">

Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Sun Jun  1 00:46:13 2008
@@ -34,14 +34,17 @@
         <field name="noConditionFind"><hidden value="Y"/></field>
         <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    <form name="ListPersonTrainings" type="multi" list-name="listIt" separate-columns="true" target="updatePersonTrainings" paginate-target="FindPersonTrainings"
+    <form name="ListPersonTrainings" type="multi" list-name="listIt" separate-columns="true" target="updatePersonTrainingsExt?partyId=${partyId}" paginate-target="FindPersonTrainings"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="personTrainingsCtx"/>
                 <field-map field-name="entityName" value="PersonTraining"/>
+                <field-map field-name="orderBy" value="fromDate"/>
             </service>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
         </actions>
+        <alt-target use-when="insideEmployee==null" target="updatePersonTrainings"/>
         <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
         <field name="partyId" title="PartyId" widget-style="linktext">
             <hyperlink also-hidden="true" target="viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
@@ -52,6 +55,10 @@
     </form>
     <form name="AddPersonTraining" type="single" target="createPersonTraining" default-map-name="party"
         header-row-style="header-row" default-table-style="basic-table">
+        <actions>
+            <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+        </actions>
+        <alt-target use-when="insideEmployee != null" target="createPersonTrainingExt"/>
         <field use-when="party!=null" name="partyId" widget-style="tabletext"><hidden/></field>
         <field use-when="party==null" name="partyId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
         <field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sun Jun  1 00:46:13 2008
@@ -944,13 +944,13 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditPartySkills"/>
     </request-map>
-    <request-map uri="createPartySkill">
+    <request-map uri="createPartySkillExt">
         <security https="true" auth="true"/>
         <event type="service" invoke="createPartySkill"/>
         <response name="success" type="view" value="EditPartySkills"/>
         <response name="error" type="view" value="EditPartySkills"/>
     </request-map>
-    <request-map uri="updatePartySkill">
+    <request-map uri="updatePartySkillExt">
         <security https="true" auth="true"/>
         <event type="service-multi" invoke="updatePartySkill"/>
         <response name="success" type="view" value="EditPartySkills"/>
@@ -966,13 +966,13 @@
         <response name="success" type="view" value="EditPersonTrainings"/>
         <response name="error" type="view" value="EditPersonTrainings"/>
     </request-map>
-    <request-map uri="createPersonTraining">
+    <request-map uri="createPersonTrainingExt">
         <security https="true" auth="true"/>
         <event type="service" invoke="createPersonTraining"/>
         <response name="success" type="view" value="EditPersonTrainings"/>
         <response name="error" type="view" value="EditPersonTrainings"/>
     </request-map>
-    <request-map uri="updatePersonTrainings">
+    <request-map uri="updatePersonTrainingsExt">
         <security https="true" auth="true"/>
         <event type="service-multi" invoke="updatePersonTraining"/>
         <response name="success" type="view" value="EditPersonTrainings"/>
@@ -1001,12 +1001,12 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="EditEmploymentApps"/>
     </request-map>
-    <request-map uri="createEmploymentApp">
+    <request-map uri="createEmploymentAppExt">
         <security https="true" auth="true"/>
         <event type="service" invoke="createEmploymentApp"/>
         <response name="success" type="request" value="EditEmploymentApps"/>
     </request-map>
-    <request-map uri="updateEmploymentApp">
+    <request-map uri="updateEmploymentAppExt">
         <security https="true" auth="true"/>
         <event type="service-multi" invoke="updateEmploymentApp"/>
         <response name="success" type="view" value="EditEmploymentApps"/>
@@ -1133,9 +1133,9 @@
     <view-map name="editPartyInvitation" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitation"/>
     <view-map name="PartyInvitationGroupAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsGroupAssocs"/>
     <view-map name="PartyInvitationRoleAssocs" type="screen" page="component://party/widget/partymgr/PartyInvitationScreens.xml#EditPartyInvitationsRoleAssocs"/>
-    <view-map name="EditPartySkills" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartySkills"/>
-    <view-map name="EditPersonTrainings" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPersonTrainings"/>
+    <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/>
+    <view-map name="EditPersonTrainings" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#EditPersonTrainings"/>
     <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/>
-    <view-map name="EditEmploymentApps" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditEmploymentApps"/>
+    <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Jun  1 00:46:13 2008
@@ -70,16 +70,16 @@
         <menu-item name="PartyContents" title="${uiLabelMap.PartyContent}">
             <link target="EditPartyContents?partyId=${partyId}"/>
         </menu-item>
-        <menu-item name="PartySkills" title="${uiLabelMap.ProjectMgrPartySkills}">
+        <menu-item name="EditPartySkills" title="${uiLabelMap.ProjectMgrPartySkills}">
             <link target="EditPartySkills?partyId=${partyId}"/>
         </menu-item>
-        <menu-item name="PersonTraining" title="${uiLabelMap.HumanResTraining}">
+        <menu-item name="EditPersonTrainings" title="${uiLabelMap.HumanResTraining}">
             <link target="EditPersonTrainings?partyId=${partyId}"/>
         </menu-item>
-        <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}">
+        <menu-item name="EditPartyResumes" title="${uiLabelMap.HumanResPartyResume}">
             <link target="EditPartyResumes?partyId=${partyId}"/>
         </menu-item>
-        <menu-item name="EmploymentApplication" title="${uiLabelMap.HumanResEmploymentApp}">
+        <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}">
             <link target="EditEmploymentApps?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}"/>
         </menu-item>
     </menu>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=662162&r1=662161&r2=662162&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Sun Jun  1 00:46:13 2008
@@ -1039,70 +1039,6 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditPartySkills">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResEditPartySkill"/>
-                <set field="headerItem" value="find"/>            
-                <set field="tabButtonItem" value="PartySkills"/>    
-                <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/PartySkillForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewPartySkill}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditPersonTrainings">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResAddPersonTraining"/>
-                <set field="headerItem" value="Training"/>
-                <set field="tabButtonItem" value="PersonTraining"/>
-                <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/PersonTrainingForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewPersonTraining}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
     <screen name="EditPartyResumes">
         <section>
             <actions>
@@ -1135,35 +1071,4 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditEmploymentApps">
-        <section>
-            <actions>
-                <set field="titleProperty" value="HumanResFindEmploymentApp"/>
-                <set field="headerItem" value="find"/>
-                <set field="tabButtonItem" value="EmploymentApplication"/>
-                <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/EmploymentAppForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                        <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}">
-                            <section>
-                                <widgets>
-                                    <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
-                                </widgets>
-                            </section>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>
\ No newline at end of file