svn commit: r661359 [1/2] - in /ofbiz/trunk/applications: humanres/config/ humanres/data/ humanres/entitydef/ humanres/script/org/ofbiz/huma
Locked
svn commit: r661359 [1/2] - in /ofbiz/trunk/applications: humanres/config/ humanres/data/ humanres/entitydef/ humanres/script/org/ofbiz/huma
 
|
Author: ashish
Date: Thu May 29 08:30:53 2008 New Revision: 661359 URL: http://svn.apache.org/viewvc?rev=661359&view=rev Log: Applied patch from JIRA issue OFBIZ-1659. Following things are covered in this patch :- Included LookUps at the required places and done improvements. Added Employee Leave tab,Create Entity EmplLeave and crud operations by Parimal. Thanks Harsha Chadhar and Parimal Gain for your work. Added: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (with props) ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (with props) Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml ofbiz/trunk/applications/humanres/servicedef/services.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/LookupScreens.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Thu May 29 08:30:53 2008 @@ -348,6 +348,12 @@ <value xml:lang="it">Anni di Esperienza</value> <value xml:lang="th">à¸à¸£à¸°à¸ªà¸à¸à¸²à¸£à¸à¹(à¸à¸µ)</value> </property> + <property key="HumanResAddEmplLeave"> + <value xml:lang="en">Add Employee Leave</value> + </property> + <property key="HumanResAddEmplLeaveType"> + <value xml:lang="en">Add EmplLeave Types</value> + </property> <property key="HumanResAddEmplPositionFulfillment"> <value xml:lang="en">Add Position Fulfillment</value> </property> @@ -418,6 +424,9 @@ <value xml:lang="it">Part of the Open For Business Family of Open Source Software</value> <value xml:lang="th">à¹à¸à¹à¸à¸ªà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¸à¸à¸£à¸à¸à¸à¸£à¸±à¸§à¸à¸µà¹à¹à¸à¹à¸à¸à¸à¸à¸à¹à¹à¸§à¸£à¹à¹à¸à¹à¸à¸à¸à¸à¸ª</value> </property> + <property key="HumanResEmplLeave"> + <value xml:lang="en">Leave</value> + </property> <property key="HumanResEditEmplPosition"> <value xml:lang="en">Edit Employee Position</value> </property> @@ -491,6 +500,9 @@ </property> <property key="HumanResEmployee"> <value xml:lang="en">Employees</value> + </property> + <property key="HumanResEmplLeaveType"> + <value xml:lang="en">Employee Leave Type</value> </property> <property key="HumanResEmplPositionId"> <value xml:lang="en">Employee Position Id</value> @@ -545,6 +557,9 @@ <value xml:lang="it">Data Inizio Stimata</value> <value xml:lang="th">à¸à¸²à¸à¸à¸£à¸°à¸¡à¸²à¸à¸§à¸±à¸à¸à¸µà¹</value> </property> + <property key="HumanResFindEmplLeave"> + <value xml:lang="en">Find Employee Leave</value> + </property> <property key="HumanResFindEmplPosition"> <value xml:lang="en">Find Employee Position</value> </property> @@ -572,6 +587,9 @@ <property key="HumanResGlobalHRSettings"> <value xml:lang="en">Global HR Settings</value> </property> + <property key="HumanResListEmplLeaveType"> + <value xml:lang="en">List EmplLeave Type</value> + </property> <property key="HumanResListEmplPositionsReportedTo"> <value xml:lang="en">List Employee Positions, Reported To [${parameters.emplPositionId}]</value> </property> @@ -658,11 +676,23 @@ <value xml:lang="it">Ricerca Riga Budget per Nome</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸à¸à¸£à¸°à¸¡à¸²à¸à¹à¸à¸¢à¸à¸·à¹à¸</value> </property> + <property key="HumanResLookupEmploymentApp"> + <value xml:lang="en">Lookup EmploymentApp</value> + </property> + <property key="HumanResLookupApplicationId"> + <value xml:lang="en">Lookup ApplicationId</value> + </property> <property key="HumanResLookupEmplPositionByName"> <value xml:lang="en">Lookup EmplPosition by Name</value> <value xml:lang="it">Ricerca Posizione Impiegato per Nome</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸³à¹à¸«à¸à¹à¸à¸à¸à¸±à¸à¸à¸²à¸à¹à¸à¸¢à¸à¸·à¹à¸</value> </property> + <property key="HumanResLookupPartyResume"> + <value xml:lang="en">Lookup PartyResume</value> + </property> + <property key="HumanResLookupResumeId"> + <value xml:lang="en">Lookup ResumeId</value> + </property> <property key="HumanResLookupPayGrade"> <value xml:lang="en">Lookup PayGrade</value> <value xml:lang="it">Ricerca Grado Paga</value> @@ -673,6 +703,18 @@ <value xml:lang="it">Ricerca Codice Grado Paga</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸£à¸«à¸±à¸ªà¸à¸²à¸£à¸à¹à¸²à¸¢à¸à¹à¸à¸¡à¸¹à¸¥</value> </property> + <property key="HumanResLookupPayRollPreference"> + <value xml:lang="en">Lookup PayRollPreference</value> + </property> + <property key="HumanResLookupPayrollPreferenceSeqId"> + <value xml:lang="en">Lookup PayrollPreferenceSeqId</value> + </property> + <property key="HumanResLookupPerfReview"> + <value xml:lang="en">Lookup PerfReview</value> + </property> + <property key="HumanResLookupPerfReviewId"> + <value xml:lang="en">Lookup PerfReviewId</value> + </property> <property key="HumanResLookupSalaryStepSeqId"> <value xml:lang="en">Lookup Salary StepSeq Id</value> <value xml:lang="it">Ricerca Sequenza Passo Salario</value> @@ -683,6 +725,24 @@ <value xml:lang="it">Ricerca Motivazioni Licenziamento</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸à¸à¹à¸à¸à¹à¸«à¸à¸¸à¸à¸¥</value> </property> + <property key="HumanResLookupUnemploymentClaim"> + <value xml:lang="en">Lookup UnemploymentClaim</value> + </property> + <property key="HumanResLookupUnemploymentClaimId"> + <value xml:lang="en">Lookup UnemploymentClaimId</value> + </property> + <property key="HumanResLookupAgreement"> + <value xml:lang="en">Lookup Agreement</value> + </property> + <property key="HumanResLookupAgreementId"> + <value xml:lang="en">Lookup AgreementId</value> + </property> + <property key="HumanResLookupAgreementEmploymentAppl"> + <value xml:lang="en">Lookup AgreementEmploymentAppl</value> + </property> + <property key="HumanResLookupAgreementItemSeqId"> + <value xml:lang="en">Lookup AgreementItemSeqId</value> + </property> <property key="HumanResManagerApplication"> <value xml:lang="en">HumanRes Manager Application</value> <value xml:lang="it">Applicazione Gestione Risorse Umane</value> Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original) +++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Thu May 29 08:30:53 2008 @@ -77,4 +77,7 @@ <TerminationType description="Resignation" hasTable="N" parentTypeId="" terminationTypeId="RESIGN"/> <TerminationType description="Fired" hasTable="N" parentTypeId="" terminationTypeId="FIRE"/> <TerminationType description="Retirement" hasTable="N" parentTypeId="" terminationTypeId="RETIRE"/> + + <EmplLeaveType description="Medical" hasTable="N" parentTypeId="" leaveTypeId="MEDICAL"/> + <EmplLeaveType description="Casual" hasTable="N" parentTypeId="" leaveTypeId="CASUAL"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml (original) +++ ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml Thu May 29 08:30:53 2008 @@ -55,6 +55,8 @@ <entity-group group="org.ofbiz" entity="TerminationReason" /> <entity-group group="org.ofbiz" entity="TerminationType" /> <entity-group group="org.ofbiz" entity="UnemploymentClaim" /> + <entity-group group="org.ofbiz" entity="EmplLeave"/> + <entity-group group="org.ofbiz" entity="EmplLeaveType"/> <!-- ========================================================= --> <!-- org.ofbiz.humanres.position --> Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Thu May 29 08:30:53 2008 @@ -336,6 +336,10 @@ <relation type="one-nofk" fk-name="EMPLMNT_TNTP" rel-entity-name="TerminationType"> <key-map field-name="terminationTypeId"/> </relation> + <relation type="many" fk-name="EMPLMNT_AGR" rel-entity-name="Agreement"> + <key-map field-name="partyIdTo" rel-field-name="agreementId"/> + <key-map field-name="partyIdFrom" rel-field-name="agreementId"/> + </relation> </entity> <entity entity-name="EmploymentApp" package-name="org.ofbiz.humanres.employment" @@ -376,6 +380,36 @@ <key-map field-name="parentTypeId" rel-field-name="employmentAppSourceTypeId"/> </relation> </entity> + <entity entity-name="EmplLeave" + package-name="org.ofbiz.humanres.employment" + title="Employee Leave Entity"> + <field name="partyId" type="id-ne"/> + <field name="leaveTypeId" type="id-ne"/> + <field name="fromDate" type="date-time"/> + <field name="thruDate" type="date-time"/> + <field name="description" type="description"/> + <prim-key field="partyId"/> + <prim-key field="leaveTypeId"/> + <prim-key field="fromDate"/> + <relation type="one" fk-name="EMPL_LEAVE_PRTY" rel-entity-name="Party"> + <key-map field-name="partyId"/> + </relation> + <relation type="one" fk-name="EMPL_LEAVE_ELETP" rel-entity-name="EmplLeaveType"> + <key-map field-name="leaveTypeId"/> + </relation> + </entity> + <entity entity-name="EmplLeaveType" + package-name="org.ofbiz.humanres.employment" + title="Employee Leave Type Entity"> + <field name="leaveTypeId" type="id-ne"/> + <field name="parentTypeId" type="id-ne"/> + <field name="hasTable" type="indicator"/> + <field name="description" type="description"/> + <prim-key field="leaveTypeId"/> + <relation type="one" fk-name="EMPL_LEAVE_TPAR" title="Parent" rel-entity-name="EmplLeaveType"> + <key-map field-name="parentTypeId" rel-field-name="leaveTypeId"/> + </relation> + </entity> <entity entity-name="PartyBenefit" package-name="org.ofbiz.humanres.employment" title="Party Benefit Entity"> Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Thu May 29 08:30:53 2008 @@ -249,6 +249,7 @@ <entity-one entity-name="PartyBenefit" value-name="lookedUpValue"/> <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> <store-value value-name="lookedUpValue"/> + <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createPayGrade" short-description="Create a Pay Grade"> @@ -297,6 +298,7 @@ <entity-one entity-name="PayHistory" value-name="lookedUpValue"/> <set field="lookedUpValue.thruDate" from-field="nowTimeStamp"/> <store-value value-name="lookedUpValue"/> + <remove-value value-name="lookedUpValue"/> </simple-method> <simple-method method-name="createPayrollPreference" short-description="Create a Payroll Preference"> @@ -638,4 +640,39 @@ <entity-one entity-name="AgreementEmploymentAppl" value-name="agreementEmploymentAppl"/> <remove-value value-name="agreementEmploymentAppl"/> </simple-method> + <simple-method method-name="createEmplLeave" short-description="Create Employee Leave"> + <make-value entity-name="EmplLeave" value-name="newEntity"/> + <set-pk-fields value-name="newEntity" map-name="parameters"/> + <set-nonpk-fields value-name="newEntity" map-name="parameters"/> + <create-value value-name="newEntity"/> + <check-errors/> + </simple-method> + + <simple-method method-name="updateEmplLeave" short-description="Update Employee Leave"> + <entity-one entity-name="EmplLeave" value-name="lookedUpValue"/> + <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> + <store-value value-name="lookedUpValue"/> + </simple-method> + + <simple-method method-name="createEmplLeaveType" short-description="Create a LeaveType"> + <make-value entity-name="EmplLeaveType" value-name="newEntity"/> + <set-pk-fields map-name="parameters" value-name="newEntity"/> + <set-nonpk-fields map-name="parameters" value-name="newEntity"/> + <if-empty field-name="newEntity.leaveTypeId"> + <sequenced-id-to-env sequence-name="EmplLeaveType" env-name="newEntity.leaveTypeId"/> + </if-empty> + <field-to-result field-name="newEntity.leaveTypeId" result-name="leaveTypeId"/> + <create-value value-name="newEntity"/> + </simple-method> + + <simple-method method-name="updateEmplLeaveType" short-description="Update leaveType"> + <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/> + <set-nonpk-fields value-name="lookedUpValue" map-name="parameters"/> + <store-value value-name="lookedUpValue"/> + </simple-method> + + <simple-method method-name="deleteEmplLeaveType" short-description="Delete leaveType"> + <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/> + <remove-value value-name="lookedUpValue"/> + </simple-method> </simple-methods> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/servicedef/services.xml (original) +++ ofbiz/trunk/applications/humanres/servicedef/services.xml Thu May 29 08:30:53 2008 @@ -678,5 +678,44 @@ <permission-service service-name="humanResManagerPermission" main-action="DELETE"/> <auto-attributes mode="IN" include="pk" optional="false"/> </service> + <service name="createEmplLeave" engine="simple" default-entity-name="EmplLeave" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplLeave" auth="true"> + <description>Create Employee Leave</description> + <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + + <service name="updateEmplLeave" engine="simple" default-entity-name="EmplLeave" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateEmplLeave" auth="true"> + <description>Update Valid Employee Leave</description> + <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + + <service name="createEmplLeaveType" engine="simple" default-entity-name="EmplLeaveType" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplLeaveType" auth="true"> + <description>Create Valid LeaveType</description> + <permission-service service-name="humanResManagerPermission" main-action="CREATE"/> + <auto-attributes mode="INOUT" include="pk" optional="true"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + <override name="description" optional="false"/> + </service> + + <service name="updateEmplLeaveType" engine="simple" default-entity-name="EmplLeaveType" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="updateEmplLeaveType" auth="true"> + <description>Update Valid LeaveType</description> + <permission-service service-name="humanResManagerPermission" main-action="UPDATE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + <auto-attributes mode="IN" include="nonpk" optional="true"/> + </service> + + <service name="deleteEmplLeaveType" engine="simple" default-entity-name="EmplLeaveType" + location="org/ofbiz/humanres/HumanResServices.xml" invoke="deleteEmplLeaveType" auth="true"> + <description>Delete Valid LeaveType</description> + <permission-service service-name="humanResManagerPermission" main-action="DELETE"/> + <auto-attributes mode="IN" include="pk" optional="false"/> + </service> </services> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=661359&r1=661358&r2=661359&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 29 08:30:53 2008 @@ -343,7 +343,7 @@ </request-map> <request-map uri="updateSalaryStep"> <security https="true" auth="true"/> - <event type="service" invoke="updateSalaryStep"/> + <event type="service-multi" invoke="updateSalaryStep"/> <response name="success" type="view" value="EditSalarySteps"/> </request-map> <request-map uri="deleteSalaryStep"> @@ -392,7 +392,53 @@ <security https="true" auth="true"/> <event type="service" invoke="deleteUnemploymentClaim"/> <response name="success" type="view" value="EditUnemploymentClaims"/> - </request-map> + </request-map> + <request-map uri="FindEmplLeaves"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindEmplLeaves"/> + </request-map> + <request-map uri="NewEmplLeave"> + <security https="true" auth="true"/> + <response name="success" type="view" value="NewEmplLeave"/> + </request-map> + <request-map uri="EditEmplLeaves"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmplLeaves"/> + </request-map> + <request-map uri="createEmplLeave"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplLeave"/> + <response name="success" type="view" value="NewEmplLeave"/> + <response name="error" type="view" value="NewEmplLeave"/> + </request-map> + <request-map uri="updateEmplLeave"> + <security https="true" auth="true"/> + <event type="service-multi" invoke="updateEmplLeave"/> + <response name="success" type="view" value="FindEmplLeaves"/> + <response name="error" type="view" value="FindEmplLeaves"/> + </request-map> + <request-map uri="EditEmplLeaveTypes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmplLeaveTypes"/> + </request-map> + <request-map uri="createEmplLeaveType"> + <security https="true" auth="true"/> + <event type="service" invoke="createEmplLeaveType"/> + <response name="success" type="view" value="EditEmplLeaveTypes"/> + <response name="error" type="view" value="EditEmplLeaveTypes"/> + </request-map> + <request-map uri="updateEmplLeaveType"> + <security https="true" auth="true"/> + <event type="service-multi" invoke="updateEmplLeaveType"/> + <response name="success" type="view" value="EditEmplLeaveTypes"/> + <response name="error" type="view" value="EditEmplLeaveTypes"/> + </request-map> + <request-map uri="deleteEmplLeaveType"> + <security https="true" auth="true"/> + <event type="service" invoke="deleteEmplLeaveType"/> + <response name="success" type="view" value="EditEmplLeaveTypes"/> + <response name="error" type="view" value="EditEmplLeaveTypes"/> + </request-map> <!-- ================Employee Position Group==================================== --> <request-map uri="FindEmplPositions"> <security https="true" auth="true"/> @@ -542,25 +588,9 @@ <response name="success" type="request" value="viewprofile"/> <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="EditPartyQual"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPartyQual"/> - </request-map> - <request-map uri="EditPersonTrainings"> + <request-map uri="EditPartyQuals"> <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"/> + <response name="success" type="view" value="EditPartyQuals"/> </request-map> <!-- ===================Responsibility Request============== --> <request-map uri="EditResponsibilityTypes"> @@ -575,7 +605,7 @@ </request-map> <request-map uri="updateResponsibilityType"> <security https="true" auth="true"/> - <event type="service" invoke="updateResponsibilityType"/> + <event type="service-multi" invoke="updateResponsibilityType"/> <response name="success" type="view" value="EditResponsibilityTypes"/> <response name="error" type="view" value="EditResponsibilityTypes"/> </request-map> @@ -697,6 +727,44 @@ <event type="service" invoke="deleteAgreementEmploymentAppl"/> <response name="success" type="view" value="EditAgreementEmploymentAppls"/> </request-map> + <!--====================Extended Requests===================================--> + <request-map uri="EditPartySkills"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartySkills"/> + </request-map> + <request-map uri="EditPartySkillsExt"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartySkills"/> + <response name="error" type="view" value="EditPartySkills"/> + </request-map> + <request-map uri="EditPersonTrainings"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPersonTrainings"/> + </request-map> + <request-map uri="EditPersonTrainingsExt"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPersonTrainings"/> + <response name="error" type="view" value="EditPersonTrainings"/> + </request-map> + <request-map uri="EditPartyResumes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartyResumes"/> + </request-map> + <request-map uri="EditPartyResumesExt"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPartyResumes"/> + <response name="error" type="view" value="EditPartyResumes"/> + </request-map> + <request-map uri="EditEmploymentApps"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmploymentApps"/> + </request-map> + <request-map uri="EditEmploymentAppsExt"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditEmploymentApps"/> + <response name="error" type="view" value="EditEmploymentApps"/> + </request-map> + <!-- ===================Lookup Request===================== --> <request-map uri="LookupPartyName"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyName"/></request-map> <request-map uri="LookupPayment"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayment"/></request-map> @@ -706,6 +774,13 @@ <request-map uri="LookupTerminationReason"><security auth="true" https="true"/><response name="success" type="view" value="LookupTerminationReason"/></request-map> <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> + <request-map uri="LookupPayRollPreference"><security auth="true" https="true"/><response name="success" type="view" value="LookupPayRollPreference"/></request-map> + <request-map uri="LookupUnemploymentClaim"><security auth="true" https="true"/><response name="success" type="view" value="LookupUnemploymentClaim"/></request-map> + <request-map uri="LookupAgreementEmploymentAppl"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreementEmploymentAppl"/></request-map> + <request-map uri="LookupPerfReview"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerfReview"/></request-map> + <request-map uri="LookupPartyResume"><security auth="true" https="true"/><response name="success" type="view" value="LookupPartyResume"/></request-map> + <request-map uri="LookupEmploymentApp"><security auth="true" https="true"/><response name="success" type="view" value="LookupEmploymentApp"/></request-map> + <request-map uri="LookupAgreement"><security auth="true" https="true"/><response name="success" type="view" value="LookupAgreement"/></request-map> <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"/> @@ -715,6 +790,13 @@ <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="LookupPayRollPreference" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPayRollPreference"/> + <view-map name="LookupUnemploymentClaim" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupUnemploymentClaim"/> + <view-map name="LookupAgreementEmploymentAppl" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupAgreementEmploymentAppl"/> + <view-map name="LookupPerfReview" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPerfReview"/> + <view-map name="LookupPartyResume" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupPartyResume"/> + <view-map name="LookupEmploymentApp" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmploymentApp"/> + <view-map name="LookupAgreement" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"/> <view-map name="main" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployments"/> @@ -743,22 +825,19 @@ <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="EditPartyQuals" type="screen" page="component://humanres/widget/PartyQualScreens.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="EditPersonTrainings" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#EditPersonTrainings"/> - <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"/> @@ -776,4 +855,14 @@ <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> + + <view-map name="EditPartySkills" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartySkills"/> + <view-map name="EditPersonTrainings" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPersonTrainings"/> + <view-map name="EditPartyResumes" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditPartyResumes"/> + <view-map name="EditEmploymentApps" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#EditEmploymentApps"/> + + <view-map name="FindEmplLeaves" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#FindEmplLeaves"/> + <view-map name="NewEmplLeave" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#NewEmplLeave"/> + <view-map name="EditEmplLeaves" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#EditEmplLeaves"/> + <view-map name="EditEmplLeaveTypes" type="screen" page="component://humanres/widget/EmplLeaveScreens.xml#EditEmplLeaveTypes"/> +</site-conf> \ No newline at end of file Added: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=661359&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (added) +++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Thu May 29 08:30:53 2008 @@ -0,0 +1,142 @@ +<?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="FindEmplLeaves"> + <section> + <actions> + <set field="titleProperty" value="HumanResFindEmplLeave"/> + <set field="headerItem" value="Leave"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="leaveTypeId" from-field="parameters.leaveTypeId"/> + <set field="fromDate" from-field="parameters.fromDate"/> + <set field="emplLeaveCtx" from-field="parameters"/> + </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"> + <section> + <widgets> + <container style="button-bar"> + <link target="NewEmplLeave" text="${uiLabelMap.CommonNew} ${uiLabelMap.HumanResEmployee} ${uiLabelMap.HumanResEmplLeave}" style="buttontext"/> + </container> + </widgets> + </section> + </decorator-section> + <decorator-section name="search-options"> + <include-form name="FindEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml" /> + </decorator-section> + </decorator-screen> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="NewEmplLeave"> + <section> + <actions> + <set field="titleProperty" value="HumanResNewEmplLeave"/> + <set field="headerItem" value="Leave"/> + <set field="emplLeaveCtx" from-field="parameters.PartyId"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResAddEmplLeave}"> + <section> + <widgets> + <include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmplLeaves"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditEmplLeave"/> + <set field="headerItem" value="Employee"/> + <set field="tabButtonItem" value="EditEmplLeaves"/> + <set field="partyId" from-field="parameters.partyId"/> + <set field="emplLeaveCtx.partyId" from-field="parameters.partyId"/> + </actions> + <widgets> + <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResEmplLeave}"> + <section> + <widgets> + <include-form name="ListEmplLeaves" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResAddEmplLeave}"> + <section> + <widgets> + <include-form name="AddEmplLeave" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EditEmplLeaveTypes"> + <section> + <actions> + <set field="titleProperty" value="HumanResEditEmplLeaveType"/> + <set field="headerItem" value="GlobalHRSettings"/> + <set field="tabButtonItem" value="EmplLeaveType"/> + <set field="leaveTypeId" from-field="parameters.leaveTypeId"/> + <entity-one entity-name="EmplLeaveType" value-name="emplLeaveType"/> + </actions> + <widgets> + <decorator-screen name="GlobalHRSettingsDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListEmplLeaveType}"> + <section> + <widgets> + <include-form name="ListEmplLeaveTypes" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResAddEmplLeaveType}"> + <section> + <widgets> + <include-form name="AddEmplLeaveType" location="component://humanres/widget/forms/EmplLeaveForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Thu May 29 08:30:53 2008 @@ -232,14 +232,14 @@ <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResPerfNote}"> <section> <widgets> - <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="ListPerformanceNotes" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </screenlet> <screenlet title="${uiLabelMap.HumanResAddPerfNote}"> <section> <widgets> - <include-form name="AddPerformanceNote" location="component://humanres/widget/forms/PartyAbilityForms.xml"/> + <include-form name="AddPerformanceNote" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </screenlet> @@ -263,7 +263,7 @@ <set field="fromDate" from-field="parameters.fromDate" type="Timestamp"/> </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.CommonList} ${uiLabelMap.HumanResAgreementEmploymentAppl}"> <section> Modified: ofbiz/trunk/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/LookupScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/LookupScreens.xml Thu May 29 08:30:53 2008 @@ -194,4 +194,207 @@ </widgets> </section> </screen> + <screen name="LookupPayRollPreference"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupPayRollPreference}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupPayRollPreference}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupPayRollPreference" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListPayRollPreferences" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupUnemploymentClaim"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupUnemploymentClaim}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupUnemploymentClaim}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupUnemploymentClaim" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupAgreement"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupAgreement}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupAgreement}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupAgreement" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListAgreements" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupAgreementEmploymentAppl"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupAgreementEmploymentAppl}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupAgreementEmploymentAppl}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupAgreementEmploymentAppl" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListAgreementEmploymentAppls" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupPerfReview"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupPerfReview}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupPerfReview}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupPerfReview" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListPerfReviews" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupPartyResume"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupPartyResume}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupPartyResume}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupPartyResume" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListPartyResumes" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="LookupEmploymentApp"> + <section> + <actions> + <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.HumanResLookupEmploymentApp}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="h3"> + <label text="${uiLabelMap.HumanResLookupEmploymentApp}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupEmploymentApp" location="component://humanres/widget/forms/LookupForms.xml"/> + <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Thu May 29 08:30:53 2008 @@ -33,6 +33,7 @@ <menu-item name="PartyResume" title="${uiLabelMap.HumanResPartyResume}"><link target="FindPartyResumes"/></menu-item> <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrades"/></menu-item> <menu-item name="PerfReview" title="${uiLabelMap.HumanResPerfReview}"><link target="FindPerfReviews"/></menu-item> + <menu-item name="Leave" title="${uiLabelMap.HumanResEmplLeave}"><link target="FindEmplLeaves"/></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"/> @@ -112,6 +113,9 @@ <menu-item name="EmplPositionTypes" title="${uiLabelMap.HumanResEmplPositionType}"> <link target="FindEmplPositionTypes"/> </menu-item> + <menu-item name="EmplLeaveType" title="${uiLabelMap.HumanResEmplLeaveType}"> + <link target="EditEmplLeaveTypes"/> + </menu-item> </menu> <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected" @@ -137,6 +141,9 @@ <menu-item name="EditPerformanceNotes" title="${uiLabelMap.HumanResPerfNote}"> <link target="EditPerformanceNotes?partyId=${partyId}"/> </menu-item> + <menu-item name="EditEmplLeaves" title="${uiLabelMap.HumanResEmplLeave}"> + <link target="EditEmplLeaves?partyId=${partyId}"/> + </menu-item> </menu> <menu name="EmplPositionTypeTabBar" default-menu-item-name="EditEmplPositionType" default-selected-style="selected" Modified: ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartyResumeScreens.xml Thu May 29 08:30:53 2008 @@ -26,6 +26,7 @@ <set field="titleProperty" value="HumanResFindPartyResume"/> <set field="headerItem" value="PartyResume"/> <set field="partyResumeCtx" from-field="parameters"/> + <set field="insideParty.partyResume" value="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Thu May 29 08:30:53 2008 @@ -27,6 +27,7 @@ <set field="headerItem" value="PartySkills"/> <set field="partyId" from-field="parameters.partyId"/> <set field="partySkillsCtx" from-field="parameters"/> + <set field="insideParty.partySkills" value="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -53,6 +54,38 @@ </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/PartySkillForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResNewPartySkill}"> + <section> + <widgets> + <include-form name="AddPartySkills" location="component://humanres/widget/forms/PartySkillForms.xml"/> + </widgets> + </section> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="NewPartySkill"> <section> <actions> @@ -76,5 +109,5 @@ </decorator-screen> </widgets> </section> - </screen> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PayGradeScreens.xml Thu May 29 08:30:53 2008 @@ -84,6 +84,7 @@ <set field="headerItem" value="PayGrade"/> <set field="tabButtonItem" value="EditSalaryStep"/> <set field="payGradeId" from-field="parameters.payGradeId"/> + <set field="salaryStepSeqId" from-field="parameters.salaryStepSeqId"/> </actions> <widgets> <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Thu May 29 08:30:53 2008 @@ -27,6 +27,7 @@ <set field="headerItem" value="Training"/> <set field="partyId" from-field="parameters.partyId"/> <set field="personTrainingsCtx" from-field="parameters"/> + <set field="insideParty.personTraining" value="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Added: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=661359&view=auto ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (added) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Thu May 29 08:30:53 2008 @@ -0,0 +1,84 @@ +<?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. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + <form name="FindEmplLeaves" type="single" target="FindEmplLeaves" + odd-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="EmplLeave" default-field-type="find"/> + <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="leaveTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/> + </drop-down> + </field> + <field name="noConditionFind"><hidden value="Y"/></field> + <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmplLeaves" type="multi" use-row-submit="true" separate-columns="true" target="updateEmplLeave" list-name="listIt" paginate-target="FindEmplLeaves" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> + <field-map field-name="inputFields" env-name="parameters"/> + <field-map field-name="entityName" value="EmplLeave"/> + <field-map field-name="orderBy" value="fromDate"/> + </service> + </actions> + <auto-fields-service service-name="updateEmplLeave"/> + <field name="partyId"><display/></field> + <field name="leaveTypeId"><display/></field> + <field name="fromDate"><display/></field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddEmplLeave" type="single" target="createEmplLeave" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="createEmplLeave"/> + <field name="partyId" use-when="emplLeaveCtx!=null"><hidden/></field> + <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when="emplLeaveCtx==null"><lookup target-form-name="LookupPartyName"/></field> + <field name="leaveTypeId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" key-field-name="leaveTypeId" entity-name="EmplLeaveType"/> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListEmplLeaveTypes" type="multi" title="" target="updateEmplLeaveType" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <entity-condition entity-name="EmplLeaveType"><order-by field-name="leaveTypeId"/></entity-condition> + </actions> + <auto-fields-service service-name="updateEmplLeaveType" default-field-type="hidden"/> + <field name="leaveTypeId"><display/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> + <hyperlink target="deleteEmplLeaveType?leaveTypeId=${leaveTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + </field> + <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> + </form> + <form name="AddEmplLeaveType" type="single" target="createEmplLeaveType" default-map-name="emplLeaveType" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="createEmplLeaveType" default-field-type="hidden"/> + <field name="leaveTypeId"><text/></field> + <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> +</forms> \ No newline at end of file Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Thu May 29 08:30:53 2008 @@ -69,6 +69,8 @@ </actions> <auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/></field> + <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field> + <field name="applicationId"><lookup target-form-name="LookupEmploymentApp"/></field> <field name="statusId"> <drop-down allow-empty="true" current-description=""> <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"> @@ -95,7 +97,7 @@ <form name="AddEmploymentApp" type="single" target="createEmploymentApp?applicationId=${applicationId}&&partyId=${referredByPartyId}" default-entity-name="EmploymentApp" paginate-target="FindEmploymentApps" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createEmploymentApp" default-field-type="hidden"/> - <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>. + <field name="applicationId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupEmploymentApp"/></field>. <field name="emplPositionId"><lookup target-form-name="LookupEmplPosition"/></field> <field name="statusId"> <drop-down allow-empty="true" current-description=""> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu May 29 08:30:53 2008 @@ -126,7 +126,7 @@ <hyperlink target="deletePayHistory?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="ListPartyBenefits" type="multi" target="updatePartyBenefit" title="" paginate-target="findPartyBenefits" + <form name="ListPartyBenefits" type="multi" target="updatePartyBenefit?benefitTypeId=${benefitTypeId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" title="" paginate-target="findPartyBenefits" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartyBenefit"><order-by field-name="fromDate"/></entity-condition> @@ -148,7 +148,7 @@ <field name="thruDate"><date-time/></field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deletePartyBenefit?benefitTypeId=${benefitTypeId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/> </field> </form> @@ -177,7 +177,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="ListPayrollPreferences" type="multi" target="updatePayrollPreference" separate-columns="true" paginate-target="findPayRollPreferences" + <form name="ListPayrollPreferences" type="multi" target="updatePayrollPreference?partyId=${partyId}&roleTypeId=${roleTypeId}&payrollPreferenceSeqId=${payrollPreferenceSeqId}" separate-columns="true" paginate-target="findPayRollPreferences" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PayrollPreference"> @@ -191,7 +191,7 @@ <auto-fields-service default-field-type="hidden" service-name="updatePayrollPreference"/> <field name="partyId"><display/></field> <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> - <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display/></field> + <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}"><display also-hidden="true"/></field> <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field> <field name="periodTypeId"><display-entity entity-name="PeriodType" description="${description}"/></field> <field name="fromDate"><display/></field> @@ -205,7 +205,7 @@ <form name="AddPayrollPreference" type="single" target="createPayrollPreference" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createPayrollPreference" /> - <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> + <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResPayrollPreferenceSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPayRollPreference"/></field> <field name="partyId"><hidden/></field> <field name="roleTypeId"><hidden/></field> <field name="fromDate"><hidden/></field> @@ -257,7 +257,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListUnemploymentClaims" type="multi" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim" + <form name="ListUnemploymentClaims" type="multi" target="updateUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}&roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}" paginate-target="FindUnemploymentClaim" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="UnemploymentClaim" filter-by-date="true"> @@ -295,7 +295,7 @@ <form name="AddUnemploymentClaim" type="single" target="createUnemploymentClaim" title="" default-map-name="unemploymentClaim" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createUnemploymentClaim"/> - <field name="unemploymentClaimId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> + <field name="unemploymentClaimId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupUnemploymentClaim"/></field> <field name="statusId"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"> @@ -334,8 +334,8 @@ <form name="AddAgreementEmploymentAppl" type="single" target="createAgreementEmploymentAppl" default-map-name="agreementEmploymentAppl" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createAgreementEmploymentAppl" default-field-type="display"/> - <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> - <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> + <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupAgreement"/></field> + <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupAgreementEmploymentAppl"/></field> <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeIdFrom" tooltip="${uiLabelMap.CommonRequired}"> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=661359&r1=661358&r2=661359&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Thu May 29 08:30:53 2008 @@ -26,7 +26,7 @@ <entity-condition entity-name="SkillType"><order-by field-name="skillTypeId"/></entity-condition> </actions> <auto-fields-service service-name="updateSkillType" default-field-type="hidden"/> - <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display-entity entity-name="SkillType" description="${description}"/></field> + <field name="skillTypeId" title="${uiLabelMap.HumanResSkillTypeId}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteSkillType?skillTypeId=${skillTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -47,7 +47,7 @@ <entity-condition entity-name="ResponsibilityType"><order-by field-name="responsibilityTypeId"/></entity-condition> </actions> <auto-fields-service service-name="updateResponsibilityType" default-field-type="hidden"/> - <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display-entity entity-name="ResponsibilityType" description="${description}"/></field> + <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteResponsibilityType?responsibilityTypeId=${responsibilityTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> @@ -67,7 +67,7 @@ <entity-condition entity-name="TerminationType"><order-by field-name="terminationTypeId"/></entity-condition> </actions> <auto-fields-service service-name="updateTerminationType" default-field-type="hidden"/> - <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display-entity entity-name="TerminationType" description="${description}"/></field> + <field name="terminationTypeId" title="${uiLabelMap.HumanResTerminationTypeId}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> <hyperlink target="deleteTerminationType?terminationTypeId=${terminationTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -85,7 +85,11 @@ <form name="FindEmplPositionTypes" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="EmplPositionType" default-field-type="find"/> <field name="noConditionFind"><hidden value="Y"/></field> - <field name="emplPositionTypeId"><text/></field> + <field name="emplPositionTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="EmplPositionType" description="${description}" key-field-name="emplPositionTypeId"/> + </drop-down> + </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -139,7 +143,7 @@ </form> <form name="AddEmplPositionTypeRate" type="single" target="createEmplPositionTypeRate" default-map-name="emplPositionTypeRate" paginate-target="EditEmplPositionTypeRates" header-row-style="header-row" default-table-style="basic-table"> - <field name="emplPositionTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><hidden/></field> + <field name="emplPositionTypeId"><hidden/></field> <field name="rateTypeId"> <drop-down allow-empty="true" no-current-selected-key=""> <entity-options description="${description}" key-field-name="rateTypeId" entity-name="RateType"> @@ -166,7 +170,7 @@ <entity-condition entity-name="TerminationReason"><order-by field-name="terminationReasonId"/></entity-condition> </actions> <auto-fields-service default-field-type="display" service-name="updateTerminationReason"/> - <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display-entity entity-name="TerminationReason" description="${description}"/></field> + <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field> <field name="description"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> @@ -180,5 +184,5 @@ <field name="terminationReasonId"><text/></field> <field name="description" title="${uiLabelMap.CommonDescription}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> + </form> </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |