svn commit: r660980 [1/5] - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Wed May 28 08:25:38 2008 New Revision: 660980 URL: http://svn.apache.org/viewvc?rev=660980&view=rev Log: Applied patch from JIRA issue OFBIZ-1659. Following things are covered in this work :- Restructured and organized the Screenc and Forms in the HR component. Improved and Updated the naming conventions in the naming of Screens,Forms and requests. Thanks Harsha Chadhar for this work. It was really very important for us to Manage the files before the component is used Extensively with other components. Added: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/GlobalHRSettingScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PartyQualScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PerfReviewScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (with props) Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/CommonScreens.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.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=660980&r1=660979&r2=660980&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Wed May 28 08:25:38 2008 @@ -354,6 +354,12 @@ <property key="HumanResAddEmplPositionResponsibility"> <value xml:lang="en">Add Position Responsibility</value> </property> + <property key="HumanResAddPayrollPreference"> + <value xml:lang="en">Add Payroll Preference</value> + </property> + <property key="HumanResAddPartyBenefit"> + <value xml:lang="en">Add Party Benefit</value> + </property> <property key="HumanResAddPartyQual"> <value xml:lang="en">Add Party Qualification</value> </property> @@ -413,13 +419,16 @@ <value xml:lang="th">à¹à¸à¹à¸à¸ªà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¸à¸à¸£à¸à¸à¸à¸£à¸±à¸§à¸à¸µà¹à¹à¸à¹à¸à¸à¸à¸à¸à¹à¹à¸§à¸£à¹à¹à¸à¹à¸à¸à¸à¸à¸ª</value> </property> <property key="HumanResEditEmplPosition"> - <value xml:lang="en">Create/Update Employee Position</value> + <value xml:lang="en">Edit Employee Position</value> </property> <property key="HumanResEditEmplPositionReportingStruct"> <value xml:lang="en">Edit EmplPosition Reporting Structure</value> <value xml:lang="it">Aggiorna Struttura Stampa Posizione Impiegati</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸à¸£à¸²à¸¢à¸à¸²à¸à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸</value> </property> + <property key="HumanResNewEmployee"> + <value xml:lang="en">New Employee</value> + </property> <property key="HumanResEmplPositionReportingStruct"> <value xml:lang="en">Reporting Structure</value> </property> @@ -461,7 +470,7 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸±à¸à¸©à¸°</value> </property> <property key="HumanResEditPayGrade"> - <value xml:lang="en">Add/Update Pay Grade</value> + <value xml:lang="en">Edit Pay Grade</value> </property> <property key="HumanResEditPayHistory"> <value xml:lang="en">Pay Histories</value> @@ -957,8 +966,8 @@ <value xml:lang="it">Codice Motivazione Licenziamento</value> <value xml:lang="th">รหัสà¸à¸à¸à¹à¸à¸à¹à¸«à¸à¸¸à¸à¸¥</value> </property> - <property key="HumanResTerminationType"> - <value xml:lang="en">Termination Type</value> + <property key="HumanResTerminationTypes"> + <value xml:lang="en">Termination Types</value> </property> <property key="HumanResTerminationTypeId"> <value xml:lang="en">Termination Type Id</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=660980&r1=660979&r2=660980&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Wed May 28 08:25:38 2008 @@ -68,9 +68,9 @@ <!-- ================HumanResource==================================== --> <!-- ================Party Ability Group==================================== --> - <request-map uri="FindPartyQual"> + <request-map uri="FindPartyQuals"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindPartyQual"/> + <response name="success" type="view" value="FindPartyQuals"/> </request-map> <request-map uri="NewPartyQual"> <security https="true" auth="true"/> @@ -84,16 +84,16 @@ <request-map uri="updatePartyQual"> <security https="true" auth="true"/> <event type="service-multi" invoke="updatePartyQual"/> - <response name="success" type="view" value="FindPartyQual"/> + <response name="success" type="view" value="FindPartyQuals"/> </request-map> <request-map uri="deletePartyQual"> <security https="true" auth="true"/> <event type="service" invoke="deletePartyQual"/> - <response name="success" type="view" value="FindPartyQual"/> + <response name="success" type="view" value="FindPartyQuals"/> </request-map> - <request-map uri="FindPartyResume"> + <request-map uri="FindPartyResumes"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindPartyResume"/> + <response name="success" type="view" value="FindPartyResumes"/> </request-map> <request-map uri="EditPartyResume"> <security https="true" auth="true"/> @@ -140,9 +140,9 @@ <event type="service" invoke="deletePartySkill"/> <response name="success" type="view" value="FindPartySkills"/> </request-map> - <request-map uri="FindPerfReview"> + <request-map uri="FindPerfReviews"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindPerfReview"/> + <response name="success" type="view" value="FindPerfReviews"/> </request-map> <request-map uri="EditPerfReview"> <security https="true" auth="true"/> @@ -220,9 +220,9 @@ <event type="service" invoke="deleteEmployment"/> <response name="success" type="view" value="ListEmployments"/> </request-map> - <request-map uri="FindEmploymentApp"> + <request-map uri="FindEmploymentApps"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindEmploymentApp"/> + <response name="success" type="view" value="FindEmploymentApps"/> </request-map> <request-map uri="NewEmploymentApp"> <security https="true" auth="true"/> @@ -231,18 +231,18 @@ <request-map uri="createEmploymentApp"> <security https="true" auth="true"/> <event type="service" invoke="createEmploymentApp"/> - <response name="success" type="view" value="FindEmploymentApp"/> + <response name="success" type="view" value="FindEmploymentApps"/> </request-map> <request-map uri="updateEmploymentApp"> <security https="true" auth="true"/> <event type="service-multi" invoke="updateEmploymentApp"/> - <response name="success" type="request" value="FindEmploymentApp"/> - <response name="error" type="view" value="FindEmploymentApp"/> + <response name="success" type="request" value="FindEmploymentApps"/> + <response name="error" type="view" value="FindEmploymentApps"/> </request-map> <request-map uri="deleteEmploymentApp"> <security https="true" auth="true"/> <event type="service" invoke="deleteEmploymentApp"/> - <response name="success" type="view" value="FindEmploymentApp"/> + <response name="success" type="view" value="FindEmploymentApps"/> </request-map> <request-map uri="ListPayHistories"> <security https="true" auth="true"/> @@ -273,7 +273,7 @@ </request-map> <request-map uri="updatePartyBenefit"> <security https="true" auth="true"/> - <event type="service" invoke="updatePartyBenefit"/> + <event type="service-multi" invoke="updatePartyBenefit"/> <response name="success" type="view" value="EditPartyBenefits"/> </request-map> <request-map uri="deletePartyBenefit"> @@ -296,7 +296,7 @@ </request-map> <request-map uri="updatePayrollPreference"> <security https="true" auth="true"/> - <event type="service" invoke="updatePayrollPreference"/> + <event type="service-multi" invoke="updatePayrollPreference"/> <response name="success" type="view" value="EditPayrollPreferences"/> </request-map> <request-map uri="deletePayrollPreference"> @@ -322,7 +322,7 @@ </request-map> <request-map uri="updatePayGrade"> <security https="true" auth="true"/> - <event type="service" invoke="updatePayGrade"/> + <event type="service-multi" invoke="updatePayGrade"/> <response name="success" type="view" value="EditPayGrade"/> <response name="error" type="view" value="EditPayGrade"/> </request-map> @@ -351,52 +351,52 @@ <event type="service" invoke="deleteSalaryStep"/> <response name="success" type="view" value="EditSalarySteps"/> </request-map> - <request-map uri="FindTerminationReason"> + <request-map uri="EditTerminationReasons"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditTerminationReason"/> + <response name="success" type="view" value="EditTerminationReasons"/> </request-map> <request-map uri="createTerminationReason"> <security https="true" auth="true"/> <event type="service" invoke="createTerminationReason"/> - <response name="success" type="view" value="EditTerminationReason"/> + <response name="success" type="view" value="EditTerminationReasons"/> </request-map> <request-map uri="updateTerminationReason"> <security https="true" auth="true"/> <event type="service-multi" invoke="updateTerminationReason"/> - <response name="success" type="view" value="EditTerminationReason"/> + <response name="success" type="view" value="EditTerminationReasons"/> </request-map> <request-map uri="deleteTerminationReason"> <security https="true" auth="true"/> <event type="service" invoke="deleteTerminationReason"/> - <response name="success" type="view" value="EditTerminationReason"/> + <response name="success" type="view" value="EditTerminationReasons"/> </request-map> <request-map uri="FindUnemploymentClaim"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditUnemploymentClaim"/> + <response name="success" type="view" value="EditUnemploymentClaims"/> </request-map> - <request-map uri="EditUnemploymentClaim"> + <request-map uri="EditUnemploymentClaims"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditUnemploymentClaim"/> + <response name="success" type="view" value="EditUnemploymentClaims"/> </request-map> <request-map uri="createUnemploymentClaim"> <security https="true" auth="true"/> <event type="service" invoke="createUnemploymentClaim"/> - <response name="success" type="view" value="EditUnemploymentClaim"/> + <response name="success" type="view" value="EditUnemploymentClaims"/> </request-map> <request-map uri="updateUnemploymentClaim"> <security https="true" auth="true"/> - <event type="service" invoke="updateUnemploymentClaim"/> - <response name="success" type="view" value="EditUnemploymentClaim"/> + <event type="service-multi" invoke="updateUnemploymentClaim"/> + <response name="success" type="view" value="EditUnemploymentClaims"/> </request-map> <request-map uri="deleteUnemploymentClaim"> <security https="true" auth="true"/> <event type="service" invoke="deleteUnemploymentClaim"/> - <response name="success" type="view" value="EditUnemploymentClaim"/> + <response name="success" type="view" value="EditUnemploymentClaims"/> </request-map> <!-- ================Employee Position Group==================================== --> - <request-map uri="FindEmplPosition"> + <request-map uri="FindEmplPositions"> <security https="true" auth="true"/> - <response name="success" type="view" value="FindEmplPosition"/> + <response name="success" type="view" value="FindEmplPositions"/> </request-map> <request-map uri="EditEmplPosition"> <security https="true" auth="true"/> @@ -416,7 +416,7 @@ <request-map uri="deleteEmplPosition"> <security https="true" auth="true"/> <event type="service" invoke="deleteEmplPosition"/> - <response name="success" type="view" value="FindEmplPosition"/> + <response name="success" type="view" value="FindEmplPositions"/> </request-map> <request-map uri="EditEmplPositionFulfillments"> <security https="true" auth="true"/> @@ -448,7 +448,7 @@ </request-map> <request-map uri="updateEmplPositionResponsibility"> <security https="true" auth="true"/> - <event type="service" invoke="updateEmplPositionResponsibility"/> + <event type="service-multi" invoke="updateEmplPositionResponsibility"/> <response name="success" type="view" value="EditEmplPositionResponsibilities"/> </request-map> <request-map uri="deleteEmplPositionResponsibility"> @@ -532,23 +532,23 @@ <security https="true" auth="true"/> <response name="success" type="view" value="FindEmployee"/> </request-map> - <request-map uri="CreateEmployee"> + <request-map uri="NewEmployee"> <security https="true" auth="true"/> - <response name="success" type="view" value="CreateEmployee"/> + <response name="success" type="view" value="NewEmployee"/> </request-map> <request-map uri="createEmployee"> <security https="true" auth="true"/> <event type="service" invoke="createEmployee"/> <response name="success" type="request" value="viewprofile"/> - <response name="error" type="view" value="CreateEmployee"/> + <response name="error" type="view" value="NewEmployee"/> </request-map> <request-map uri="EditPartySkills"> <security https="true" auth="true"/> <response name="success" type="view" value="EditPartySkills"/> </request-map> - <request-map uri="EditPartyQuals"> + <request-map uri="EditPartyQual"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartyQuals"/> + <response name="success" type="view" value="EditPartyQual"/> </request-map> <request-map uri="EditPersonTrainings"> <security https="true" auth="true"/> @@ -563,27 +563,27 @@ <response name="success" type="view" value="EditPartyResumes"/> </request-map> <!-- ===================Responsibility Request============== --> - <request-map uri="EditResponsibilityType"> + <request-map uri="EditResponsibilityTypes"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditResponsibilityType"/> + <response name="success" type="view" value="EditResponsibilityTypes"/> </request-map> <request-map uri="createResponsibilityType"> <security https="true" auth="true"/> <event type="service" invoke="createResponsibilityType"/> - <response name="success" type="view" value="EditResponsibilityType"/> - <response name="error" type="view" value="EditResponsibilityType"/> + <response name="success" type="view" value="EditResponsibilityTypes"/> + <response name="error" type="view" value="EditResponsibilityTypes"/> </request-map> <request-map uri="updateResponsibilityType"> <security https="true" auth="true"/> <event type="service" invoke="updateResponsibilityType"/> - <response name="success" type="view" value="EditResponsibilityType"/> - <response name="error" type="view" value="EditResponsibilityType"/> + <response name="success" type="view" value="EditResponsibilityTypes"/> + <response name="error" type="view" value="EditResponsibilityTypes"/> </request-map> <request-map uri="deleteResponsibilityType"> <security https="true" auth="true"/> <event type="service" invoke="deleteResponsibilityType"/> - <response name="success" type="view" value="EditResponsibilityType"/> - <response name="error" type="view" value="EditResponsibilityType"/> + <response name="success" type="view" value="EditResponsibilityTypes"/> + <response name="error" type="view" value="EditResponsibilityTypes"/> </request-map> <!-- =================EmplPosition View Request============ --> <request-map uri="emplPositionView"> @@ -613,11 +613,11 @@ <response name="success" type="view" value="FindPersonTrainings"/> <response name="error" type="view" value="FindPersonTrainings"/> </request-map> - <request-map uri="globalHRSetting"> + <request-map uri="globalHRSettings"> <security https="true" auth="true"/> <response name="success" type="view" value="EditSkillTypes"/> </request-map> - <request-map uri="findTerminationTypes"> + <request-map uri="EditTerminationTypes"> <security https="true" auth="true"/> <response name="success" type="view" value="EditTerminationTypes"/> </request-map> @@ -658,24 +658,24 @@ <event type="service-multi" invoke="updateEmplPositionType"/> <response name="success" type="view" value="EditEmplPositionTypes"/> </request-map> - <request-map uri="EditEmplPositionTypeRate"> + <request-map uri="EditEmplPositionTypeRates"> <security https="true" auth="true"/> - <response name="success" type="view" value="EditEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRates"/> </request-map> <request-map uri="createEmplPositionTypeRate"> <security https="true" auth="true"/> <event type="service" invoke="createEmplPositionTypeRate"/> - <response name="success" type="view" value="EditEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRates"/> </request-map> <request-map uri="updateEmplPositionTypeRate"> <security https="true" auth="true"/> <event type="service-multi" invoke="updateEmplPositionTypeRate"/> - <response name="success" type="view" value="EditEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRates"/> </request-map> <request-map uri="deleteEmplPositionTypeRate"> <security https="true" auth="true"/> <event type="service" invoke="deleteEmplPositionTypeRate"/> - <response name="success" type="view" value="EditEmplPositionTypeRate"/> + <response name="success" type="view" value="EditEmplPositionTypeRates"/> </request-map> <request-map uri="EditAgreementEmploymentAppls"> <security https="true" auth="true"/> @@ -707,66 +707,73 @@ <request-map uri="LookupSalaryStep"><security auth="true" https="true"/><response name="success" type="view" value="LookupSalaryStep"/></request-map> <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="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> + <view-map name="LookupPayment" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupPayment"/> + <view-map name="LookupBudget" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupBudget"/> + <view-map name="LookupBudgetItem" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupBudgetItem"/> + <view-map name="LookupEmplPosition" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmplPosition"/> + <view-map name="LookupTerminationReason" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupTerminationReason"/> + <view-map name="LookupSalaryStep" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupSalaryStep"/> + <view-map name="LookupPayGrade" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPayGrade"/> - <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="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="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"/> - <view-map name="EditEmplPositionFulfillments" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFulfillments"/> - <view-map name="EditEmplPositionResponsibilities" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionResponsibilities"/> - <view-map name="EditEmplPositionReportingStructs" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionReportingStructs"/> - <view-map name="ListValidResponsibilities" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#ListValidResponsibilities"/> - <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="main" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployments"/> <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="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"/> <view-map name="ListPayHistories" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayHistories"/> - <view-map name="EditPayGrade" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPayGrade"/> - <view-map name="EditSalarySteps" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditSalarySteps"/> - <view-map name="EditTerminationReason" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditTerminationReason"/> - <view-map name="EditUnemploymentClaim" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditUnemploymentClaim"/> + <view-map name="EditSalarySteps" type="screen" page="component://humanres/widget/PayGradeScreens.xml#EditSalarySteps"/> + <view-map name="EditUnemploymentClaims" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditUnemploymentClaims"/> + <view-map name="EditAgreementEmploymentAppls" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditAgreementEmploymentAppls"/> - <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> - <view-map name="LookupPayment" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupPayment"/> - <view-map name="LookupBudget" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupBudget"/> - <view-map name="LookupBudgetItem" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupBudgetItem"/> - <view-map name="LookupEmplPosition" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmplPosition"/> - <view-map name="LookupTerminationReason" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupTerminationReason"/> - <view-map name="LookupSalaryStep" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupSalaryStep"/> - <view-map name="LookupPayGrade" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPayGrade"/> - <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="EditResponsibilityType" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditResponsibilityType"/> + <view-map name="FindEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#FindEmployee"/> + <view-map name="NewEmployee" type="screen" page="component://humanres/widget/EmployeeScreens.xml#NewEmployee"/> + + <view-map name="FindEmplPositions" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#FindEmplPositions"/> + <view-map name="EditEmplPosition" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPosition"/> + <view-map name="EditEmplPositionFulfillments" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionFulfillments"/> + <view-map name="EditEmplPositionResponsibilities" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionResponsibilities"/> + <view-map name="EditEmplPositionReportingStructs" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EditEmplPositionReportingStructs"/> + <view-map name="ListValidResponsibilities" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#ListValidResponsibilities"/> + <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="EmplPositionView" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EmplPositionView"/> - <view-map name="FindPersonTrainings" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindPersonTrainings"/> - <view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#NewPersonTraining"/> - <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditTerminationTypes"/> + + <view-map name="FindPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#FindPartySkills"/> + <view-map name="NewPartySkill" type="screen" page="component://humanres/widget/PartySkillScreens.xml#NewPartySkill"/> + <view-map name="EditPartySkills" type="screen" page="component://humanres/widget/PartySkillScreens.xml#EditPartySkills"/> + + <view-map name="FindPartyQuals" type="screen" page="component://humanres/widget/PartyQualScreens.xml#FindPartyQuals"/> + <view-map name="NewPartyQual" type="screen" page="component://humanres/widget/PartyQualScreens.xml#NewPartyQual"/> + <view-map name="EditPartyQual" type="screen" page="component://humanres/widget/PartyQualScreens.xml#EditPartyQual"/> - <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="FindPersonTrainings" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#FindPersonTrainings"/> + <view-map name="NewPersonTraining" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#NewPersonTraining"/> <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"/> + + <view-map name="EditEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#EditEmploymentApps"/> + <view-map name="FindEmploymentApps" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#FindEmploymentApps"/> + <view-map name="NewEmploymentApp" type="screen" page="component://humanres/widget/EmploymentAppScreens.xml#NewEmploymentApp"/> + + <view-map name="FindPartyResumes" type="screen" page="component://humanres/widget/PartyResumeScreens.xml#FindPartyResumes"/> + <view-map name="EditPartyResumes" type="screen" page="component://humanres/widget/PartyResumeScreens.xml#EditPartyResumes"/> + <view-map name="EditPartyResume" type="screen" page="component://humanres/widget/PartyResumeScreens.xml#EditPartyResume"/> + + <view-map name="FindPayGrades" type="screen" page="component://humanres/widget/PayGradeScreens.xml#FindPayGrades"/> + <view-map name="EditPayGrade" type="screen" page="component://humanres/widget/PayGradeScreens.xml#EditPayGrade"/> + + <view-map name="FindPerfReviews" type="screen" page="component://humanres/widget/PerfReviewScreens.xml#FindPerfReviews"/> + <view-map name="EditPerfReviews" type="screen" page="component://humanres/widget/PerfReviewScreens.xml#EditPerfReviews"/> + <view-map name="EditPerfReviewItems" type="screen" page="component://humanres/widget/PerfReviewScreens.xml#EditPerfReviewItems"/> + <view-map name="EditPerformanceNotes" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditPerformanceNotes"/> - <view-map name="FindPayGrades" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindPayGrades"/> - <view-map name="FindEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#FindEmplPositionTypes"/> - <view-map name="EditEmplPositionTypes" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypes"/> - <view-map name="EditEmplPositionTypeRate" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditEmplPositionTypeRate"/> - <view-map name="EditAgreementEmploymentAppls" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditAgreementEmploymentAppls"/> + <view-map name="EditSkillTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditSkillTypes"/> + <view-map name="FindEmplPositionTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#FindEmplPositionTypes"/> + <view-map name="EditEmplPositionTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplPositionTypes"/> + <view-map name="EditEmplPositionTypeRates" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditEmplPositionTypeRates"/> + <view-map name="EditResponsibilityTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditResponsibilityTypes"/> + <view-map name="EditTerminationTypes" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationTypes"/> + <view-map name="EditTerminationReasons" type="screen" page="component://humanres/widget/GlobalHRSettingScreens.xml#EditTerminationReasons"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=660980&r1=660979&r2=660980&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Wed May 28 08:25:38 2008 @@ -29,6 +29,7 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.HumanResCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.HumanResCompanySubtitle" global="true"/> <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, @@ -87,7 +88,7 @@ <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"/> + <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> <entity-one entity-name="Employment" value-name="employment"/> </actions> <widgets> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=660980&r1=660979&r2=660980&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Wed May 28 08:25:38 2008 @@ -20,13 +20,12 @@ <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="FindEmplPosition"> + <screen name="FindEmplPositions"> <section> <actions> - <set field="titleProperty" value="PageTitleListEmplPosition"/> + <set field="titleProperty" value="HumanResFindEmplPosition"/> <set field="headerItem" value="EmplPosition"/> </actions> - <widgets> <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> @@ -35,7 +34,7 @@ <section> <widgets> <container style="button-bar"> - <link target="EditEmplPosition" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmplPosition}" style="buttontext"/> + <link target="EditEmplPosition" text="${uiLabelMap.HumanResNewEmplPosition}" style="buttontext"/> </container> </widgets> </section> @@ -72,9 +71,6 @@ <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditEmplPosition" text="${uiLabelMap.HumanResNewEmplPosition}" style="buttontext" /> - </container> <include-form name="EditEmplPosition" location="component://humanres/widget/forms/EmplPositionForms.xml"/> </widgets> </section> Added: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=660980&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (added) +++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Wed May 28 08:25:38 2008 @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="FindEmployee"> + <section> + <actions> + <set field="titleProperty" value="${uiLabelMap.CommonFind} ${uiLabelMap.HumanResEmployee}"/> + <set field="headerItem" value="Employee"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <actions> + <service service-name="findParty" auto-field-map="true"/> + <set field="tabButtonItem" value="Employee"/> + </actions> + <widgets> + <container> + <link target="NewEmployee" text="${uiLabelMap.HumanResNewEmployee}" style="buttontext" /> + </container> + <section> + <widgets> + <platform-specific> + <html><html-template location="component://humanres/webapp/humanres/humanres/findEmployee.ftl"/></html> + </platform-specific> + </widgets> + </section> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="NewEmployee"> + <section> + <actions> + <set field="titleProperty" value="PartyCreateNewEmployee"/> + <set field="headerItem" value="Employee"/> + <property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResNewEmployee}"> + <section> + <widgets> + <include-form name="AddEmployee" location="component://humanres/widget/forms/EmployeeForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml?rev=660980&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml (added) +++ ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml Wed May 28 08:25:38 2008 @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="FindEmploymentApps"> + <section> + <actions> + <set field="titleProperty" value="HumanResFindEmploymentApp"/> + <set field="headerItem" value="EmploymentApp"/> + <set field="employmentAppCtx" from-field="parameters"/> + </actions> + <widgets> + <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="menu-bar"> + <section> + <widgets> + <container style="button-bar"><link target="NewEmploymentApp" text="${uiLabelMap.HumanResNewEmploymentApp}" style="buttontext"/></container> + </widgets> + </section> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + </decorator-section> + </decorator-screen> + </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/EmploymentAppForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}"> + <section> + <widgets> + <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="NewEmploymentApp"> + <section> + <actions> + <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"/> + </actions> + <widgets> + <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResNewEmploymentApp}"> + <section> + <widgets> + <include-form name="AddEmploymentApp" location="component://humanres/widget/forms/EmploymentAppForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/widget/EmploymentAppScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |