Author: hansbak
Date: Thu Dec 13 01:53:00 2007
New Revision: 603867
URL: http://svn.apache.org/viewvc?rev=603867&view=rev
Log:
show the partyskill functionality
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.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=603867&r1=603866&r2=603867&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
Thu Dec 13 01:53:00 2007
@@ -112,7 +112,7 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="ListPartySkills"/>
</request-map>
- <request-map uri="EditPartySkills">
+ <request-map uri="EditPartySkill">
<security https="true" auth="true"/>
<response name="success" type="view" value="EditPartySkills"/>
</request-map>
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl?rev=603867&r1=603866&r2=603867&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
Thu Dec 13 01:53:00 2007
@@ -29,6 +29,7 @@
<li<#if selected == "TerminationReason"> class="selected"</#if>><a
href="<@ofbizUrl>findTerminationReasons</@ofbizUrl>">${uiLabelMap.HumanResTerminationReason}</a></li>
<li<#if selected == "UnemploymentClaim"> class="selected"</#if>><a
href="<@ofbizUrl>findUnemploymentClaims</@ofbizUrl>">${uiLabelMap.HumanResUnemploymentClaim}</a></li>
<li<#if selected == "EmploymentApp"> class="selected"</#if>><a
href="<@ofbizUrl>findEmploymentApps</@ofbizUrl>">${uiLabelMap.HumanResEmploymentApp}</a></li>
+ <li<#if selected == "PartySkills"> class="selected"</#if>><a
href="<@ofbizUrl>ListPartySkills</@ofbizUrl>">${uiLabelMap.HumanResListPartySkill}</a></li>
<li<#if selected == "SkillType"> class="selected"</#if>><a
href="<@ofbizUrl>findSkillTypes</@ofbizUrl>">${uiLabelMap.HumanResSkillType}</a></li>
<#if userLogin?has_content>
<li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=603867&r1=603866&r2=603867&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Thu Dec 13
01:53:00 2007
@@ -45,26 +45,46 @@
</widgets>
</section>
</screen>
- <screen name="ListPartyResumes">
- <section>
- <widgets>
- <decorator-screen name="CommonPartyAbilityDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container style="boxoutside">
- <container style="screenlet-header">
- <label
style="boxhead">${uiLabelMap.HumanResListPartyResumes}</label>
- </container>
- </container>
- <label><br/></label>
- <container>
- <link target="EditPartyResume"
text="${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
- </container>
- <include-form name="ListPartyResumes"
location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
+ <screen name="ListPartyResumes">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonPartyAbilityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="boxoutside">
+ <container style="screenlet-header">
+ <label
style="boxhead">${uiLabelMap.HumanResListPartyResumes}</label>
+ </container>
+ </container>
+ <label><br/></label>
+ <container>
+ <link target="EditPartyResume"
text="${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
+ </container>
+ <include-form name="ListPartyResumes"
location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ListPartySkills">
+ <section>
+ <widgets>
+ <decorator-screen name="CommonPartyAbilityDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="boxoutside">
+ <container style="screenlet-header">
+ <label
style="boxhead">${uiLabelMap.HumanResListPartySkill}</label>
+ </container>
+ </container>
+ <label><br/></label>
+ <container>
+ <link target="EditPartySkill"
text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
+ </container>
+ <include-form name="ListPartySkills"
location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditPartyResume">
<section>
<actions>
@@ -130,7 +150,8 @@
<actions>
<set field="headerItem" value="PartyReview"/>
<set field="tabButtonItem" value="EditPartySkill"/>
- <set field="partyId" from-field="parameters.employeePartyId"/>
+ <set field="partyId" from-field="parameters.employeePartyId"/>
+ <entity-one entity-name="PartySkill" value-name="partySkill"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=603867&r1=603866&r2=603867&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Thu
Dec 13 01:53:00 2007
@@ -93,8 +93,9 @@
</field>
</form>
<form name="EditPartySkill" type="single" target="updatePartySkill"
title="createPartySkill" default-map-name="partySkill">
+ <alt-target use-when="partySkill==null" target="createPartySkill"/>
<auto-fields-service service-name="createPartySkill"/>
- <field name="partyId" title="partyId"><hidden/></field>
+ <field name="partyId" title="partyId"><text/></field>
<field name="skillTypeId" title="skillType Id"
tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="false">
<entity-options description="${description}"
key-field-name="skillTypeId" entity-name="SkillType">
