svn commit: r1190181 - in /ofbiz/trunk/applications/humanres: config/HumanResUiLabels.xml webapp/humanres/WEB-INF/controller.xml widget/EmployeeScreens.xml widget/HumanresMenus.xml widget/forms/EmployeeForms.xml

[hansbak-2]

Author: hansbak
Date: Fri Oct 28 07:19:53 2011
New Revision: 1190181

URL: http://svn.apache.org/viewvc?rev=1190181&view=rev
Log:
show payrol history on the HRM employee profile screen

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
    ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1190181&r1=1190180&r2=1190181&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri Oct 28 07:19:53 2011
@@ -2050,6 +2050,9 @@
         <value xml:lang="zh">薪水历史</value>
         <value xml:lang="zh_TW">薪水歷史</value>
     </property>
+    <property key="HumanResPayRollHistory">
+        <value xml:lang="en">PayRoll History</value>
+    </property>
     <property key="HumanResPayRollPreferences">
         <value xml:lang="en">PayRoll Preferences</value>
         <value xml:lang="fr">Préférences de registre du personnel</value>

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=1190181&r1=1190180&r2=1190181&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri Oct 28 07:19:53 2011
@@ -1103,6 +1103,12 @@ under the License.
         <response name="error" type="view-last"/>
     </request-map>
     
+    <!--==============PayRoll History Requests==================-->
+    <request-map uri="PayrollHistory">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="PayrollHistory"/>
+    </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>
@@ -1233,4 +1239,7 @@ under the License.
     <view-map name="FindTrainingApprovals" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#FindTrainingApprovals"/>
     <view-map name="EditTrainingApprovals" type="screen" page="component://humanres/widget/PersonTrainingScreens.xml#EditTrainingApprovals"/>
     <view-map name="LookupTraining" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupTraining"/>
+    
+    <!-- ==================PayRoll History View Map===================== -->
+    <view-map name="PayrollHistory" type="screen" page="component://humanres/widget/EmployeeScreens.xml#PayrollHistory"/>
 </site-conf>

Modified: ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml?rev=1190181&r1=1190180&r2=1190181&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmployeeScreens.xml Fri Oct 28 07:19:53 2011
@@ -297,4 +297,29 @@ under the License.
             </widgets>
         </section>
     </screen>
+    
+    <screen name="PayrollHistory">
+        <section>
+            <actions>
+                <set field="titleProperty" value="HumanResPayRollHistory"/>
+                <set field="tabButtonItem" value="PayrollHistory"/>
+                <set field="partyId" from-field="parameters.partyId"/>
+                <set field="parameters.sortField" from-field="parameters.sortField" default-value="invoiceDate DESC"/>
+                <entity-condition list="payroll" entity-name="InvoiceAndType">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyIdFrom" operator="equals" from-field="partyId"/>
+                        <condition-expr field-name="invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/>
+                    </condition-list>
+                    <order-by field-name="${parameters.sortField}"/>
+                </entity-condition>
+            </actions>
+            <widgets>
+                <decorator-screen name="EmployeeDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="PayrollHistoryList" location="component://humanres/widget/forms/EmployeeForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml?rev=1190181&r1=1190180&r2=1190181&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/HumanresMenus.xml Fri Oct 28 07:19:53 2011
@@ -241,6 +241,11 @@
                 <parameter param-name="partyId"/>
             </link>
         </menu-item>
+        <menu-item name="PayrollHistory" title="${uiLabelMap.HumanResPayRollHistory}">
+            <link target="PayrollHistory">
+                <parameter param-name="partyId"/>
+            </link>
+        </menu-item>
     </menu>
 
     <menu name="EmplPositionTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=1190181&r1=1190180&r2=1190181&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Fri Oct 28 07:19:53 2011
@@ -237,5 +237,12 @@
             <display type="currency" currency="${employmentData.emplPositionRateAmount.rateCurrencyUomId}"/>
         </field>
     </form>
+    <form name="PayrollHistoryList" type="list" list-name="payroll" extends="ListInvoices" extends-resource="component://accounting/widget/InvoiceForms.xml" paginate-target="PayrollHistory">
+        <field name="invoiceId" widget-style="buttontext" sort-field="true">
+            <hyperlink description="${invoiceId}" target="/accounting/control/invoiceOverview" target-type="inter-app">
+                <parameter param-name="invoiceId"/>
+            </hyperlink>
+        </field>
+    </form>
 </forms>