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/26 18:08:16 UTC
svn commit: r660223 - in /ofbiz/trunk/applications: humanres/config/
humanres/script/org/ofbiz/humanres/ humanres/servicedef/
humanres/webapp/humanres/WEB-INF/ humanres/widget/ humanres/widget/forms/
party/entitydef/
Author: ashish
Date: Mon May 26 09:08:13 2008
New Revision: 660223
URL: http://svn.apache.org/viewvc?rev=660223&view=rev
Log:
Applied patch from JIRA Issue # OFBIZ-1659.
Following things are covered in this patch.
Added tab for AgreementEmploymentAppl.
And added the common decorator pattern for search screen i.e "FindScreenDecorator".
For now we kept AgreementEmploymentAppl entity in the party component(Because other entities like AgreementProductAppl & AgreementWorkEffortAppl is also kept there).
Thanks Harsha Chadhar for your patch.
Modified:
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/party/entitydef/entitygroup.xml
ofbiz/trunk/applications/party/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Mon May 26 09:08:13 2008
@@ -389,6 +389,9 @@
<value xml:lang="it">Codice Applicazione</value>
<value xml:lang="th">รหัสà¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹</value>
</property>
+ <property key="HumanResAgreementEmploymentAppl">
+ <value xml:lang="en">Agreement Employment Appl</value>
+ </property>
<property key="HumanResBudgetID">
<value xml:lang="en">Budget ID</value>
<value xml:lang="it">Codice Budget</value>
@@ -423,6 +426,9 @@
<property key="HumanResEmplPositionResponsibilities">
<value xml:lang="en">Responsibilities</value>
</property>
+ <property key="HumanResEditAgreementEmploymentAppl">
+ <value xml:lang="en">Edit Agreement Employment Appl</value>
+ </property>
<property key="HumanResEditEmployment">
<value xml:lang="en">Edit Employment</value>
<value xml:lang="it">Aggiorna Impiegato</value>
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Mon May 26 09:08:13 2008
@@ -619,4 +619,23 @@
<entity-one entity-name="EmplPositionTypeRate" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
+
+ <simple-method method-name="createAgreementEmploymentAppl" short-description="Create Agreement Employment Appl">
+ <make-value entity-name="AgreementEmploymentAppl" value-name="agreementEmploymentAppl"/>
+ <set-pk-fields value-name="agreementEmploymentAppl" map-name="parameters"/>
+ <set-nonpk-fields value-name="agreementEmploymentAppl" map-name="parameters"/>
+ <create-value value-name="agreementEmploymentAppl"/>
+ <check-errors/>
+ </simple-method>
+
+ <simple-method method-name="updateAgreementEmploymentAppl" short-description="update an Agreement Employment Appl">
+ <entity-one entity-name="AgreementEmploymentAppl" value-name="lookedUpValue"/>
+ <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+
+ <simple-method method-name="deleteAgreementEmploymentAppl" short-description="Delete Agreement Employment Appl">
+ <entity-one entity-name="AgreementEmploymentAppl" value-name="agreementEmploymentAppl"/>
+ <remove-value value-name="agreementEmploymentAppl"/>
+ </simple-method>
</simple-methods>
\ No newline at end of file
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Mon May 26 09:08:13 2008
@@ -656,5 +656,28 @@
<permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
+
+ <service name="createAgreementEmploymentAppl" engine="simple" default-entity-name="AgreementEmploymentAppl"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="createAgreementEmploymentAppl" auth="true">
+ <description>Create Agreement Employment Appl</description>
+ <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ </service>
+
+ <service name="updateAgreementEmploymentAppl" engine="simple" default-entity-name="AgreementEmploymentAppl"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateAgreementEmploymentAppl" auth="true">
+ <description>Update Valid AgreementEmploymentAppl</description>
+ <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ <auto-attributes mode="IN" include="nonpk" optional="true"/>
+ </service>
+
+ <service name="deleteAgreementEmploymentAppl" engine="simple" default-entity-name="AgreementEmploymentAppl"
+ location="org/ofbiz/humanres/HumanResServices.xml" invoke="deleteAgreementEmploymentAppl" auth="true">
+ <description>Delete AgreementEmploymentAppl</description>
+ <permission-service service-name="humanResManagerPermission" main-action="DELETE"/>
+ <auto-attributes mode="IN" include="pk" optional="false"/>
+ </service>
</services>
\ No newline at end of file
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=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Mon May 26 09:08:13 2008
@@ -677,6 +677,26 @@
<event type="service" invoke="deleteEmplPositionTypeRate"/>
<response name="success" type="view" value="EditEmplPositionTypeRate"/>
</request-map>
+ <request-map uri="EditAgreementEmploymentAppls">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
+ </request-map>
+ <request-map uri="createAgreementEmploymentAppl">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createAgreementEmploymentAppl"/>
+ <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
+ <response name="error" type="view" value="EditAgreementEmploymentAppls"/>
+ </request-map>
+ <request-map uri="updateAgreementEmploymentAppl">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="updateAgreementEmploymentAppl"/>
+ <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
+ </request-map>
+ <request-map uri="deleteAgreementEmploymentAppl">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteAgreementEmploymentAppl"/>
+ <response name="success" type="view" value="EditAgreementEmploymentAppls"/>
+ </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>
@@ -748,4 +768,5 @@
<view-map name="FindEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindEmplPositionTypes"/>
<view-map name="EditEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypes"/>
<view-map name="EditEmplPositionTypeRate" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypeRate"/>
+ <view-map name="EditAgreementEmploymentAppls" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditAgreementEmploymentAppls"/>
</site-conf>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Mon May 26 09:08:13 2008
@@ -26,6 +26,7 @@
<property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
<set field="layoutSettings.companyName" from-field="uiLabelMap.HumanResCompanyName" global="true"/>
Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Mon May 26 09:08:13 2008
@@ -30,23 +30,23 @@
<widgets>
<decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResFindEmplPosition}">
- <section>
- <widgets>
- <container>
- <link target="EditEmplPosition" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmplPosition}" style="buttontext"/>
- </container>
- <include-form name="FindEmplPositions" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResFindEmplPosition}">
- <section>
- <widgets>
- <include-form name="ListEmplPositions" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
- </widgets>
- </section>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditEmplPosition" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmplPosition}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindEmplPositions" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListEmplPositions" location="component://humanres/widget/forms/EmplPositionForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Mon May 26 09:08:13 2008
@@ -35,37 +35,23 @@
<widgets>
<decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployment}"/>
- </container>
- </container>
- <container style="screenlet-body">
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
<section>
<widgets>
- <container>
+ <container style="button-bar">
<link target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}" text="${uiLabelMap.HumanResNewEmployment}" style="buttontext"/>
</container>
- <include-form name="FindEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
</widgets>
</section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.HumanResListEmployments}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListEmployments" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -684,33 +670,68 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResFindPayGrade}">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="EditPayGrade" text="${uiLabelMap.HumanResNewPayGrade}" style="buttontext"/>
- </container>
- <include-form name="FindPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml"/>
- </widgets>
- </section>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditPayGrade" text="${uiLabelMap.HumanResNewPayGrade}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml" />
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditAgreementEmploymentAppls">
+ <section>
+ <actions>
+ <set field="headerItem" value="AgreementEmploymentAppl"/>
+ <set field="titleProperty" value="EditAgreementEmploymentAppls"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label text="${uiLabelMap.HumanResListPayGrade}"/>
+ <label text="${uiLabelMap.CommonList} ${uiLabelMap.HumanResAgreementEmploymentAppl}"/>
</container>
</container>
<container style="screenlet-body">
<section>
<widgets>
- <include-form name="ListPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml" />
+ <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/EmploymentForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="h3">
+ <label text="${uiLabelMap.CommonAdd} ${uiLabelMap.HumanResAgreementEmploymentAppl}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddAgreementEmploymentAppl" location="component://humanres/widget/forms/EmploymentForms.xml" />
</widgets>
</section>
</container>
</container>
</decorator-section>
</decorator-screen>
- </widgets>
+ </widgets>
</section>
</screen>
</screens>
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Mon May 26 09:08:13 2008
@@ -61,23 +61,23 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResFindPartyResume}">
- <section>
- <widgets>
- <container>
- <link target="EditPartyResume" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
- </container>
- <include-form name="FindPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResFindPartyResume}">
- <section>
- <widgets>
- <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditPartyResume" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewPartyResume}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -164,23 +164,23 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResFindPartySkill}">
- <section>
- <widgets>
- <container style="button-bar">
- <link target="NewPartySkill" 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-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="NewPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -349,23 +349,23 @@
<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-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="NewPersonTraining" text="${uiLabelMap.HumanResNewPersonTraining}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -408,23 +408,23 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.HumanResFindPartyQual}">
- <section>
- <widgets>
- <container>
- <link target="NewPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/>
- </container>
- <include-form name="FindPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.HumanResListPartyQual}">
- <section>
- <widgets>
- <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="NewPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
@@ -502,23 +502,23 @@
<widgets>
<decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmplPositionType}">
- <section>
- <widgets>
- <container>
- <link target="EditEmplPositionTypes" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplPositionType}" style="buttontext"/>
- </container>
- <include-form name="FindEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
- <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplPositionType}">
- <section>
- <widgets>
- <include-form name="ListEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
- </widgets>
- </section>
- </screenlet>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditEmplPositionTypes" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmplPositionType}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListEmplPositionTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</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=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Mon May 26 09:08:13 2008
@@ -513,4 +513,51 @@
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
+ <form name="ListAgreementEmploymentAppls" type="multi" title="" target="updateAgreementEmploymentAppl"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <actions>
+ <entity-condition entity-name="AgreementEmploymentAppl"><order-by field-name="fromDate"/></entity-condition>
+ </actions>
+ <auto-fields-service service-name="updateAgreementEmploymentAppl" default-field-type="hidden"/>
+ <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><display/></field>
+ <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><display/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><display/></field>
+ <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><display/></field>
+ <field name="roleTypeIdFrom"><display/></field>
+ <field name="roleTypeIdTo"><display/></field>
+ <field name="fromDate"><display/></field>
+ <field name="agreementDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+ <hyperlink target="deleteAgreementEmploymentAppl?agreementId=${agreementId}&partyIdTo=${partyIdTo}&partyIdFrom=${partyIdFrom}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}&agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
+ </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="AddAgreementEmploymentAppl" type="single" target="createAgreementEmploymentAppl" default-map-name="agreementEmploymentAppl"
+ header-row-style="header-row" default-table-style="basic-table">
+ <auto-fields-service service-name="createAgreementEmploymentAppl" default-field-type="display"/>
+ <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><text/></field>
+ <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><text/></field>
+ <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}">
+ <drop-down allow-empty="false">
+ <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="roleTypeIdTo" tooltip="${uiLabelMap.CommonRequired}">
+ <drop-down allow-empty="false">
+ <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="fromDate"><date-time/></field>
+ <field name="agreementDate"><date-time/></field>
+ <field name="thruDate"><date-time/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitygroup.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitygroup.xml Mon May 26 09:08:13 2008
@@ -28,6 +28,7 @@
<entity-group group="org.ofbiz" entity="Addendum" />
<entity-group group="org.ofbiz" entity="Agreement" />
<entity-group group="org.ofbiz" entity="AgreementAttribute" />
+ <entity-group group="org.ofbiz" entity="AgreementEmploymentAppl" />
<entity-group group="org.ofbiz" entity="AgreementGeographicalApplic" />
<entity-group group="org.ofbiz" entity="AgreementItem" />
<entity-group group="org.ofbiz" entity="AgreementItemAttribute" />
Modified: ofbiz/trunk/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/entitydef/entitymodel.xml?rev=660223&r1=660222&r2=660223&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/party/entitydef/entitymodel.xml Mon May 26 09:08:13 2008
@@ -2464,4 +2464,39 @@
<key-map field-name="partyId"/>
</relation>
</extend-entity>
-</entitymodel>
+ <entity entity-name="AgreementEmploymentAppl"
+ package-name="org.ofbiz.party.agreement"
+ title="Agreement Employment Application Entity">
+ <field name="agreementId" type="id-ne"></field>
+ <field name="agreementItemSeqId" type="id-ne"></field>
+ <field name="partyIdFrom" type="id-ne"></field>
+ <field name="partyIdTo" type="id-ne"></field>
+ <field name="roleTypeIdFrom" type="id-ne"></field>
+ <field name="roleTypeIdTo" type="id-ne"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="agreementDate" type="date-time"/>
+ <field name="thruDate" type="date-time"/>
+ <prim-key field="agreementId"/>
+ <prim-key field="agreementItemSeqId"/>
+ <prim-key field="partyIdTo"/>
+ <prim-key field="partyIdFrom"/>
+ <prim-key field="roleTypeIdTo"/>
+ <prim-key field="roleTypeIdFrom"/>
+ <prim-key field="fromDate"/>
+ <relation type="one" fk-name="AGRMNT_EMPL_APPL" rel-entity-name="Employment">
+ <key-map field-name="roleTypeIdFrom"/>
+ <key-map field-name="roleTypeIdTo"/>
+ <key-map field-name="partyIdFrom"/>
+ <key-map field-name="partyIdTo"/>
+ <key-map field-name="fromDate"/>
+ </relation>
+ <relation type="many" rel-entity-name="Agreement">
+ <key-map field-name="agreementId" rel-field-name="partyIdFrom"/>
+ <key-map field-name="agreementId" rel-field-name="partyIdTo"/>
+ </relation>
+ <relation type="one" fk-name="AGRMNT_EMPL_AITM" rel-entity-name="AgreementItem">
+ <key-map field-name="agreementId"/>
+ <key-map field-name="agreementItemSeqId"/>
+ </relation>
+ </entity>
+</entitymodel>
\ No newline at end of file