svn commit: r657019 - in /ofbiz/trunk/applications/huma
Locked
 
|
Author: ashish
Date: Fri May 16 04:16:38 2008 New Revision: 657019 URL: http://svn.apache.org/viewvc?rev=657019&view=rev Log: Applied patch from JIRA issue :- https://issues.apache.org/jira/browse/OFBIZ-1659 In this patch following things are cleaned up : 1) Employee Position Summary Section introduced 2) Improved the usability of Pay Grade,Termination Reason,UnEmployment Claim & Employment Application. Thanks Parimal Gain for your patch. Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri May 16 04:16:38 2008 @@ -354,12 +354,24 @@ <property key="HumanResAddEmplPositionResponsibility"> <value xml:lang="en">Add Position Responsibility</value> </property> + <property key="HumanResAddPayGrade"> + <value xml:lang="en">Add Pay Grade</value> + </property> <property key="HumanResAddReportedToEmplPositionReportingStruct"> <value xml:lang="en">Add Empl Position Reporting Struct [Reported To ${parameters.emplPositionId}]</value> </property> <property key="HumanResAddReportsToEmplPositionReportingStruct"> <value xml:lang="en">Add Empl Position Reporting Struct [${parameters.emplPositionId} Reports To]</value> </property> + <property key="HumanResAddSalaryStep"> + <value xml:lang="en">Add Salary Step</value> + </property> + <property key="HumanResAddTerminationReason"> + <value xml:lang="en">Add Termination Reason</value> + </property> + <property key="HumanResAddUnemploymentClaim"> + <value xml:lang="en">Add Unemployment Claim</value> + </property> <property key="HumanResAddValidResponsibility"> <value xml:lang="en">Add Valid Responsibility</value> </property> @@ -391,9 +403,6 @@ <property key="HumanResEditEmplPosition"> <value xml:lang="en">Create/Update Employee Position</value> </property> - <property key="HumanResEmplPosition"> - <value xml:lang="en">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> @@ -440,11 +449,6 @@ <value xml:lang="it">Aggiorna Abilità Soggetto</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸±à¸à¸©à¸°</value> </property> - <property key="HumanResEditPayGrade"> - <value xml:lang="en">Edit Pay Grade</value> - <value xml:lang="it">Aggiorna Grado Paga</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸°à¸à¸±à¸à¸à¸²à¸£à¸à¹à¸²à¸¢</value> - </property> <property key="HumanResEditPayHistory"> <value xml:lang="en">Edit Pay History</value> <value xml:lang="it">Aggiorna Storia Paghe</value> @@ -465,16 +469,6 @@ <value xml:lang="it">Aggiorna Passi Salario</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸±à¹à¸à¹à¸à¸´à¸à¹à¸à¸·à¸à¸</value> </property> - <property key="HumanResEditTerminationReason"> - <value xml:lang="en">Edit Termination Reason</value> - <value xml:lang="it">Aggiorna Motivazione Licenziamento</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸à¸à¹à¸à¸à¹à¸«à¸à¸¸à¸à¸¥</value> - </property> - <property key="HumanResEditUnemploymentClaim"> - <value xml:lang="en">Edit Unemployment Claim</value> - <value xml:lang="it">Aggiorna Reclamo Disoccupazione</value> - <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸³à¸à¸§à¸à¸à¸¹à¹à¸§à¹à¸²à¸à¹à¸²à¸à¹à¸£à¸µà¸¢à¸à¸£à¹à¸à¸</value> - </property> <property key="HumanResEmployee"> <value xml:lang="en">Employee</value> </property> @@ -534,26 +528,20 @@ <property key="HumanResFindEmplPosition"> <value xml:lang="en">Find Employee Position</value> </property> + <property key="HumanResFindEmploymentApp"> + <value xml:lang="en">Find Employment Application</value> + </property> <property key="HumanResListEmplPositionsReportedTo"> <value xml:lang="en">List Employee Positions, Reported To [${parameters.emplPositionId}]</value> </property> <property key="HumanResListEmplPositionsReportsTo"> <value xml:lang="en">List Employee Positions, [${parameters.emplPositionId}] Reports To</value> </property> - <property key="HumanResListEmploymentApps"> - <value xml:lang="en">List Employment Applications</value> - <value xml:lang="it">Lista Applicazioni Impiegato</value> - <value xml:lang="th">รายà¸à¸²à¸£à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¹à¸à¹à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> - </property> <property key="HumanResListEmployments"> <value xml:lang="en">List Employment</value> <value xml:lang="it">Lista Impiegato</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸²à¸£à¸à¹à¸²à¸à¸à¸²à¸</value> </property> - <property key="HumanResPositionFulfillments"> - <value xml:lang="en">Fulfillments</value> - <value xml:lang="it">Adempimento</value> - </property> <property key="HumanResListPartyBenefits"> <value xml:lang="en">List Party Benefits</value> <value xml:lang="it">Lista Benefits Soggetto </value> @@ -812,6 +800,16 @@ <value xml:lang="it">Sequenza Preferenze Paghe</value> <value xml:lang="th">รหัสรายà¸à¸²à¸£à¹à¸à¸´à¸à¹à¸à¸·à¸à¸à¸ªà¸´à¸à¸à¸´à¸à¸´à¹à¸¨à¸©</value> </property> + <property key="HumanResPositionFulfillments"> + <value xml:lang="en">Fulfillments</value> + <value xml:lang="it">Adempimento</value> + </property> + <property key="HumanResReportedTo"> + <value xml:lang="en">ReportedTo</value> + </property> + <property key="HumanResReportsTo"> + <value xml:lang="en">ReportsTo</value> + </property> <property key="HumanResResponsibilityType"> <value xml:lang="en">Responsibility Type</value> </property> 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=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri May 16 04:16:38 2008 @@ -209,9 +209,9 @@ <event type="service" invoke="deleteEmployment"/> <response name="success" type="view" value="ListEmployments"/> </request-map> - <request-map uri="findEmploymentApps"> + <request-map uri="FindEmploymentApp"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListEmploymentApps"/> + <response name="success" type="view" value="FindEmploymentApp"/> </request-map> <request-map uri="EditEmploymentApp"> <security https="true" auth="true"/> @@ -292,11 +292,7 @@ <event type="service" invoke="deletePayrollPreference"/> <response name="success" type="view" value="EditPayrollPreferences"/> </request-map> - <request-map uri="findPayGrades"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ListPayGrades"/> - </request-map> - <request-map uri="EditPayGrade"> + <request-map uri="FindPayGrade"> <security https="true" auth="true"/> <response name="success" type="view" value="EditPayGrade"/> </request-map> @@ -313,7 +309,7 @@ <request-map uri="deletePayGrade"> <security https="true" auth="true"/> <event type="service" invoke="deletePayGrade"/> - <response name="success" type="view" value="ListPayGrades"/> + <response name="success" type="view" value="EditPayGrade"/> </request-map> <request-map uri="EditSalarySteps"> <security https="true" auth="true"/> @@ -334,11 +330,7 @@ <event type="service" invoke="deleteSalaryStep"/> <response name="success" type="view" value="EditSalarySteps"/> </request-map> - <request-map uri="findTerminationReasons"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ListTerminationReasons"/> - </request-map> - <request-map uri="EditTerminationReason"> + <request-map uri="FindTerminationReason"> <security https="true" auth="true"/> <response name="success" type="view" value="EditTerminationReason"/> </request-map> @@ -355,11 +347,11 @@ <request-map uri="deleteTerminationReason"> <security https="true" auth="true"/> <event type="service" invoke="deleteTerminationReason"/> - <response name="success" type="view" value="ListTerminationReasons"/> + <response name="success" type="view" value="EditTerminationReason"/> </request-map> - <request-map uri="findUnemploymentClaims"> + <request-map uri="FindUnemploymentClaim"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListUnemploymentClaims"/> + <response name="success" type="view" value="EditUnemploymentClaim"/> </request-map> <request-map uri="EditUnemploymentClaim"> <security https="true" auth="true"/> @@ -378,7 +370,7 @@ <request-map uri="deleteUnemploymentClaim"> <security https="true" auth="true"/> <event type="service" invoke="deleteUnemploymentClaim"/> - <response name="success" type="view" value="ListUnemploymentClaims"/> + <response name="success" type="view" value="EditUnemploymentClaim"/> </request-map> <!-- ================Employee Position Group==================================== --> <request-map uri="FindEmplPosition"> @@ -552,6 +544,12 @@ <response name="success" type="view" value="EditResponsibilityType"/> <response name="error" type="view" value="EditResponsibilityType"/> </request-map> + <!-- =================EmplPosition View Request============ --> + <request-map uri="emplPositionView"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EmplPositionView"/> + <response name="error" type="view" value="EmplPositionView"/> + </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> @@ -583,18 +581,15 @@ <view-map name="FindEmployments" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmployments"/> <view-map name="EditEmployment" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmployment"/> - <view-map name="ListEmploymentApps" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListEmploymentApps"/> + <view-map name="FindEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#FindEmploymentApp"/> <view-map name="EditEmploymentApp" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditEmploymentApp"/> <view-map name="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="ListPayGrades" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListPayGrades"/> <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="ListTerminationReasons" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListTerminationReasons"/> <view-map name="EditTerminationReason" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditTerminationReason"/> - <view-map name="ListUnemploymentClaims" type="screen" page="component://humanres/widget/EmploymentScreens.xml#ListUnemploymentClaims"/> <view-map name="EditUnemploymentClaim" type="screen" page="component://humanres/widget/EmploymentScreens.xml#EditUnemploymentClaim"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> @@ -609,4 +604,5 @@ <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="EmplPositionView" type="screen" page="component://humanres/widget/EmplPositionScreens.xml#EmplPositionView"/> </site-conf> Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Fri May 16 04:16:38 2008 @@ -277,4 +277,115 @@ </widgets> </section> </screen> + <screen name="EmplPositionView"> + <section> + <actions> + <set field="titleProperty" value="HumanResEmplPositionSummary"/> + <set field="tabButtonItem" value="EmplPositionView"/> + <set field="emplPositionId" from-field="parameters.emplPositionId"/> + <entity-one entity-name="EmplPosition" value-name="emplPosition"/> + </actions> + <widgets> + <decorator-screen name="CommonEmplPositionDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <widgets> + <container style="lefthalf"> + <screenlet title="${uiLabelMap.HumanResEmployeePosition} ${uiLabelMap.CommonInformation}"> + <section> + <widgets> + <include-form name="EmplPositionInfo" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screenlet> + <include-screen name="EmplPositionFulfilmentView"/> + <include-screen name="EmplPositionResponsibilityView"/> + </container> + <container style="righthalf"> + <include-screen name="EmplPositionReportsToView"/> + <include-screen name="EmplPositionReportedToView"/> + </container> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="EmplPositionFulfilmentView"> + <section> + <actions> + <entity-condition entity-name="EmplPositionFulfillment" list-name="emplPositionFulfillments"> + <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <widgets> + <screenlet title="${uiLabelMap.HumanResPositionFulfillments}"> + <section> + <widgets> + <include-form name="ListEmplPositionFulfilmentInfo" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screenlet> + </widgets> + </section> + </screen> + <screen name="EmplPositionResponsibilityView"> + <section> + <actions> + <entity-condition entity-name="EmplPositionResponsibility" list-name="emplPositionResponsibilities"> + <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <widgets> + <screenlet title="${uiLabelMap.HumanResEmplPositionResponsibilities}"> + <section> + <widgets> + <include-form name="ListEmplPositionResponsibilityInfo" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screenlet> + </widgets> + </section> + </screen> + <screen name="EmplPositionReportsToView"> + <section> + <actions> + <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructs"> + <condition-expr field-name="emplPositionIdManagedBy" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <widgets> + <screenlet title="${uiLabelMap.HumanResEmplPositionReportingStruct}:${uiLabelMap.HumanResReportsTo}"> + <section> + <widgets> + <include-form name="ListEmplPositionReportsToInfo" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screenlet> + </widgets> + </section> + </screen> + <screen name="EmplPositionReportedToView"> + <section> + <actions> + <entity-condition entity-name="EmplPositionReportingStruct" list-name="emplPositionReportingStructs"> + <condition-expr field-name="emplPositionIdReportingTo" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="fromDate"/> + </entity-condition> + </actions> + <widgets> + <screenlet title="${uiLabelMap.HumanResEmplPositionReportingStruct}:${uiLabelMap.HumanResReportedTo}"> + <section> + <widgets> + <include-form name="ListEmplPositionReportedToInfo" location="component://humanres/widget/forms/EmplPositionForms.xml"/> + </widgets> + </section> + </screenlet> + </widgets> + </section> + </screen> </screens> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Fri May 16 04:16:38 2008 @@ -106,32 +106,32 @@ </widgets> </section> </screen> - <screen name="ListEmploymentApps"> + <screen name="FindEmploymentApp"> <section> <actions> - <set field="titleProperty" value="HumanResListEmploymentApps"/> + <set field="titleProperty" value="HumanResFindEmploymentApp"/> <set field="headerItem" value="EmploymentApp"/> </actions> <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResListEmploymentApps}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.HumanResNewEmploymentApp}" target="EditEmploymentApp" style="buttontext"/> - </container> - <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.HumanResFindEmploymentApp}"> + <section> + <widgets> + <container> + <link target="EditEmploymentApp" text="${uiLabelMap.CommonCreate} ${uiLabelMap.HumanResNewEmploymentApp}" style="buttontext"/> + </container> + <include-form name="FindEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> + <screenlet title="${uiLabelMap.HumanResFindEmploymentApp}"> + <section> + <widgets> + <include-form name="ListEmploymentApps" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -308,43 +308,10 @@ </widgets> </section> </screen> - <screen name="ListPayGrades"> - <section> - <actions> - <set field="titleProperty" value="HumanResListPayGrade"/> - <set field="headerItem" value="PayGrade"/> - <set field="tabButtonItem" value="EditSalaryStep"/> - <set field="payGradeId" from-field="parameters.payGradeId" /> - </actions> - <widgets> - <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResListPayGrade}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditPayGrade" text="${uiLabelMap.HumanResNewPayGrade}" style="buttontext"/> - </container> - <include-form name="ListPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml"/> - </widgets> - </section> - </container> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditPayGrade"> <section> <actions> - <set field="titleProperty" value="HumanResEditPayGrade"/> + <set field="titleProperty" value="HumanResAddPayGrade"/> <set field="headerItem" value="PayGrade"/> <set field="tabButtonItem" value="EditSalaryStep"/> <set field="payGradeId" from-field="parameters.payGradeId"/> @@ -353,19 +320,23 @@ <widgets> <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListPayGrade}"> + <section> + <widgets> + <include-form name="ListPayGrades" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResEditPayGrade}"/> + <label text="${uiLabelMap.HumanResAddPayGrade}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditPayGrade" text="${uiLabelMap.HumanResNewPayGrade}" style="buttontext" /> - </container> - <include-form name="EditPayGrade" location="component://humanres/widget/forms/EmploymentForms.xml" /> + <include-form name="AddPayGrade" location="component://humanres/widget/forms/EmploymentForms.xml" /> </widgets> </section> </container> @@ -387,54 +358,20 @@ <decorator-screen name="CommonPayGradeDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleListSalarySteps}"> - <container> - <link target="EditSalarySteps?payGradeId=${payGradeId}" text="${uiLabelMap.HumanResNewSalaryStep}" style="buttontext"/> - </container> <include-form name="ListSalarySteps" location="component://humanres/widget/forms/EmploymentForms.xml"/> </screenlet> - <screenlet title="${uiLabelMap.HumanResEditSalaryStep}"> - <include-form name="EditSalaryStep" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <screenlet title="${uiLabelMap.HumanResAddSalaryStep}"> + <include-form name="AddSalaryStep" location="component://humanres/widget/forms/EmploymentForms.xml"/> </screenlet> </decorator-section> </decorator-screen> </widgets> </section> </screen> - <screen name="ListTerminationReasons"> - <section> - <actions> - <set field="titleProperty" value="HumanResListTerminationReasons"/> - <set field="headerItem" value="TerminationReason"/> - </actions> - <widgets> - <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResListTerminationReasons}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditTerminationReason" text="${uiLabelMap.HumanResNewTerminationReason}" style="buttontext"/> - </container> - <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/EmploymentForms.xml"/> - </widgets> - </section> - </container> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditTerminationReason"> <section> <actions> - <set field="titleProperty" value="HumanResEditTerminationReason"/> + <set field="titleProperty" value="HumanResAddTerminationReason"/> <set field="headerItem" value="TerminationReason"/> <set field="terminationReasonId" from-field="parameters.terminationReasonId" /> <entity-one entity-name="TerminationReason" value-name="terminationReason" /> @@ -442,19 +379,23 @@ <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListTerminationReasons}"> + <section> + <widgets> + <include-form name="ListTerminationReasons" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResEditTerminationReason}"/> + <label text="${uiLabelMap.HumanResAddTerminationReason}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditTerminationReason" text="${uiLabelMap.HumanResNewTerminationReason}" style="buttontext"/> - </container> - <include-form name="EditTerminationReason" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <include-form name="AddTerminationReason" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </container> @@ -464,41 +405,10 @@ </widgets> </section> </screen> - <screen name="ListUnemploymentClaims"> - <section> - <actions> - <set field="titleProperty" value="HumanResListUnemploymentClaim"/> - <set field="headerItem" value="UnemploymentClaim"/> - </actions> - <widgets> - <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.HumanResListUnemploymentClaim}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditUnemploymentClaim" text="${uiLabelMap.HumanResNewUnemploymentClaim}" style="buttontext"/> - </container> - <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/EmploymentForms.xml"/> - </widgets> - </section> - </container> - </container> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="EditUnemploymentClaim"> <section> <actions> - <set field="titleProperty" value="HumanResEditUnemploymentClaim"/> + <set field="titleProperty" value="HumanResAddUnemploymentClaim"/> <set field="headerItem" value="UnemploymentClaim"/> <set field="unemploymentClaimId" from-field="parameters.unemploymentClaimId" /> <entity-one entity-name="UnemploymentClaim" value-name="unemploymentClaim" /> @@ -506,19 +416,23 @@ <widgets> <decorator-screen name="CommonEmploymentDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> + <screenlet title="${uiLabelMap.HumanResListUnemploymentClaim}"> + <section> + <widgets> + <include-form name="ListUnemploymentClaims" location="component://humanres/widget/forms/EmploymentForms.xml"/> + </widgets> + </section> + </screenlet> <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.HumanResEditUnemploymentClaim}"/> + <label text="${uiLabelMap.HumanResAddUnemploymentClaim}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container> - <link target="EditUnemploymentClaim" text="${uiLabelMap.HumanResNewUnemploymentClaim}" style="buttontext" /> - </container> - <include-form name="EditUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/> + <include-form name="AddUnemploymentClaim" location="component://humanres/widget/forms/EmploymentForms.xml"/> </widgets> </section> </container> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Fri May 16 04:16:38 2008 @@ -25,10 +25,10 @@ <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item> <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item> <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="FindEmployments"/></menu-item> - <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="findPayGrades"/></menu-item> - <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="findTerminationReasons"/></menu-item> - <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="findUnemploymentClaims"/></menu-item> - <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="findEmploymentApps"/></menu-item> + <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="FindPayGrade"/></menu-item> + <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="FindTerminationReason"/></menu-item> + <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="FindUnemploymentClaim"/></menu-item> + <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="FindEmploymentApp"/></menu-item> <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="FindPartySkills"/></menu-item> <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item> <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item> @@ -61,7 +61,10 @@ <link target="ListPayHistories?roleTypeIdFrom=${roleTypeIdFrom}&roleTypeIdTo=${roleTypeIdTo}&partyIdFrom=${partyIdFrom}&partyIdTo=${partyIdTo}&fromDate=${fromDate}"/> </menu-item> </menu> - <menu name="EmplPostionBar" default-menu-item-name="EditEmplPosition" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> + <menu name="EmplPostionBar" default-menu-item-name="EmplPositionView" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> + <menu-item name="EmplPositionView" title="${uiLabelMap.CommonSummary}"> + <link target="emplPositionView?emplPositionId=${emplPositionId}"/> + </menu-item> <menu-item name="EditEmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="EditEmplPosition?emplPositionId=${emplPositionId}"/></menu-item> <menu-item name="EditEmplPositionFulfillments" title="${uiLabelMap.HumanResPositionFulfillments}"> <link target="EditEmplPositionFulfillments?emplPositionId=${emplPositionId}"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Fri May 16 04:16:38 2008 @@ -31,7 +31,7 @@ </actions> <auto-fields-entity entity-name="EmplPosition" default-field-type="display"/> <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" widget-style="linktext"> - <hyperlink also-hidden="false" description="${emplPositionId}" target="EditEmplPosition?emplPositionId=${emplPositionId}"/> + <hyperlink also-hidden="false" description="${emplPositionId}" target="emplPositionView?emplPositionId=${emplPositionId}"/> </field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView"> @@ -82,7 +82,10 @@ <form name="ListEmplPositionFulfillments" type="list" target="updateEmplPositionFulfillment" title="" paginate-target="findEmplPositionFulfillments" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="EmplPositionFulfillment"><order-by field-name="emplPositionId"/></entity-condition> + <entity-condition entity-name="EmplPositionFulfillment"> + <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="emplPositionId"/> + </entity-condition> </actions> <auto-fields-service service-name="updateEmplPositionFulfillment"/> <field name="partyId" title="${uiLabelMap.PartyPartyId}"> @@ -165,7 +168,10 @@ <form name="ListEmplPositionResponsibilities" type="list" target="updateEmplPositionResponsibility" title="" paginate-target="findEmplPositionResponsibilities" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="EmplPositionResponsibility"><order-by field-name="emplPositionId"/></entity-condition> + <entity-condition entity-name="EmplPositionResponsibility"> + <condition-expr field-name="emplPositionId" operator="equals" env-name="parameters.emplPositionId"/> + <order-by field-name="emplPositionId"/> + </entity-condition> </actions> <auto-fields-service service-name="updateEmplPositionResponsibility"/> <field name="emplPositionId"><hidden/></field> @@ -251,4 +257,28 @@ </field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <form name="EmplPositionInfo" type="single" default-map-name="emplPosition" paginate-target="FindEmplPosition" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-service service-name="updateEmplPosition" default-field-type="display"/> + </form> + <form name="ListEmplPositionFulfilmentInfo" type="list" list-name="emplPositionFulfillments" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <auto-fields-service service-name="updateEmplPositionFulfillment" default-field-type="display"/> + <field name="emplPositionId"><hidden/></field> + </form> + <form name="ListEmplPositionResponsibilityInfo" type="list" list-name="emplPositionResponsibilities" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <auto-fields-service service-name="updateEmplPositionResponsibility" default-field-type="display"/> + <field name="emplPositionId"><hidden/></field> + </form> + <form name="ListEmplPositionReportsToInfo" type="list" list-name="emplPositionReportingStructs" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <auto-fields-service service-name="updateEmplPositionReportingStruct" default-field-type="display"/> + <field name="emplPositionIdManagedBy"><hidden/></field> + </form> + <form name="ListEmplPositionReportedToInfo" type="list" list-name="emplPositionReportingStructs" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <auto-fields-service service-name="updateEmplPositionReportingStruct" default-field-type="display"/> + <field name="emplPositionIdReportingTo"><hidden/></field> + </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=657019&r1=657018&r2=657019&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Fri May 16 04:16:38 2008 @@ -104,12 +104,16 @@ <field name="submitButton" use-when="employment==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="submitButton" use-when="employment!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListEmploymentApps" type="list" title="" paginate-target="findEmploymentApps" + <form name="ListEmploymentApps" type="list" separate-columns="true" default-entity-name="EmploymentApp" list-name="listIt" paginate-target="FindEmploymentApp" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="EmploymentApp"><order-by field-name="applicationId"/></entity-condition> + <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> + <field-map field-name="inputFields" env-name="parameters"/> + <field-map field-name="entityName" value="EmploymentApp"/> + <field-map field-name="orderBy" value="applicationId"/> + </service> </actions> - <auto-fields-service default-field-type="display" service-name="updateEmploymentApp"/> + <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/> <field name="applicationId" title="${uiLabelMap.HumanResApplicationId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${applicationId}" target="EditEmploymentApp?applicationId=${applicationId}"/> </field> @@ -282,31 +286,25 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListPayGrades" type="list" title="" paginate-target="findPayGrades" + <form name="ListPayGrades" type="list" title="" target="updatePayGrade" paginate-target="FindPayGrade" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PayGrade"><order-by field-name="payGradeId"/></entity-condition> </actions> <auto-fields-service default-field-type="display" service-name="updatePayGrade"/> - <field name="payGradeId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${payGradeId}" target="EditPayGrade?payGradeId=${payGradeId}"/> - </field> + <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><display/></field> + <field name="payGradeName"><text/></field> + <field name="comments"><text/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deletePayGrade?payGradeId=${payGradeId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditPayGrade" type="single" target="updatePayGrade" title="" + <form name="AddPayGrade" type="single" target="createPayGrade" title="" header-row-style="header-row" default-table-style="basic-table"> - <actions> - <entity-one entity-name="PayGrade" value-name="payGrade" /> - </actions> - <alt-target use-when="payGrade==null" target="createPayGrade"/> - <auto-fields-service service-name="updatePayGrade" map-name="payGrade"/> - <field use-when="payGrade!=null" name="payGradeId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field name="payGradeId" use-when="payGrade==null"><ignored/></field> - <!-- field name="payGradeId" use-when="payGrade==null&payGradeId!=null" tooltip="${uiLabelMap.CommonCannotBeFound}:[${payGradeId}]"><text size="20" maxlength="20"/></field>--> - <field name="submitButton" use-when="payGrade==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="payGrade!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <auto-fields-service service-name="createPayGrade"/> + <field name="payGradeId"><ignored/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListSalarySteps" type="list" title="" target="updateSalaryStep" paginate-target="findSalarySteps" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -315,62 +313,79 @@ </actions> <auto-fields-service service-name="updateSalaryStep"/> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResSalaryStepSeqId}"><display/></field> - <field name="payGradeId" title="${uiLabelMap.HumanResPayGradeID}"><display/></field> + <field name="payGradeId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditSalaryStep" type="single" target="createSalaryStep" title="" + <form name="AddSalaryStep" type="single" target="createSalaryStep" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSalaryStep"/> <field name="salaryStepSeqId"><ignored/></field> <field name="payGradeId"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListTerminationReasons" type="list" title="" paginate-target="findTerminationReasons" + <form name="ListTerminationReasons" type="list" title="" target="updateTerminationReason" paginate-target="FindTerminationReason" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <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}" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${terminationReasonId}" target="EditTerminationReason?terminationReasonId=${terminationReasonId}"/> - </field> + <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field> + <field name="description"><text/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteTerminationReason?terminationReasonId=${terminationReasonId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditTerminationReason" type="single" target="updateTerminationReason" title="" default-map-name = "terminationReason" + <form name="AddTerminationReason" type="single" target="createTerminationReason" title="" default-map-name = "terminationReason" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="terminationReason==null" target="createTerminationReason"/> <auto-fields-service service-name="createTerminationReason"/> - <field use-when="terminationReason!=null" name="terminationReasonId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="terminationReason==null" name="terminationReasonId"><ignored/></field> - <field use-when="terminationReason==null&&terminationReasonId!=null" name="terminationReasonId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${terminationReasonId}]"><text size="20" maxlength="20"/></field> - <field name="submitButton" use-when="terminationReason==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="terminationReason!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="terminationReasonId"><ignored/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListUnemploymentClaims" type="list" title="" paginate-target="findUnemploymentClaims" + <form name="ListUnemploymentClaims" type="list" title="" target="updateUnemploymentClaim" paginate-target="FindUnemploymentClaim" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="UnemploymentClaim"><order-by field-name="unemploymentClaimId"/></entity-condition> </actions> - <auto-fields-service default-field-type="display" service-name="updateUnemploymentClaim"/> - <field name="unemploymentClaimId" widget-style="buttontext"> - <hyperlink also-hidden="false" description="${unemploymentClaimId}" target="EditUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}"/> + <auto-fields-service service-name="updateUnemploymentClaim"/> + <field name="unemploymentClaimId"><display/></field> + <field name="partyIdFrom"><display/></field> + <field name="partyIdTo"><display/></field> + <field name="description"><text size="12"/></field> + <field name="statusId"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"> + <entity-constraint name="statusTypeId" operator="equals" value="EMPL_POSITION_STATUS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="roleTypeIdFrom"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="roleTypeIdTo"> + <drop-down allow-empty="false"> + <entity-options description="${description}" key-field-name="roleTypeId" entity-name="RoleType"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> </field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}" description="${uiLabelMap.CommonDelete}"/> </field> </form> - <form name="EditUnemploymentClaim" type="single" target="updateUnemploymentClaim" title="${uiLableMap.HumanResEditUnemploymentClaim}" default-map-name="unemploymentClaim" + <form name="AddUnemploymentClaim" type="single" target="createUnemploymentClaim" title="" default-map-name="unemploymentClaim" header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="unemploymentClaim==null" target="createUnemploymentClaim"/> <auto-fields-service service-name="createUnemploymentClaim"/> - <field use-when="unemploymentClaim!=null" name="unemploymentClaimId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="unemploymentClaim==null" name="unemploymentClaimId"><ignored/></field> - <field use-when="unemploymentClaim==null&&unemploymentClaimId!=null" name="unemploymentClaimId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${unemploymentClaimId}]"><text size="20" maxlength="20"/></field> + <field name="unemploymentClaimId"><ignored/></field> <field name="statusId"> <drop-down allow-empty="false"> <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"> @@ -393,10 +408,9 @@ </entity-options> </drop-down> </field> - <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}" use-when="unemploymentClaim==null" ><lookup target-form-name="LookupPartyName"/></field> - <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}" use-when="unemploymentClaim==null" ><lookup target-form-name="LookupPartyName"/></field> - <field name="submitButton" use-when="unemploymentClaim==null" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="submitButton" use-when="unemploymentClaim!=null" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="partyIdFrom" title="${uiLabelMap.HumanResPartyIdFrom}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdTo" title="${uiLabelMap.HumanResPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="CreateEmployee" type="single" target="createEmployee" header-row-style="header-row" default-table-style="basic-table"> @@ -476,4 +490,9 @@ <field name="otherEmail" title="${uiLabelMap.PartyOtherEmailAddress}"><text size="60" maxlength="250"/></field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> + <form name="FindEmploymentApps" type="single" target="FindEmploymentApp" header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="EmploymentApp" default-field-type="find"/> + <field name="noConditionFind"><hidden value="Y"/></field> + <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |