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

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

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

ashish-18
Author: ashish
Date: Tue May 20 00:13:53 2008
New Revision: 658129

URL: http://svn.apache.org/viewvc?rev=658129&view=rev
Log:
Applied patch from JIRA issue # https://issues.apache.org/jira/browse/OFBIZ-1659.
The following points are covered in this patch.
1) Add Training tabs for Find/Create/Update in HR.
2) Add Find/List(multi type) form to find Training schedule.
3) New Person Training- use to create training schedule for new person.
4) Added Training tab in partyMgr view profile page.
5) Used a multi form to show list of Traings and it updation in partymgr and list Trainings.

Thanks Awdesh Parihar for your patch.

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
    ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Tue May 20 00:13:53 2008
@@ -357,6 +357,9 @@
     <property key="HumanResAddPayGrade">
         <value xml:lang="en">Add Pay Grade</value>
     </property>
+    <property key="HumanResAddPersonTraining">
+        <value xml:lang="en">Add Person Training</value>
+    </property>
     <property key="HumanResAddReportedToEmplPositionReportingStruct">
         <value xml:lang="en">Add Empl Position Reporting Struct [Reported To ${parameters.emplPositionId}]</value>
     </property>
@@ -531,6 +534,9 @@
     <property key="HumanResFindEmploymentApp">
         <value xml:lang="en">Find Employment Application</value>
     </property>
+    <property key="HumanResFindPersonTraining">
+        <value xml:lang="en">Find Person Training</value>
+    </property>
     <property key="HumanResListEmplPositionsReportedTo">
         <value xml:lang="en">List Employee Positions, Reported To [${parameters.emplPositionId}]</value>
     </property>
@@ -577,6 +583,9 @@
         <value xml:lang="it">Lista Preferenze Paghe</value>
         <value xml:lang="th">รายการอ้างอิงเงินเดือน</value>
     </property>
+    <property key="HumanResListPersonTraining">
+        <value xml:lang="en">List Person Training</value>
+    </property>
     <property key="HumanResListSalaryStep">
         <value xml:lang="en">List Salary Step</value>
         <value xml:lang="it">Lista Passi Salario</value>
@@ -729,6 +738,9 @@
         <value xml:lang="it">Nuove Preferenze Paghe</value>
         <value xml:lang="th">เงินเดือนสิทธิพิเศษใหม่</value>
     </property>
+    <property key="HumanResNewPersonTraining">
+        <value xml:lang="en">New Person Training</value>
+    </property>
     <property key="HumanResNewSalaryStep">
         <value xml:lang="en">New Salary Step</value>
         <value xml:lang="it">Nuovo Passo Salario</value>
@@ -897,6 +909,9 @@
         <value xml:lang="it">Tipo Licenziamento</value>
         <value xml:lang="th">รหัสประเภทขอบเขตเหตุผล</value>
     </property>
+    <property key="HumanResTraining">
+        <value xml:lang="en">Training</value>
+    </property>
     <property key="HumanResUnemploymentClaim">
         <value xml:lang="en">Unemployment Claim</value>
         <value xml:lang="it">Reclamo Disoccupazione</value>

Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Tue May 20 00:13:53 2008
@@ -55,4 +55,8 @@
     <BenefitType description="Health" hasTable="N" parentTypeId="" benefitTypeId="HEALTH"/>
     <BenefitType description="Vacation" hasTable="N" parentTypeId="" benefitTypeId="VACATION"/>
     <BenefitType description="Sick Leave" hasTable="N" parentTypeId="" benefitTypeId="SICK_LEAVE"/>
+    <TrainingClassType trainingClassTypeId="BASIC_TRAINING" description="Basic Training"/>
+    <TrainingClassType trainingClassTypeId="ONJOB_TRAINING" description="On Job Training"/>
+    <TrainingClassType trainingClassTypeId="ADVAN_TRAINING" description="Advance Training"/>
+    <TrainingClassType trainingClassTypeId="IMPRO_TRAINING" description="Improvement Training"/>
 </entity-engine-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=658129&r1=658128&r2=658129&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 20 00:13:53 2008
@@ -551,6 +551,28 @@
         <response name="success" type="view" value="EmplPositionView"/>
         <response name="error" type="view" value="EmplPositionView"/>
     </request-map>
+    <request-map uri="FindPersonTrainings">
+        <security https="true" auth="true"/>
+        <response  name="success" type="view" value="FindPersonTrainings"/>
+        <response name="error" type="view"  value="FindPersonTrainings"/>
+    </request-map>
+    <request-map uri="NewPersonTraining">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="NewPersonTraining"/>
+        <response name="error" type="view" value="FindPersonTrainings"/>
+    </request-map>
+    <request-map uri="createPersonTraining">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createPersonTraining"/>
+        <response name="success" type="view" value="FindPersonTrainings"/>
+        <response name="error" type="view" value="NewPersonTraining"/>
+    </request-map>
+    <request-map uri="updatePersonTrainings">
+        <security https="true" auth="true"/>
+        <event type="service-multi" invoke="updatePersonTraining"/>
+        <response name="success" type="view" value="FindPersonTrainings"/>
+        <response name="error" type="view" value="FindPersonTrainings"/>
+    </request-map>
     <!-- ===================Lookup Request===================== -->
     <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
     <request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map>    
@@ -606,4 +628,6 @@
     <view-map name="CreateEmployee" type="screen" page="component://humanres/widget/EmploymentScreens.xml#CreateEmployee"/>
     <view-map name="EditResponsibilityType" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditResponsibilityType"/>
     <view-map name="EmplPositionView" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EmplPositionView"/>
+    <view-map name="FindPersonTrainings" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPersonTrainings"/>
+    <view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPersonTraining"/>
 </site-conf>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Tue May 20 00:13:53 2008
@@ -33,6 +33,7 @@
         <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
         <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
         <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="EditResponsibilityType"/></menu-item>
+        <menu-item name="Training" title="${uiLabelMap.HumanResTraining}"><link target="FindPersonTrainings"/></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"/>

Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Tue May 20 00:13:53 2008
@@ -354,4 +354,60 @@
             </widgets>
         </section>
     </screen>
+    <screen name="FindPersonTrainings">
+        <section>
+            <actions>
+                <set field="titleProperty" value="HumanResFindPersonTraining"/>
+                <set field="headerItem" value="Training"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.HumanResFindPersonTraining}">
+                            <section>
+                                <widgets>
+                                    <container style="button-bar">
+                                        <link target="NewPersonTraining" text="${uiLabelMap.HumanResNewPersonTraining}" style="buttontext"/>
+                                    </container>
+                                    <include-form name="FindPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.HumanResListPersonTraining}">
+                            <section>
+                                <widgets>
+                                    <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="NewPersonTraining">
+        <section>
+            <actions>
+                <set field="titleProperty" value="HumanResAddPersonTraining"/>
+                <set field="headerItem" value="Training"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <entity-one entity-name="Party" value-name="party"/>
+                <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.HumanResAddPersonTraining}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Tue May 20 00:13:53 2008
@@ -275,43 +275,6 @@
         <field name="submitButton" use-when="performanceNote==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
         <field name="submitButton" use-when="performanceNote!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>    
-    <form name="ListPersonTrainings" type="list" target="updatePersonTraining" title="" paginate-target="findPersonTrainings"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <actions>
-            <entity-condition entity-name="PersonTraining"/>
-        </actions>
-        <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>        
-        <field name="partyId" title="PartyId" widget-style="linktext">
-                <hyperlink also-hidden="false" description="${partyId}" target="EditPersonTraining?partyId=${partyId}&amp;trainingClassTypeId=${trainingClassTypeId}&amp;fromDate=${fromDate}"/>
-        </field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
-           <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-               <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
-           </display-entity>
-       </field>
-       <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePersonTraining?partyId=${partyId}&amp;trainingClassTypeId=${trainingClassTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
-        </field>
-    </form>          
-    <form name="EditPersonTraining" type="single" target="updatePersonTraining" title="" default-map-name="personTraining"
-        header-row-style="header-row" default-table-style="basic-table">
-        <alt-target use-when="PersonTraining=null" target="createPersonTraining"/>
-        <auto-fields-service service-name="updatePersonTraining" map-name="PersonTraining"/>
-        <field use-when="PersonTraining!=null" name="partyId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>        
-        <field use-when="PersonTraining==null&amp;&amp;partyId!=null" name="partyId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${partyId}]"><text size="20" maxlength="20"/></field>
-        <field name="partyId" use-when="PersonTraining!=null" title="partyId"><display/></field>
-        <field name="partyId" use-when="personTraining==null" title="partyId" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="trainingClassTypeId" title="trainingClassType Id">
-            <drop-down allow-empty="false">
-                <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
-                    <entity-constraint name="trainingClassTypeId" operator="equals" value="PARTYQUAL_VERIFY"/>
-                    <entity-order-by field-name="description"/>
-                </entity-options>
-            </drop-down>
-        </field>
-        <field name="submitButton" use-when="personTraining==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>        
-        <field name="submitButton" use-when="personTraining!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-     </form>      
      <form name="ListSkillTypes" type="list" title="" target="updateSkillType"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
@@ -346,4 +309,49 @@
         <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
+    <form name="FindPersonTrainings" type="single" target="FindPersonTrainings"
+        header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-entity entity-name="PersonTraining" default-field-type="find"/>
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="trainingClassTypeId">
+            <drop-down allow-empty="true">
+                <entity-options description="${description}" key-field-name="trainingClassTypeId" entity-name="TrainingClassType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <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"
+        odd-row-style="alternate-row" 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="parameters"/>
+                <field-map field-name="entityName" value="PersonTraining"/>
+            </service>
+        </actions>
+        <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
+        <field name="partyId" title="PartyId" widget-style="linktext">
+                <hyperlink also-hidden="true" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
+        </field>
+        <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field>
+        <field name="thruDate"><date-time type="timestamp"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>
+    <form name="AddPersonTraining" type="single" target="createPersonTraining" default-map-name="party"
+        header-row-style="header-row" default-table-style="basic-table">
+        <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">
+            <drop-down allow-empty="false">
+                <entity-options description="${description}" entity-name="TrainingClassType">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="fromDate" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><date-time type="timestamp"/></field>
+        <field name="thruDate"><date-time type="timestamp"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
 </forms>
\ No newline at end of file

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=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Tue May 20 00:13:53 2008
@@ -961,6 +961,23 @@
         <event type="service" invoke="deletePartySkill"/>
         <response name="success" type="view" value="EditPartySkills"/>
     </request-map>
+    <request-map uri="EditPersonTrainings">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditPersonTrainings"/>
+        <response name="error" type="view" value="EditPersonTrainings"/>
+    </request-map>
+    <request-map uri="createPersonTraining">
+        <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">
+        <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>
                 
     <!-- Lookup request mappings -->
     <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
@@ -1075,5 +1092,6 @@
     <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"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue May 20 00:13:53 2008
@@ -598,4 +598,14 @@
         </field>
         <field name="fromDate"><display/></field>
     </form>  
+    <form name="ListPersonTrainings" type="multi" list-name="personTrainings" separate-columns="true" target="updatePersonTrainings?partyId=${partyId}" paginate-target="FindPersonTrainings"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <auto-fields-service default-field-type="display" service-name="updatePersonTraining"/>
+        <field name="partyId" title="PartyId" widget-style="linktext">
+            <hyperlink also-hidden="false" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="plain" description="${partyId}"/>
+        </field>      
+        <field name="thruDate"><date-time type="timestamp"/></field>
+        <field name="trainingClassTypeId"><display-entity description="${description}" entity-name="TrainingClassType"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+    </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 20 00:13:53 2008
@@ -64,6 +64,9 @@
         <menu-item name="PartySkills" title="${uiLabelMap.ProjectMgrPartySkills}">
             <link target="EditPartySkills?partyId=${partyId}"/>
         </menu-item>
+        <menu-item name="PersonTraining" title="${uiLabelMap.HumanResTraining}">
+            <link target="EditPersonTrainings?partyId=${partyId}"/>
+        </menu-item>
     </menu>
 
     <menu name="create-new-party" type="simple" menu-container-style="basic-nav">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=658129&r1=658128&r2=658129&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue May 20 00:13:53 2008
@@ -1075,4 +1075,38 @@
             </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"/>
+                <entity-and entity-name="PersonTraining" list-name="personTrainings">
+                    <field-map field-name="partyId"/>
+                </entity-and>
+            </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://party/webapp/partymgr/party/PartyForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.HumanResNewPersonTraining}">
+                            <section>
+                                <widgets>
+                                    <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+                                </widgets>
+                            </section>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>