svn commit: r659565 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Fri May 23 08:05:38 2008 New Revision: 659565 URL: http://svn.apache.org/viewvc?rev=659565&view=rev Log: Applied patch from JIRA issue OFBIZ-1659. Following things are covered in this patch :- Added tab for PartySkills,Employment Application,Training,Resume for the Employee header item. Added new header item for PerformanceReview. Thanks Parimal Gain for your patch. Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ofbiz/trunk/applications/humanres/widget/CommonScreens.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/PartyAbilityForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri May 23 08:05:38 2008 @@ -541,6 +541,9 @@ <property key="HumanResFindPartySkill"> <value xml:lang="en">Find Party Skills</value> </property> + <property key="HumanResFindPerfReview"> + <value xml:lang="en">Find Performance Review</value> + </property> <property key="HumanResFindPersonTraining"> <value xml:lang="en">Find Person Training</value> </property> @@ -831,6 +834,12 @@ <value xml:lang="it">Sequenza Preferenze Paghe</value> <value xml:lang="th">รหัสรายà¸à¸²à¸£à¹à¸à¸´à¸à¹à¸à¸·à¸à¸à¸ªà¸´à¸à¸à¸´à¸à¸´à¹à¸¨à¸©</value> </property> + <property key="HumanResPerfNote"> + <value xml:lang="en">Performance Note</value> + </property> + <property key="HumanResPerfReview"> + <value xml:lang="en">Performance Review</value> + </property> <property key="HumanResPositionFulfillments"> <value xml:lang="en">Fulfillments</value> <value xml:lang="it">Adempimento</value> 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=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri May 23 08:05:38 2008 @@ -72,14 +72,14 @@ <security https="true" auth="true"/> <response name="success" type="view" value="FindPartyQual"/> </request-map> - <request-map uri="EditPartyQual"> + <request-map uri="NewPartyQual"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartyQual"/> + <response name="success" type="view" value="NewPartyQual"/> </request-map> <request-map uri="createPartyQual"> <security https="true" auth="true"/> <event type="service" invoke="createPartyQual"/> - <response name="success" type="view" value="EditPartyQual"/> + <response name="success" type="view" value="NewPartyQual"/> </request-map> <request-map uri="updatePartyQual"> <security https="true" auth="true"/> @@ -119,15 +119,15 @@ <response name="success" type="view" value="FindPartySkills"/> <response name="error" type="view" value="FindPartySkills"/> </request-map> - <request-map uri="EditPartySkills"> + <request-map uri="NewPartySkill"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartySkills"/> + <response name="success" type="view" value="NewPartySkill"/> </request-map> <request-map uri="createPartySkill"> <security https="true" auth="true"/> <event type="service" invoke="createPartySkill"/> <response name="success" type="view" value="FindPartySkills"/> - <response name="error" type="view" value="EditPartySkills"/> + <response name="error" type="view" value="NewPartySkill"/> </request-map> <request-map uri="updatePartySkill"> <security https="true" auth="true"/> @@ -140,11 +140,11 @@ <event type="service" invoke="deletePartySkill"/> <response name="success" type="view" value="FindPartySkills"/> </request-map> - <request-map uri="findPerfReviews"> + <request-map uri="FindPerfReview"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPerfReviews"/> + <response name="success" type="view" value="FindPerfReview"/> </request-map> - <request-map uri="EditPerfReviews"> + <request-map uri="EditPerfReview"> <security https="true" auth="true"/> <response name="success" type="view" value="EditPerfReviews"/> </request-map> @@ -218,9 +218,9 @@ <security https="true" auth="true"/> <response name="success" type="view" value="FindEmploymentApp"/> </request-map> - <request-map uri="EditEmploymentApp"> + <request-map uri="NewEmploymentApp"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditEmploymentApp"/> + <response name="success" type="view" value="NewEmploymentApp"/> </request-map> <request-map uri="createEmploymentApp"> <security https="true" auth="true"/> @@ -527,6 +527,26 @@ <response name="success" type="request" value="viewprofile"/> <response name="error" type="view" value="CreateEmployee"/> </request-map> + <request-map uri="EditPartySkills"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartySkills"/> + </request-map> + <request-map uri="EditPartyQuals"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartyQuals"/> + </request-map> + <request-map uri="EditPersonTrainings"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPersonTrainings"/> + </request-map> + <request-map uri="EditEmploymentApps"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmploymentApps"/> + </request-map> + <request-map uri="EditPartyResumes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartyResumes"/> + </request-map> <!-- ===================Responsibility Request============== --> <request-map uri="EditResponsibilityType"> <security https="true" auth="true"/> @@ -616,15 +636,16 @@ <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="FindPerfReview" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPerfReview"/> <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="FindPartyResume" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartyResume"/> <view-map name="EditPartyResume" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyResume"/> <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="NewPartySkill" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPartySkill"/> <view-map name="FindPartyQual" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPartyQual"/> - <view-map name="EditPartyQual" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPartyQual"/> + <view-map name="NewPartyQual" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPartyQual"/> <view-map name="FindEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPosition"/> <view-map name="EditEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPosition"/> @@ -638,7 +659,7 @@ <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="FindEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmploymentApp"/> - <view-map name="EditEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmploymentApp"/> + <view-map name="NewEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#NewEmploymentApp"/> <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="EditPayrollPreferences" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPayrollPreferences"/> @@ -665,4 +686,10 @@ <view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPersonTraining"/> <view-map name="FindGlobalHRSettings" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListGlobalHRSettings"/> <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditTerminationTypes"/> + + <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartySkills"/> + <view-map name="EditPartyQuals" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartyQuals"/> + <view-map name="EditPersonTrainings" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPersonTrainings"/> + <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmploymentApps"/> + <view-map name="EditPartyResumes" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPartyResumes"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Fri May 23 08:05:38 2008 @@ -233,5 +233,6 @@ <div><h3>${lookupErrorMessage}</h3></div> </#if> <div> </div> + </div> </#if> <!-- end findEmployees.ftl --> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Fri May 23 08:05:38 2008 @@ -195,6 +195,19 @@ </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition> + <and> + <if-has-permission permission="HUMANRES" action="_VIEW"/> + <not><if-empty field-name="partyId"/></not> + </and> + </condition> + <widgets> + <include-menu name="ProfileTabBar" location="component://humanres/widget/Menus.xml"/> + </widgets> + </section> + </decorator-section> <decorator-section name="body"> <section> <condition> @@ -214,7 +227,7 @@ </or> </condition> <widgets> - <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/> + <label text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/> </widgets> <fail-widgets> <label style="h1" text="${uiLabelMap.PartyNewUser}"/> Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Fri May 23 08:05:38 2008 @@ -120,7 +120,7 @@ <section> <widgets> <container> - <link target="EditEmploymentApp" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmploymentApp}" style="buttontext"/> + <link target="NewEmploymentApp" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmploymentApp}" style="buttontext"/> </container> <include-form name="FindEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> @@ -138,10 +138,10 @@ </widgets> </section> </screen> - <screen name="EditEmploymentApp"> + <screen name="NewEmploymentApp"> <section> <actions> - <set field="titleProperty" value="HumanResEditEmploymentApp"/> + <set field="titleProperty" value="HumanResNewEmploymentApp"/> <set field="headerItem" value="EmploymentApp"/> <set field="applicationId" from-field="parameters.applicationId"/> <entity-one entity-name="EmploymentApp" value-name="employmentApp"/> @@ -159,7 +159,7 @@ <section> <widgets> <container> - <link text="${uiLabelMap.HumanResNewEmploymentApp}" target="EditEmploymentApp" style="buttontext"/> + <link text="${uiLabelMap.HumanResNewEmploymentApp}" target="NewEmploymentApp" style="buttontext"/> </container> <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> @@ -530,4 +530,162 @@ </widgets> </section> </screen> + <screen name="EditPartySkills"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPartySkill"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditPartySkills"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="skillTypeId" from-field="parameters.skillTypeId"/> + <set field="partySkillsCtx.partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListPartySkill}"> + <section> + <widgets> + <include-form name="ListPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewPartySkill}"> + <section> + <widgets> + <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditPersonTrainings"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPersonTraining"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditPersonTrainings"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="trainingClassTypeId" from-field="parameters.trainingClassTypeId"/> + <set field="personTrainingsCtx.partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListPersonTraining}"> + <section> + <widgets> + <include-form name="ListPersonTrainings" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewPersonTraining}"> + <section> + <widgets> + <include-form name="AddPersonTraining" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditPartyResumes"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPartyResume"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditPartyResumes"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyResumeCtx.resumeId" from-field="parameters.resumeId"/> + <set field="resumeId" from-field="parameters.resumeId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListPartyResumes}"> + <section> + <widgets> + <include-form name="ListPartyResumes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewPartyResume}"> + <section> + <widgets> + <include-form name="EditPartyResume" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmploymentApps"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewEmploymentApp"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditEmploymentApps"/> + <set field="referredByPartyId" from-field="parameters.partyId"/> + <set field="employmentAppCtx.applicationId" from-field="parameters.applicationId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmploymentApp}"> + <section> + <widgets> + <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}"> + <section> + <widgets> + <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditPartyQuals"> + <section> + <actions> + <set field="titleProperty" value="HumanResViewPartyQual"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditPartyQuals"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="partyQualCtx.partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListPartyQual}"> + <section> + <widgets> + <include-form name="ListPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResAddPartyQual}"> + <section> + <widgets> + <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Fri May 23 08:05:38 2008 @@ -32,6 +32,7 @@ <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item> <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResume"/></menu-item> <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrade"/></menu-item> + <menu-item name="PerfReview" title="${uiLabelMap.HumanResPerfReview}"><link target="FindPerfReview"/></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"/> @@ -50,10 +51,6 @@ <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}"> <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> </menu-item> - <menu-item name="EditPerfReview" title="${uiLabelMap.HumanResEditPartyReview}"> - <!-- <link target="EditPerfReviews?roleTypeIdTo=${roleTypeIdTo}&partyIdTo=${partyIdTo}"/>--> - <link target="EditPerfReviews?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> - </menu-item> <menu-item name="EditPayrollPreference" title="${uiLabelMap.HumanResEditPayrollPreference}"> <link target="EditPayrollPreferences?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> </menu-item> @@ -114,4 +111,26 @@ <link target="findTerminationTypes"/> </menu-item> </menu> + + <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected" + type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> + <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}"> + <link target="viewprofile?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditPartySkills" title="${uiLabelMap.HumanResPartySkills}"> + <link target="EditPartySkills?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditPartyQuals" title="${uiLabelMap.HumanResPartyQualification}"> + <link target="EditPartyQuals?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditPersonTrainings" title="${uiLabelMap.HumanResTraining}"> + <link target="EditPersonTrainings?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> + <link target="EditEmploymentApps?partyId=${partyId}"/> + </menu-item> + <menu-item name="EditPartyResumes" title="${uiLabelMap.HumanResPartyResume}"> + <link target="EditPartyResumes?partyId=${partyId}"/> + </menu-item> + </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Fri May 23 08:05:38 2008 @@ -20,7 +20,7 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="EditPartyQual"> + <screen name="NewPartyQual"> <section> <actions> <set field="headerItem" value="PartyQual"/> @@ -39,7 +39,7 @@ <section> <widgets> <container> - <link target="EditPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/> + <link target="NewPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/> </container> <include-form name="AddPartyQual" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> @@ -120,41 +120,30 @@ <screen name="EditPerfReviews"> <section> <actions> - <set field="headerItem" value="Employment"/> + <set field="headerItem" value="PerfReview"/> <set field="tabButtonItem" value="EditPerfReview"/> <set field="titleProperty" value="PageTitleListPartyReview"/> <set field="perfReviewId" from-field="parameters.perfReviewId"/> - <set field="employeePartyId" from-field="parameters.partyIdTo"/> - <set field="employeeRoleTypeId" from-field="parameters.roleTypeIdTo"/> + <set field="employeePartyId" from-field="parameters.employeePartyId"/> + <set field="employeeRoleTypeId" from-field="parameters.employeeRoleTypeId"/> <entity-one entity-name="PerfReview" value-name="perfReview"/> </actions> <widgets> - <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> + <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.PageTitleListPartyReview}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPerfReviews" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResNewPartyReview}"/> + <label text="${uiLabelMap.HumanResNewPartyReviewEdit}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <include-form name="AddPerfReview" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <container style="button-bar"> + <link target="EditPerfReview" text="${uiLabelMap.HumanResNewPartyReview}" style="buttontext"/> + </container> + <include-form name="EditPerfReview" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> </section> </container> @@ -179,7 +168,7 @@ <section> <widgets> <container style="button-bar"> - <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> + <link target="NewPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> </container> <include-form name="FindPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"></include-form> </widgets> @@ -197,7 +186,7 @@ </widgets> </section> </screen> - <screen name="EditPartySkills"> + <screen name="NewPartySkill"> <section> <actions> <set field="titleProperty" value="HumanResEditPartySkill"/> @@ -213,7 +202,7 @@ <section> <widgets> <container style="button-bar"> - <link target="EditPartySkills" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> + <link target="NewPartySkill" text="${uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> </container> <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> @@ -427,7 +416,7 @@ <section> <widgets> <container> - <link target="EditPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/> + <link target="NewPartyQual" text="${uiLabelMap.HumanResNewPartyQual}" style="buttontext"/> </container> <include-form name="FindPartyQuals" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> </widgets> @@ -475,4 +464,34 @@ </widgets> </section> </screen> + <screen name="FindPerfReview"> + <section> + <actions> + <set field="titleProperty" value="HumanResFindPerfReview"/> + <set field="headerItem" value="PerfReview"/> + <set field="employeePartyId" from-field="parameters.partyId"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="menu-bar"> + <container style="button-bar"> + <link target="EditPerfReview" text="${uiLabelMap.HumanResNewPartyReview}" style="buttontext"/> + </container> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindPerfReviews" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListPerfReviews" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + </decorator-section> + </decorator-screen> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml?rev=659565&r1=659564&r2=659565&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyAbilityForms.xml Fri May 23 08:05:38 2008 @@ -114,10 +114,12 @@ header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPartyResume"/> <field name="contentId"><lookup target-form-name="LookupContent"/></field> - <field name="resumeId" use-when="partyResume!=null" title="${uiLabelMap.HumanResResumeId}"><display/></field> + <field name="resumeId" use-when="resumeId!=null" title="${uiLabelMap.HumanResResumeId}"><display/></field> + <field name="resumeId" use-when="resumeId==null"><hidden/></field> <field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><hidden/></field> <field name="partyId" use-when="partyResume==null&&partyId==null" title="${uiLabelMap.FormFieldTitle_partyId}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" use-when="resumeId!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="FindPartySkills" type="single" target="FindPartySkills" header-row-style="header-row" default-table-style="basic-table"> @@ -189,51 +191,35 @@ <field name="skillLevel"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListPerfReviews" type="list" title="" target="updatePerfReview" paginate-target="findPerfReviews" + <form name="ListPerfReviews" type="list" title="" separate-columns="true" default-entity-name="PerfReview" list-name="listIt" paginate-target="FindPerfReview" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <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> + <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="PerfReview"/> + <field-map field-name="orderBy" value="perfReviewId"/> + </service> </actions> - <auto-fields-service default-field-type="hidden" service-name="updatePerfReview"/> - <field name="employeePartyId"><display/></field> - <field name="employeeRoleTypeId"><display/></field> - <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> + <auto-fields-entity entity-name="PerfReview" default-field-type="display"/> + <field name="perfReviewId"> + <hyperlink also-hidden="false" description="${perfReviewId}" target="EditPerfReview?perfReviewId=${perfReviewId}&employeePartyId=${employeePartyId}&employeeRoleTypeId=${employeeRoleTypeId}"/> </field> - <field name="fromDate"><display/></field> - <field name="thruDate"><date-time/></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="AddPerfReview" type="single" target="createPerfReview" title="" default-map-name="perfReview" + <form name="EditPerfReview" type="single" target="updatePerfReview" title="" default-map-name="perfReview" header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createPerfReview"></auto-fields-service> - <field name="perfReviewId"><text/></field> - <field name="employeePartyId"><hidden/></field> - <field name="employeeRoleTypeId"><hidden/></field> + <alt-target use-when="perfReview==null" target="createPerfReview"/> + <auto-fields-service service-name="updatePerfReview" map-name="perfReview"/> + <field name="perfReviewId" use-when="perfReview==null"><hidden/></field> + <field name="perfReviewId" use-when="perfReview!=null"><display/></field> + <field name="employeePartyId" use-when="perfReview==null"><lookup target-form-name="LookupPartyName"/></field> + <field name="employeePartyId" use-when="perfReview!=null"><display/></field> + <field name="employeeRoleTypeId"><hidden value="EMPLOYEE"/></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"> - <entity-order-by field-name="roleTypeId"/> - </entity-options> - </drop-down> - </field> + <field name="managerRoleTypeId"><hidden value="MANAGER"/></field> <field name="payHistoryRoleTypeIdFrom"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> @@ -247,7 +233,7 @@ <entity-order-by field-name="roleTypeId"/> </entity-options> </drop-down> - </field> + </field> <field name="submitButton" use-when="perfReview==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="perfReview!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -468,4 +454,32 @@ <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> + <form name="FindPerfReviews" type="single" target="FindPerfReview" header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="PerfReview" default-field-type="find"/> + <field name="noConditionFind"><hidden value="Y"/></field> + <field name="employeeRoleTypeId"><hidden/></field> + <field name="managerRoleTypeId"><hidden/></field> + <field name="employeePartyId"><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"><hidden value="MANAGER"/></field> + <field name="payHistoryRoleTypeIdFrom"> + <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="payHistoryRoleTypeIdTo"> + <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="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |