OFBiz › OFBiz - Commits

svn commit: r656233 [2/2] - in /ofbiz/trunk/applications/humanres: config/HumanResUiLabels.xml data/HumanResTypeData.xml webapp/humanres/WEB-INF/controller.xml widget/EmplPositionScreens.xml widget/Menus.xml widget/forms/EmplPositionForms.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
ashish-18
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r656233 [2/2] - in /ofbiz/trunk/applications/humanres: config/HumanResUiLabels.xml data/HumanResTypeData.xml webapp/humanres/WEB-INF/controller.xml widget/EmplPositionScreens.xml widget/Menus.xml widget/forms/EmplPositionForms.xml

ashish-18
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=656233&r1=656232&r2=656233&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Wed May 14 03:53:56 2008
@@ -1,92 +1,92 @@
-<?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.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">    
-    <menu name="HumanResAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.HumanResManagerApplication}"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
-        <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
-        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="findEmplPositions"/></menu-item>
-        <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="findEmployments"/></menu-item>
-        <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="findPayGrades"/></menu-item>
-        <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="findTerminationReasons"/></menu-item>
-        <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="findUnemploymentClaims"/></menu-item>
-        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="findEmploymentApps"/></menu-item>
-        <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="ListPartySkills"/></menu-item>
-        <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
-        <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
-        <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="FindResponsibilityType"/></menu-item>
-        <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
-            <condition><not><if-empty field-name="userLogin"/></not></condition>
-            <link target="logout"/>
-        </menu-item>
-        <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
-            <condition><if-empty field-name="userLogin"/></condition>
-            <link target="${checkLoginUrl}"/>
-        </menu-item>
-    </menu>
+<?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.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">    
+    <menu name="HumanResAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.HumanResManagerApplication}"
+        default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
+        <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
+        <menu-item name="EmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="FindEmplPosition"/></menu-item>
+        <menu-item name="Employment" title="${uiLabelMap.HumanResEmployment}"><link target="findEmployments"/></menu-item>
+        <menu-item name="PayGrade" title="${uiLabelMap.HumanResPayGrade}"><link target="findPayGrades"/></menu-item>
+        <menu-item name="TerminationReason" title="${uiLabelMap.HumanResTerminationReason}"><link target="findTerminationReasons"/></menu-item>
+        <menu-item name="UnemploymentClaim" title="${uiLabelMap.HumanResUnemploymentClaim}"><link target="findUnemploymentClaims"/></menu-item>
+        <menu-item name="EmploymentApp" title="${uiLabelMap.HumanResEmploymentApp}"><link target="findEmploymentApps"/></menu-item>
+        <menu-item name="PartySkills" title="${uiLabelMap.HumanResListPartySkill}"><link target="ListPartySkills"/></menu-item>
+        <menu-item name="SkillType" title="${uiLabelMap.HumanResSkillType}"><link target="findSkillTypes"/></menu-item>
+        <menu-item name="Employee" title="${uiLabelMap.HumanResEmployee}"><link target="findEmployees"/></menu-item>
+        <menu-item name="ResponsibilityType" title="${uiLabelMap.HumanResResponsibilityType}"><link target="FindResponsibilityType"/></menu-item>
+        <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="col-right" selected-style="selected">
+            <condition><not><if-empty field-name="userLogin"/></not></condition>
+            <link target="logout"/>
+        </menu-item>
+        <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="col-right" selected-style="selected">
+            <condition><if-empty field-name="userLogin"/></condition>
+            <link target="${checkLoginUrl}"/>
+        </menu-item>
+    </menu>
     <menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}">
-            <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
-        </menu-item>
-        <menu-item name="EditPerfReview" title="${uiLabelMap.HumanResEditPartyReview}">
-            <!-- <link target="EditPerfReviews?roleTypeIdTo=${roleTypeIdTo}&amp;partyIdTo=${partyIdTo}"/>-->
-            <link target="EditPerfReviews?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
-        </menu-item>
-        <menu-item name="EditPayrollPreference" title="${uiLabelMap.HumanResEditPayrollPreference}">
-            <link target="EditPayrollPreferences?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
-        </menu-item>        
-        <menu-item name="EditPayHistory" title="${uiLabelMap.HumanResEditPayHistory}">
-            <link target="ListPayHistories?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;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">
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}">
+            <link target="EditPartyBenefits?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
+        </menu-item>
+        <menu-item name="EditPerfReview" title="${uiLabelMap.HumanResEditPartyReview}">
+            <!-- <link target="EditPerfReviews?roleTypeIdTo=${roleTypeIdTo}&amp;partyIdTo=${partyIdTo}"/>-->
+            <link target="EditPerfReviews?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
+        </menu-item>
+        <menu-item name="EditPayrollPreference" title="${uiLabelMap.HumanResEditPayrollPreference}">
+            <link target="EditPayrollPreferences?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}"/>
+        </menu-item>        
+        <menu-item name="EditPayHistory" title="${uiLabelMap.HumanResEditPayHistory}">
+            <link target="ListPayHistories?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;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-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}"/>
-        </menu-item>
-        <menu-item name="EditEmplPositionResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}">
-            <link target="EditEmplPositionResponsibilities?emplPositionId=${emplPositionId}"/>
-        </menu-item>
-        <menu-item name="EditEmplPositionReportingStructs" title="${uiLabelMap.HumanResEmplPositionReportingStruct}">
-            <link target="EditEmplPositionReportingStructs?emplPositionId=${emplPositionId}"/>
-        </menu-item>
-    </menu>
+        <menu-item name="EditEmplPositionFulfillments" title="${uiLabelMap.HumanResPositionFulfillments}">
+            <link target="EditEmplPositionFulfillments?emplPositionId=${emplPositionId}"/>
+        </menu-item>
+        <menu-item name="EditEmplPositionResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}">
+            <link target="EditEmplPositionResponsibilities?emplPositionId=${emplPositionId}"/>
+        </menu-item>
+        <menu-item name="EditEmplPositionReportingStructs" title="${uiLabelMap.HumanResEmplPositionReportingStruct}">
+            <link target="EditEmplPositionReportingStructs?emplPositionId=${emplPositionId}"/>
+        </menu-item>
+    </menu>
     <menu name="PartyBar" default-menu-item-name="EditPerfReviewItems" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}">
-            <link target="EditPerfReviewItems?perfReviewId=${perfReviewId}"/>
-        </menu-item>
-        <menu-item name="EditPartySkill" title="${uiLabelMap.HumanResListPartySkill}">
-            <link target="EditPartySkills?employeePartyId=${employeePartyId}"/>
-        </menu-item>
-        <menu-item name="EditPartyQual" title="${uiLabelMap.HumanResListPartyQual}">
-            <link target="EditPartyQuals?employeePartyId=${employeePartyId}"/>
-        </menu-item>
-    </menu>
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}">
+            <link target="EditPerfReviewItems?perfReviewId=${perfReviewId}"/>
+        </menu-item>
+        <menu-item name="EditPartySkill" title="${uiLabelMap.HumanResListPartySkill}">
+            <link target="EditPartySkills?employeePartyId=${employeePartyId}"/>
+        </menu-item>
+        <menu-item name="EditPartyQual" title="${uiLabelMap.HumanResListPartyQual}">
+            <link target="EditPartyQuals?employeePartyId=${employeePartyId}"/>
+        </menu-item>
+    </menu>
     <menu name="SalaryBar" default-menu-item-name="EditSalaryStep" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}">
-            <link target="EditSalarySteps?payGradeId=${payGradeId}"/>
-        </menu-item>        
-    </menu>
-    <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"/>
+        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}">
+            <link target="EditSalarySteps?payGradeId=${payGradeId}"/>
+        </menu-item>        
+    </menu>
+    <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"/>
 </menus>
\ No newline at end of file

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=656233&r1=656232&r2=656233&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Wed May 14 03:53:56 2008
@@ -20,12 +20,16 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListEmplPositions" type="list" title="" paginate-target="findEmplPositions"
+    <form name="ListEmplPositions" type="list" separate-columns="true" default-entity-name="EmplPosition" list-name="listIt" paginate-target="FindEmplPosition" paginate="true"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-condition entity-name="EmplPosition"><order-by field-name="emplPositionId"/></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="EmplPosition"/>
+                <field-map field-name="orderBy" value="emplPositionId"/>
+            </service>
         </actions>
-        <auto-fields-service service-name="updateEmplPosition" default-field-type="display"/>        
+        <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}"/>
         </field>
@@ -34,9 +38,6 @@
                 <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
             </display-entity>
         </field>
-        <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPosition?emplPositionId=${emplPositionId}&amp;partyId=${partyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
-        </field>
     </form>            
     <form name="EditEmplPosition" type="single" target="updateEmplPosition" title="" default-map-name="emplPosition"
         header-row-style="header-row" default-table-style="basic-table">
@@ -89,7 +90,7 @@
                 <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" link-style="smallSubmit" target-type="inter-app" description="${partyId}"/>
             </display-entity>
         </field>
-        <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}"><display /></field>
+        <field name="emplPositionId"><hidden/></field>
         <field name="fromDate" title="${uiLabelMap.CommonDate}"><display/></field>        
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
@@ -167,7 +168,7 @@
             <entity-condition entity-name="EmplPositionResponsibility"><order-by field-name="emplPositionId"/></entity-condition>
         </actions>
         <auto-fields-service service-name="updateEmplPositionResponsibility"/>        
-        <field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}"><display /></field>        
+        <field name="emplPositionId"><hidden/></field>        
         <field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display /></field>
         <field name="fromDate"><display /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
@@ -221,4 +222,33 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>                          
+    <form name="FindEmplPositions" type="single" target="FindEmplPosition" header-row-style="header-row" default-table-style="basic-table">
+        <auto-fields-entity entity-name="EmplPosition" default-field-type="find"/>
+        <field name="noConditionFind"><hidden value="Y"/></field>
+        <field name="salaryFlag">
+            <drop-down allow-empty="false" current="selected">
+                <option key="Y" description="Y"/>
+                <option key="N" description="N"/>
+            </drop-down>
+        </field>
+        <field name="exemptFlag">
+            <drop-down allow-empty="false" current="selected">
+                <option key="Y" description="Y"/>
+                <option key="N" description="N"/>
+            </drop-down>
+        </field>
+        <field name="fulltimeFlag">
+            <drop-down allow-empty="false" current="selected">
+                <option key="Y" description="Y"/>
+                <option key="N" description="N"/>
+            </drop-down>
+        </field>
+        <field name="temporaryFlag">
+            <drop-down allow-empty="false" current="selected">
+                <option key="Y" description="Y"/>
+                <option key="N" description="N"/>
+            </drop-down>
+        </field>
+        <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
 </forms>
\ No newline at end of file


Free forum by Nabble Edit this page