svn commit: r656669 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Thu May 15 07:06:50 2008 New Revision: 656669 URL: http://svn.apache.org/viewvc?rev=656669&view=rev Log: Applied patch for JIRA issue :-https://issues.apache.org/jira/browse/OFBIZ-1659 Following things are covered in this patch :- 1.Improved the Responsibility Type functionality. 2.Improved the List Party Skill Tab. 3.Improved the Employment Tab. Thanks Harsha Chadhar for your patch. Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Thu May 15 07:06:50 2008 @@ -44,4 +44,11 @@ <EmplPositionType description="Programmer" hasTable="N" parentTypeId="" emplPositionTypeId="PROGRAMMER"/> <EmplPositionType description="System Administrator" hasTable="N" parentTypeId="" emplPositionTypeId="SYS_ADMIN"/> <EmplPositionType description="Business Analyst" hasTable="N" parentTypeId="" emplPositionTypeId="BIZ_ANALYST"/> + + <ResponsibilityType description="Finance Management" hasTable="N" parentTypeId="" statusTypeId="FIN_MGMT"/> + <ResponsibilityType description="Inventory Management" hasTable="N" parentTypeId="" statusTypeId="INV_MGMT"/> + <ResponsibilityType description="Purchase Management" hasTable="N" parentTypeId="" statusTypeId="PUR_MGMT"/> + <ResponsibilityType description="Resource Management" hasTable="N" parentTypeId="" statusTypeId="RES_MGMT"/> + <ResponsibilityType description="Production Management" hasTable="N" parentTypeId="" statusTypeId="PROD_MGMT"/> + <ResponsibilityType description="Sales Management" hasTable="N" parentTypeId="" statusTypeId="SALES_MGMT"/> </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=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu May 15 07:06:50 2008 @@ -109,23 +109,26 @@ <event type="service" invoke="deletePartyResume"/> <response name="success" type="view" value="ListPartyResumes"/> </request-map> - <request-map uri="ListPartySkills"> + <request-map uri="FindPartySkills"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListPartySkills"/> + <response name="success" type="view" value="FindPartySkills"/> + <response name="error" type="view" value="FindPartySkills"/> </request-map> - <request-map uri="EditPartySkill"> + <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="success" type="view" value="FindPartySkills"/> + <response name="error" type="view" value="EditPartySkills"/> </request-map> <request-map uri="updatePartySkill"> <security https="true" auth="true"/> <event type="service" invoke="updatePartySkill"/> - <response name="success" type="view" value="ListPartySkills"/> + <response name="success" type="view" value="FindPartySkills"/> + <response name="error" type="view" value="EditPartySkills"/> </request-map> <request-map uri="deletePartySkill"> <security https="true" auth="true"/> @@ -134,7 +137,7 @@ </request-map> <request-map uri="findPerfReviews"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListPerfReviews"/> + <response name="success" type="view" value="EditPerfReviews"/> </request-map> <request-map uri="EditPerfReviews"> <security https="true" auth="true"/> @@ -183,9 +186,9 @@ <response name="success" type="view" value="ListPersonTrainings"/> </request-map> <!-- ================Employment Group==================================== --> - <request-map uri="findEmployments"> + <request-map uri="FindEmployments"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListEmployments"/> + <response name="success" type="view" value="FindEmployments"/> </request-map> <request-map uri="EditEmployment"> <security https="true" auth="true"/> @@ -199,7 +202,7 @@ <request-map uri="updateEmployment"> <security https="true" auth="true"/> <event type="service" invoke="updateEmployment"/> - <response name="success" type="view" value="ListEmployments"/> + <response name="success" type="view" value="EditEmployment"/> </request-map> <request-map uri="deleteEmployment"> <security https="true" auth="true"/> @@ -268,7 +271,7 @@ </request-map> <request-map uri="findPayRollPreferences"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListPayRollPreferences"/> + <response name="success" type="view" value="EditPayrollPreferences"/> </request-map> <request-map uri="EditPayrollPreferences"> <security https="true" auth="true"/> @@ -527,10 +530,6 @@ <response name="error" type="view" value="CreateEmployee"/> </request-map> <!-- ===================Responsibility Request============== --> - <request-map uri="FindResponsibilityType"> - <security https="true" auth="true"/> - <response name="success" type="view" value="FindResponsibilityType"/> - </request-map> <request-map uri="EditResponsibilityType"> <security https="true" auth="true"/> <response name="success" type="view" value="EditResponsibilityType"/> @@ -550,7 +549,7 @@ <request-map uri="deleteResponsibilityType"> <security https="true" auth="true"/> <event type="service" invoke="deleteResponsibilityType"/> - <response name="success" type="view" value="FindResponsibilityType"/> + <response name="success" type="view" value="EditResponsibilityType"/> <response name="error" type="view" value="EditResponsibilityType"/> </request-map> <!-- ===================Lookup Request===================== --> @@ -564,13 +563,12 @@ <request-map uri="LookupPayGrade"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayGrade"/></request-map> <view-map name="main" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPosition"/> - <view-map name="ListPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPerfReviews"/> <view-map name="EditPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviews"/> <view-map name="EditPerfReviewItems" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviewItems"/> <view-map name="ListPartyResumes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPartyResumes"/> <view-map name="EditPartyResume" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyResume"/> - <view-map name="ListPartySkills" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPartySkills"/> + <view-map name="FindPartySkills" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartySkills"/> <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartySkills"/> <view-map name="EditPartyQuals" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyQuals"/> @@ -583,13 +581,12 @@ <view-map name="EditValidResponsibility" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditValidResponsibility"/> <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/> - <view-map name="ListEmployments" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListEmployments"/> + <view-map name="FindEmployments" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployments"/> <view-map name="EditEmployment" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmployment"/> <view-map name="ListEmploymentApps" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListEmploymentApps"/> <view-map name="EditEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmploymentApp"/> <view-map name="ListPartyBenefits" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPartyBenefits"/> <view-map name="EditPartyBenefits" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartyBenefits"/> - <view-map name="ListPayRollPreferences" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayrollPreferences"/> <view-map name="EditPayrollPreferences" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPayrollPreferences"/> <view-map name="ListPayHistories" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayHistories"/> <view-map name="ListPayGrades" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayGrades"/> @@ -611,6 +608,5 @@ <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditSkillTypes"/> <view-map name="FindEmployee" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployee"/> <view-map name="CreateEmployee" type="screen" page="component://humanres/widget/EmploymentScreens.xml#CreateEmployee"/> - <view-map name="FindResponsibilityType" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindResponsibilityType"/> <view-map name="EditResponsibilityType" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditResponsibilityType"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Thu May 15 07:06:50 2008 @@ -20,11 +20,17 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="ListEmployments"> + <screen name="FindEmployments"> <section> <actions> - <set field="titleProperty" value="HumanResListEmployments"/> + <set field="titleProperty" value="FindEmployment"/> <set field="headerItem" value="Employment"/> + <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/> + <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/> + <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> + <set field="partyIdTo" from-field="parameters.partyIdTo"/> + <set field="fromDate" from-field="parameters.fromDate"/> + <entity-one entity-name="Employment" value-name="employment"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> @@ -32,15 +38,29 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResListEmployments}"/> + <label text="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployment}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> <container> - <link text="${uiLabelMap.HumanResNewEmployment}" target="EditEmployment" style="buttontext"/> + <link target="EditEmployment" 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> @@ -56,6 +76,7 @@ <actions> <set field="titleProperty" value="HumanResEditEmployment"/> <set field="headerItem" value="Employment"/> + <set field="tabButtonItem" value="EditEmployment"/> <set field="roleTypeIdFrom" from-field="parameters.roleTypeIdFrom"/> <set field="roleTypeIdTo" from-field="parameters.roleTypeIdTo"/> <set field="partyIdFrom" from-field="parameters.partyIdFrom"/> @@ -69,33 +90,13 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResListEmployments}"/> + <label text="${uiLabelMap.HumanResEditEmployment}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container> - <link text="${uiLabelMap.HumanResNewEmployment}" target="EditEmployment" style="buttontext"/> - </container> - <include-form name="ListEmployments" 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.HumanResNewEmployment}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.HumanResNewEmployment}" target="EditEmployment" style="buttontext"/> - </container> - <include-form name="AddEmployment" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <include-form name="EditEmployment" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </container> @@ -188,14 +189,25 @@ <container style="screenlet-body"> <section> <widgets> - <container> - <link text="${uiLabelMap.HumanResNewEmploymentApp}" target="EditEmploymentApp" style="buttontext"/> - </container> <include-form name="ListPayHistories" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </container> - </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResNewEmploymentApp}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -248,7 +260,7 @@ </decorator-screen> </widgets> </section> - </screen> + </screen> <screen name="EditPayrollPreferences"> <section> <actions> @@ -272,9 +284,6 @@ <container style="screenlet-body"> <section> <widgets> - <container> - <link text="${uiLabelMap.HumanResNewPayrollPreferences}" target="EditPayrollPreferences?partyId=${partyId}&roleTypeId=${roleTypeId}" style="buttontext"/> - </container> <include-form name="ListPayrollPreferences" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> @@ -283,13 +292,13 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResEditPayrollPreference}"/> + <label text="${uiLabelMap.HumanResNewPayrollPreferences}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <include-form name="EditPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <include-form name="AddPayrollPreference" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </container> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Thu May 15 07:06:50 2008 @@ -24,15 +24,15 @@ default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem"> <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item> <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item> - <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="findEmployments"/></menu-item> + <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item> <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="findPayGrades"/></menu-item> <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="findTerminationReasons"/></menu-item> <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="findUnemploymentClaims"/></menu-item> <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="findEmploymentApps"/></menu-item> - <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="ListPartySkills"/></menu-item> + <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="FindPartySkills"/></menu-item> <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="FindResponsibilityType"/></menu-item> + <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="EditResponsibilityType"/></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"/> @@ -44,6 +44,9 @@ </menu> <menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> + <menu-item name="EditEmployment" title="${uiLabelMap.HumanResEditEmployment}"> + <link target="EditEmployment?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> + </menu-item> <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}"> <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> </menu-item> Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Thu May 15 07:06:50 2008 @@ -80,37 +80,6 @@ </widgets> </section> </screen> - <screen name="ListPartySkills"> - <section> - <actions> - <set field="titleProperty" value="HumanResListPartySkill"/> - <set field="headerItem" value="PartySkills"/> - </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.HumanResListPartySkill}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> - </container> - <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> - </widgets> - </section> - </container> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditPartyResume"> <section> <actions> @@ -167,9 +136,6 @@ <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditPerfReviews?employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}" text="${uiLabelMap.HumanResNewPartyReview}" style="buttontext"/> - </container> <include-form name="ListPerfReviews" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> </section> @@ -178,13 +144,13 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.PageTitleEditPartyReview}"/> + <label text="${uiLabelMap.HumanResNewPartyReview}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <include-form name="EditPerfReview" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="AddPerfReview" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> </section> </container> @@ -194,13 +160,15 @@ </widgets> </section> </screen> - <screen name="EditPartySkills"> + <screen name="FindPartySkills"> <section> <actions> <set field="titleProperty" value="HumanResEditPartySkill"/> - <set field="headerItem" value="PartySkills"/> + <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"/> </actions> <widgets> <decorator-screen name="CommonPartyAbilityDecorator" location="${parameters.mainDecoratorLocation}"> @@ -208,16 +176,16 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResListPartySkill}"/> + <label text="${uiLabelMap.HumanResEditPartySkill}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> + <container style="button-bar"> + <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> </container> - <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="FindPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form> </widgets> </section> </container> @@ -225,13 +193,13 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResNewPartySkill}"/> + <label text="${uiLabelMap.HumanResListPartySkill}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <include-form name="AddPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> </section> </container> @@ -240,7 +208,41 @@ </decorator-screen> </widgets> </section> - </screen> + </screen> + <screen name="EditPartySkills"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditPartySkill"/> + <set field="headerItem" value="PartySkills"/> + <set field="partyId" from-field="parameters.employeePartyId"/> + <set field="skillTypeId" from-field="parameters.skillTypeId"/> + <entity-one entity-name="PartySkill" value-name="partySkill"/> + </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="EditPartySkill" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="EditPerfReviewItems"> <section> <actions> @@ -322,52 +324,55 @@ </widgets> </section> </screen> - <screen name="FindResponsibilityType"> + <screen name="EditResponsibilityType"> <section> <actions> + <set field="titleProperty" value="PageTitleEditResponsibilityType"/> <set field="headerItem" value="ResponsibilityType"/> - <set field="titleProperty" value="PageTitleFindResponsibilityType"/> + <set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/> + <entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> - <condition> - <if-has-permission permission="HUMANRES" action="_VIEW"/> - </condition> <widgets> - <container style="h1"> - <label>${uiLabelMap.${titleProperty}}</label> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.${titleProperty}}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListResponsibilityTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </container> </container> - <container style="button-bar"> - <link target="EditResponsibilityType" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResResponsibilityType}" style="buttontext"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResNewEmplPositionResponsibility}"/> </container> - <include-form name="ListResponsibilityTypes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddResponsibilityType" location="component://humanres/widget/forms/PartyAbilityForms.xml" /> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.HumanResViewPermissionError}</label> + </fail-widgets> + </section> + </container> + </container> </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.HumanResViewPermissionError}</label> - </fail-widgets> </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> - <screen name="EditResponsibilityType"> - <section> - <actions> - <set field="titleProperty" value="PageTitleEditResponsibilityType"/> - <set field="headerItem" value="EditResponsibilityType"/> - <set field="responsibilityTypeId" from-field="parameters.responsibilityTypeId"/> - <entity-one entity-name="ResponsibilityType" value-name="responsibilityType"/> - </actions> - <widgets> - <decorator-screen name="CommonResponsibilityTypeDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-form name="EditResponsibilityType" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu May 15 07:06:50 2008 @@ -21,34 +21,61 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListEmployments" type="list" target="updateEmployment" paginate-target="findEmployment" + <form name="FindEmployments" type="single" target="FindEmployments" + odd-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="Employment" default-field-type="find"/> + <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="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="fromDate"><date-time/></field> + <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field> + <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType"> + <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="ListEmployments" type="list" target="updateEmployment" paginate-target="FindEmployments" default-entity-name="Employment" list-name="listIt" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="Employment"/> + <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="Employment"/> + </service> </actions> <auto-fields-service service-name="updateEmployment"/> - - <field name="roleTypeIdFrom"><display/></field> + <field name="roleTypeIdFrom" widget-style="buttontext"> + <hyperlink also-hidden="false" description="${roleTypeIdFrom}" target="EditEmployment?partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&fromDate=${fromDate}"/> + </field> <field name="roleTypeIdTo"><display/></field> <field name="partyIdFrom"><display/></field> <field name="partyIdTo"><display/></field> <field name="fromDate"><display/></field> - <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field> - <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="terminationTypeId" entity-name="TerminationType"> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteEmployment?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> + <field name="thruDate"><display/></field> + <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field> + <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field> </form> - <form name="AddEmployment" type="single" target="createEmployment" + <form name="EditEmployment" type="single" target="updateEmployment" default-map-name="employment" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createEmployment"/> + <alt-target use-when="employment==null" target="createEmployment"/> + <auto-fields-service service-name="createEmployment" default-field-type="hidden"/> <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> @@ -74,7 +101,8 @@ </entity-options> </drop-down> </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + <field name="submitButton" use-when="employment==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="employment!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListEmploymentApps" type="list" title="" paginate-target="findEmploymentApps" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -85,9 +113,6 @@ <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${applicationId}" target="EditEmploymentApp?applicationId=${applicationId}"/> </field> - <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteEmploymentApp?applicationId=${applicationId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> </form> <form name="EditEmploymentApp" type="single" target="updateEmploymentApp" title="" default-map-name="employmentApp" header-row-style="header-row" default-table-style="basic-table"> @@ -150,14 +175,19 @@ </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deletePayHistory?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> </form> <form name="ListPartyBenefits" type="list" target="updatePartyBenefit" title="" paginate-target="findPartyBenefits" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="PartyBenefit"/> + <entity-condition entity-name="PartyBenefit"> + <condition-list combine="and"> + <condition-expr field-name="roleTypeIdFrom" operator="equals" env-name="parameters.roleTypeIdFrom"/> + <condition-expr field-name="roleTypeIdTo" operator="equals" env-name="parameters.roleTypeIdTo"/> + <condition-expr field-name="partyIdFrom" operator="equals" env-name="parameters.partyIdFrom"/> + <condition-expr field-name="partyIdTo" operator="equals" env-name="parameters.partyIdTo"/> + <condition-expr field-name="fromDate" operator="equals" env-name="parameters.fromDate"/> + </condition-list> + </entity-condition> </actions> <auto-fields-service service-name="updatePartyBenefit"/> <field name="roleTypeIdFrom"><display/></field> @@ -172,11 +202,9 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> + <field name="thruDate"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deletePartyBenefit?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}&benefitTypeId=${benefitTypeId}" description="${uiLabelMap.CommonDelete}"/> - </field> </form> <form name="AddPartyBenefit" type="single" target="createPartyBenefit" header-row-style="header-row" default-table-style="basic-table"> @@ -203,32 +231,31 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="ListPayrollPreferences" type="list" title="findPayrollPreferences" + <form name="ListPayrollPreferences" type="list" target="updatePayrollPreference" separate-columns="true" paginate-target="findPayRollPreferences" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="PayrollPreference"><order-by field-name="payrollPreferenceSeqId"/></entity-condition> - </actions> - <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/> + <entity-condition entity-name="PayrollPreference"> + <condition-list combine="and"> + <condition-expr field-name="partyId" operator="equals" env-name="parameters.partyIdTo"/> + <condition-expr field-name="roleTypeId" operator="equals" env-name="parameters.roleTypeIdTo"/> + </condition-list> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/> <field name="partyId"><display/></field> <field name="roleTypeId"><display/></field> - <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${payrollPreferenceSeqId}" target="EditPayrollPreferences?payrollPreferenceSeqId=${payrollPreferenceSeqId}&partyId=${partyId}&roleTypeId=${roleTypeId}"/> - </field> + <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display/></field> <field name="paymentMethodTypeId"><display/></field> <field name="periodTypeId"><display/></field> <field name="fromDate"><display/></field> <field name="thruDate"><date-time/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deletePayrollPreference?payrollPreferenceSeqId=${payrollPreferenceSeqId}&partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditPayrollPreference" type="single" target="updatePayrollPreference" title="" default-map-name="payrollPreference" + <form name="AddPayrollPreference" type="single" target="createPayrollPreference" title="" default-map-name="payrollPreference" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="payrollPreference==null" target="createPayrollPreference"/> <auto-fields-service service-name="createPayrollPreference" /> - <field use-when="payrollPreference!=null" name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="payrollPreference==null&&payrollPreferenceSeqId==null" name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><ignored/></field> - <field use-when="payrollPreference==null&&payrollPreferenceSeqId!=null" name="payrollPreferenceSeqId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${payrollPreferenceSeqId}]"><display/></field> + <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><text/></field> <field name="partyId"><hidden/></field> <field name="roleTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> @@ -253,8 +280,7 @@ </entity-options> </drop-down> </field> - <field name="submitButton" use-when="payrollPreference==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="payrollPreference!=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="ListPayGrades" type="list" title="" paginate-target="findPayGrades" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=656669&r1=656668&r2=656669&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Thu May 15 07:06:50 2008 @@ -84,71 +84,102 @@ <field name="submitButton" use-when="partyResume==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="partyResume!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListPartySkills" type="list" target="updatePartySkill" title="" paginate-target="findPartySkills" + <form name="FindPartySkills" type="single" target="FindPartySkills" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="PartySkill" default-field-type="find"/> + <field name="partyId"><text-find/></field> + <field name="skillTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="SkillType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="yearsExperience"><text-find/></field> + <field name="rating"><date-time/></field> + <field name="skillLevel"><date-time/></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"> <actions> - <entity-condition entity-name="PartySkill"/> + <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="PartySkill"/> + </service> </actions> <auto-fields-service default-field-type="display" service-name="updatePartySkill"/> <field name="partyId"><display/></field> - <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}"></field> - <field name="yearsExperience"><text/></field> - <field name="rating"><text/></field> - <field name="skillLevel"><text/></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deletePartySkill?partyId=${partyId}&skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <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> </form> - <form name="AddPartySkill" type="single" target="createPartySkill" title="createPartySkill" default-map-name="partySkill" + <form name="EditPartySkill" type="single" target="updatePartySkill" default-map-name="partySkill" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createPartySkill"/> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="skillTypeId" title="${uiLabelMap.HumanResSkillType}" tooltip="${uiLabelMap.CommonRequired}"> - <drop-down allow-empty="false"> - <entity-options description="${description}" key-field-name="skillTypeId" entity-name="SkillType"> + <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="skillTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="SkillType"> <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </field> + <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> </form> - <form name="ListPerfReviews" type="list" title="" paginate-target="findPerfReviews" + <form name="ListPerfReviews" type="list" title="" target="updatePerfReview" paginate-target="findPerfReviews" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="PerfReview"><order-by field-name="perfReviewId"/></entity-condition> + <entity-condition entity-name="PerfReview"> + <condition-list combine="and"> + <condition-expr field-name="employeePartyId" operator="equals" env-name="parameters.partyIdTo"/> + <condition-expr field-name="employeeRoleTypeId" operator="equals" env-name="parameters.roleTypeIdTo"/> + </condition-list> + <order-by field-name="perfReviewId"/></entity-condition> </actions> <auto-fields-service default-field-type="hidden" service-name="updatePerfReview"/> <field name="employeePartyId"><display/></field> <field name="employeeRoleTypeId"><display/></field> - <field name="perfReviewId" widget-style="linktext"> - <hyperlink also-hidden="false" description="${perfReviewId}" target="EditPerfReviews?perfReviewId=${perfReviewId}&partyIdTo=${employeePartyId}&roleTypeIdTo=${employeeRoleTypeId}"/> + <field name="perfReviewId"><display/></field> + <field name="payHistoryPartyIdFrom"><lookup target-form-name="LookupPartyName"/></field> + <field name="payHistoryPartyIdTo"><lookup target-form-name="LookupPartyName"/></field> + <field name="managerRoleTypeId"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> + <entity-order-by field-name="roleTypeId"/> + </entity-options> + </drop-down> </field> - <field name="paymentId"><display/></field> - <field name="emplPositionId"><display/></field> - <field name="payHistoryPartyIdFrom"><display/></field> - <field name="payHistoryPartyIdTo"><display/></field> - <field name="managerRoleTypeId"><display/></field> <field name="fromDate"><display/></field> - <field name="thruDate"><display/></field> - <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deletePerfReview?perfReviewId=${perfReviewId}&employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> + <field name="thruDate"><date-time/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="EditPerfReview" type="single" target="updatePerfReview" title="" default-map-name="perfReview" + <form name="AddPerfReview" type="single" target="createPerfReview" title="" default-map-name="perfReview" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="perfReview==null" target="createPerfReview"/> - <auto-fields-service service-name="updatePerfReview" map-name="perfReview"/> - <field use-when="perfReview!=null" name="perfReviewId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="perfReview==null" name="perfReviewId"><ignored/></field> - <field use-when="perfReview==null&&perfReviewId!=null" name="perfReviewId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${perfReviewId}]"><text size="20" maxlength="20"/></field> + <auto-fields-service service-name="createPerfReview"></auto-fields-service> + <field name="perfReviewId"><text/></field> <field name="employeePartyId"><hidden/></field> <field name="employeeRoleTypeId"><hidden/></field> - <field name="managerPartyId" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> - <field name="paymentId" use-when="perfReview==null" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field> - <field name="emplPositionId" use-when="perfReview==null" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> - <field name="payHistoryPartyIdFrom" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> - <field name="payHistoryPartyIdTo" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> + <field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="paymentId" title="${uiLabelMap.FormFieldTitle_paymentId}"><lookup target-form-name="LookupPayment"/></field> + <field name="emplPositionId" title="${uiLabelMap.FormFieldTitle_emplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> + <field name="payHistoryPartyIdFrom"><lookup target-form-name="LookupPartyName"/></field> + <field name="payHistoryPartyIdTo"><lookup target-form-name="LookupPartyName"/></field> <field name="managerRoleTypeId"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> @@ -304,25 +335,19 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListResponsibilityTypes" type="list" list-name="responsibilityTypes" paginate-target="FindResponsibilityType"> + <form name="ListResponsibilityTypes" type="list" list-name="responsibilityTypes" target="updateResponsibilityType" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="ResponsibilityType"><order-by field-name="responsibilityTypeId"/></entity-condition> </actions> - <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${responsibilityTypeId}" target="EditResponsibilityType?responsibilityTypeId=${responsibilityTypeId}"/> - </field> - <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink target="deleteResponsibilityType?responsibilityTypeId=${responsibilityTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> - </form> - <form name="EditResponsibilityType" type="single" target="updateResponsibilityType" title="" default-map-name="responsibilityType"> - <alt-target use-when="responsibilityType==null" target="createResponsibilityType"/> <auto-fields-service service-name="updateResponsibilityType"/> - <field use-when="responsibilityType!=null" name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="responsibilityType==null&&responsibilityTypeId==null" name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><text/></field> - <field use-when="responsibilityType==null&&responsibilityTypeId!=null" name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${responsibilityTypeId}]"><display/></field> - <field name="submitButton" use-when="responsibilityType==null" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> - <field name="submitButton" use-when="responsibilityType!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"/> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="AddResponsibilityType" type="single" target="createResponsibilityType" title="" default-map-name="responsibilityType"> + <auto-fields-service service-name="createResponsibilityType"/> + <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> </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |