You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/05/16 17:06:11 UTC
svn commit: r657095 - in /ofbiz/trunk/applications:
humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/
party/webapp/partymgr/WEB-INF/ party/widget/partymgr/
Author: ashish
Date: Fri May 16 08:06:11 2008
New Revision: 657095
URL: http://svn.apache.org/viewvc?rev=657095&view=rev
Log:
Applied patch from JIRA issue (Improve HR module) :- https://issues.apache.org/jira/browse/OFBIZ-1659
In this patch PartySkills tab is added in the party section.
Thanks to Harsha Chadhar for your patch.
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.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/widget/partymgr/CommonScreens.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=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri May 16 08:06:11 2008
@@ -27,6 +27,7 @@
<owner>Copyright 2001-2007 The Apache Software Foundation</owner>
<!-- view handlers -->
+ <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
<handler name="screenxml" type="view" class="org.ofbiz.widget.screen.ScreenXmlViewHandler"/>
<!-- Events to run on every request before security (chains exempt) -->
@@ -126,9 +127,9 @@
</request-map>
<request-map uri="updatePartySkill">
<security https="true" auth="true"/>
- <event type="service" invoke="updatePartySkill"/>
+ <event type="service-multi" invoke="updatePartySkill"/>
<response name="success" type="view" value="FindPartySkills"/>
- <response name="error" type="view" value="EditPartySkills"/>
+ <response name="error" type="view" value="FindPartySkills"/>
</request-map>
<request-map uri="deletePartySkill">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Fri May 16 08:06:11 2008
@@ -165,45 +165,31 @@
<actions>
<set field="titleProperty" value="HumanResEditPartySkill"/>
<set field="headerItem" value="PartySkills"/>
- <set field="partyId" from-field="parameters.employeePartyId"/>
- <entity-one entity-name="PartySkill" value-name="partySkill"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="partyId" from-field="parameters.partyId"/>
+ <entity-and entity-name="PartySkill" list-name="partySkills">
+ <field-map field-name="partyId"/>
+ </entity-and>
</actions>
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResEditPartySkill}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
- </container>
- <include-form name="FindPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResListPartySkill}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.HumanResEditPartySkill}">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
+ </container>
+ <include-form name="FindPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResListPartySkill}">
+ <section>
+ <widgets>
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -221,23 +207,16 @@
<widgets>
<decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResEditPartySkill}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
- </container>
- <include-form name="EditPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.HumanResEditPartySkill}">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
+ </container>
+ <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Fri May 16 08:06:11 2008
@@ -96,39 +96,36 @@
</drop-down>
</field>
<field name="yearsExperience"><text-find/></field>
- <field name="rating"><date-time/></field>
- <field name="skillLevel"><date-time/></field>
+ <field name="rating"><text-find/></field>
+ <field name="skillLevel"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListPartySkills" type="list" list-name="listIt" separate-columns="true" target="updatePartySkill" default-entity-name="PartySkill" title="" paginate-target="FindPartySkills"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <form name="ListPartySkills" type="multi" list-name="partySkills" use-row-submit="true" separate-columns="true" target="updatePartySkill?partyId=${partyId}"
+ 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">
+ <set field="partyId" from-field="parameters.partyId"/>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="partySkills">
<field-map field-name="inputFields" env-name="parameters"/>
<field-map field-name="entityName" value="PartySkill"/>
</service>
</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}&partyId=${partyId}"/>
- </field>
- <field name="yearsExperience"><display/></field>
- <field name="rating"><display/></field>
- <field name="skillLevel"><display/></field>
+ <row-actions>
+ <set field="skillTypeId" from-field="skillTypeId"/>
+ </row-actions>
+ <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/>
+ <field name="partyId"><hidden/></field>
+ <field name="skillTypeId"><display/></field>
+ <field name="yearsExperience"><text/></field>
+ <field name="rating"><text/></field>
+ <field name="skillLevel"><text/></field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
</form>
- <form name="EditPartySkill" type="single" target="updatePartySkill" default-map-name="partySkill"
+ <form name="AddPartySkills" type="single" target="createPartySkill"
header-row-style="header-row" default-table-style="basic-table">
- <actions>
- <entity-one entity-name="PartySkill" value-name="skillType" auto-field-map="false">
- <field-map field-name="skillTypeId" env-name="partySkill.skillTypeId"/>
- </entity-one>
- </actions>
- <alt-target use-when="partySkill==null" target="createPartySkill"/>
- <auto-fields-service service-name="updatePartySkill"/>
- <field name="partyId" use-when="partyId!=null&&skillTypeId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="partyId" use-when="partyId==null"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyId" use-when="partyId != null"><hidden/></field>
+ <field name="partyId" use-when="skillTypeId == null&&partyId == null"><lookup target-form-name="LookupPartyName"/></field>
<field name="skillTypeId">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="SkillType">
@@ -139,8 +136,7 @@
<field name="yearsExperience"><text/></field>
<field name="rating"><text/></field>
<field name="skillLevel"><text/></field>
- <field name="submitButton" use-when="partySkill==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- <field name="submitButton" use-when="partySkill!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPerfReviews" type="list" title="" target="updatePerfReview" paginate-target="findPerfReviews"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
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=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri May 16 08:06:11 2008
@@ -20,10 +20,11 @@
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
- <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
+ <include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<description>Party Manager Module Site Configuration File</description>
<owner>Copyright 2001-2007 The Apache Software Foundation</owner>
+ <handler name="service-multi" type="request" class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
<handler name="simplecontent" type="view" class="org.ofbiz.content.view.SimpleContentViewHandler"/>
<handler name="jsonservice" type="request" class="org.ofbiz.webapp.event.JSONServiceEventHandler"/>
@@ -938,6 +939,28 @@
<response name="success" type="view" value="viewprofile"/>
<response name="error" type="view" value="viewprofile"/>
</request-map>
+
+ <request-map uri="EditPartySkills">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditPartySkills"/>
+ </request-map>
+ <request-map uri="createPartySkill">
+ <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">
+ <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="deletePartySkill">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deletePartySkill"/>
+ <response name="success" type="view" value="EditPartySkills"/>
+ </request-map>
<!-- Lookup request mappings -->
<request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
@@ -1051,5 +1074,6 @@
<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"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Fri May 16 08:06:11 2008
@@ -31,6 +31,8 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.PartyCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri May 16 08:06:11 2008
@@ -61,6 +61,9 @@
<menu-item name="PartyContents" title="${uiLabelMap.PartyContent}">
<link target="EditPartyContents?partyId=${partyId}"/>
</menu-item>
+ <menu-item name="PartySkills" title="${uiLabelMap.ProjectMgrPartySkills}">
+ <link target="EditPartySkills?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=657095&r1=657094&r2=657095&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri May 16 08:06:11 2008
@@ -1040,4 +1040,39 @@
</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"/>
+ <entity-and entity-name="PartySkill" list-name="partySkills">
+ <field-map field-name="partyId"/>
+ </entity-and>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.HumanResListPartySkill}">
+ <section>
+ <widgets>
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.HumanResNewPartySkill}">
+ <section>
+ <widgets>
+ <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>