You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2008/11/16 09:00:20 UTC
svn commit: r717988 - in /ofbiz/trunk/applications/humanres/widget:
EmploymentAppScreens.xml PartySkillScreens.xml PerfReviewScreens.xml
PersonTrainingScreens.xml forms/EmploymentForms.xml
forms/PartySkillForms.xml forms/PersonTrainingForms.xml
Author: apatel
Date: Sun Nov 16 00:00:20 2008
New Revision: 717988
URL: http://svn.apache.org/viewvc?rev=717988&view=rev
Log:
Minor usability cleanups.
Modified:
ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml Sun Nov 16 00:00:20 2008
@@ -63,10 +63,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
<screenlet id="AddEmploymentAppPanel" title="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResEmploymentApp}" collapsible="true">
<include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</screenlet>
- <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Sun Nov 16 00:00:20 2008
@@ -67,10 +67,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
<screenlet id="AddPartySkillPanel" title="${uiLabelMap.HumanResAddPartySkill}" collapsible="true">
<include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</screenlet>
- <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml Sun Nov 16 00:00:20 2008
@@ -87,10 +87,10 @@
<widgets>
<decorator-screen name="CommonPerfReviewDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
<screenlet id="AddPerfReviewItemPanel" title="${uiLabelMap.HumanResAddPerfReviewItems}" collapsible="true">
<include-form name="AddPerfReviewItem" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
</screenlet>
- <include-form name="ListPerfReviewItems" location="component://humanres/widget/forms/PerfReviewForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Sun Nov 16 00:00:20 2008
@@ -67,10 +67,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
<screenlet id="AddPersonTrainingPanel" title="${uiLabelMap.HumanResAddPersonTraining}" collapsible="true">
<include-form name="AddPersonTraining" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</screenlet>
- <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PersonTrainingForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sun Nov 16 00:00:20 2008
@@ -95,19 +95,26 @@
<auto-fields-service service-name="createEmployment" default-field-type="hidden"/>
<field name="roleTypeIdFrom"><hidden value="INTERNAL_ORGANIZATIO"/></field>
<field name="roleTypeIdTo"><hidden value="EMPLOYEE"/></field>
- <field name="partyIdFrom" use-when="employment==null" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}">
+ <field name="partyIdFrom" use-when="employment==null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}">
<drop-down allow-empty="false">
<entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
<entity-constraint name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-options>
</drop-down>
</field>
- <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="partyIdTo" use-when="employment==null" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="fromDate" use-when="employment==null" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
- <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
+ <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="partyIdTo" use-when="employment==null" title="${uiLabelMap.HumanResEmployeePartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResEmployeePartyIdTo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="fromDate" use-when="employment==null" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
+ <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonFromDate}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="thruDate" use-when="employment!=null" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
+ <field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}">
+ <drop-down allow-empty="true" no-current-selected-key="------">
+ <entity-options description="${description}" key-field-name="terminationReasonId" entity-name="TerminationReason">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="terminationTypeId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationTypeId}">
<drop-down allow-empty="true" no-current-selected-key="------">
<entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Sun Nov 16 00:00:20 2008
@@ -37,44 +37,25 @@
<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="updatePartySkillExt?partyId=${partyId}" paginate-target="findPartySkills"
- odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <form name="ListPartySkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkillExt" 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">
- <field-map field-name="inputFields" env-name="partySkillsCtx"/>
- <field-map field-name="entityName" value="PartySkill"/>
- <field-map field-name="orderBy" value="partyId"/>
- <field-map field-name="orderBy" value="skillTypeId"/>
- </service>
- <set field="insideEmployee" from-field="parameters.insideEmployee"/>
+ <entity-condition entity-name="PartySkill">
+ <condition-expr field-name="partyId" env-name="partyId"/>
+ <order-by field-name="skillTypeId"/>
+ </entity-condition>
</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 name="skillTypeId">
<display-entity entity-name="SkillType" description="${description}"/>
</field>
- <field name="firstName" title="${uiLabelMap.PartyFirstName}" entry-name="partyId">
- <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName}"/>
- </field>
- <field name="lastName" title="${uiLabelMap.PartyLastName}" entry-name="partyId">
- <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${lastName}"/>
- </field>
<field name="yearsExperience"><text/></field>
<field name="rating"><text/></field>
<field name="skillLevel"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deletePartySkill?skillTypeId=${skillTypeId}&&partyId=${partyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
- <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
- <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
<form name="AddPartySkills" type="single" target="createPartySkill" default-map-name="partySkill"
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=717988&r1=717987&r2=717988&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Sun Nov 16 00:00:20 2008
@@ -34,7 +34,7 @@
<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="updatePersonTrainingsExt?partyId=${partyId}" paginate-target="FindPersonTrainings"
+ <form name="ListPersonTrainings" type="list" 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">