svn commit: r717981 - in /ofbiz/trunk/applications/humanres: webapp/humanres/WEB-INF/controller.xml widget/CommonScreens.xml widget/PartyTrees.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r717981 - in /ofbiz/trunk/applications/humanres: webapp/humanres/WEB-INF/controller.xml widget/CommonScreens.xml widget/PartyTrees.xml

apatel-2
Author: apatel
Date: Sat Nov 15 21:06:12 2008
New Revision: 717981

URL: http://svn.apache.org/viewvc?rev=717981&view=rev
Log:
Adding org chart to main page in HR

Added:
    ofbiz/trunk/applications/humanres/widget/PartyTrees.xml   (with props)
Modified:
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml

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=717981&r1=717980&r2=717981&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Nov 15 21:06:12 2008
@@ -844,7 +844,7 @@
     <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"/>
+    <view-map name="main" type="screen" page="component://humanres/widget/CommonScreens.xml#Main"/>
     
     <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"/>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=717981&r1=717980&r2=717981&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat Nov 15 21:06:12 2008
@@ -46,6 +46,56 @@
             </widgets>
         </section>
     </screen>
+
+    <screen name="Main">
+        <section>
+            <widgets>
+                <decorator-screen name="main-decorator">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <container style="lefthalf">
+                                    <include-screen name="OrgTree"/>
+                                </container>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="OrgTree">
+        <section>
+            <actions>
+                <set field="partyId" value="Company"/>
+            </actions>
+            <widgets>
+                <screenlet title="${uiLabelMap.Company}">
+                    <section>
+                        <widgets>
+                            <include-tree name="OrgTree" location="component://humanres/widget/PartyTrees.xml"/>
+                        </widgets>
+                    </section>
+                </screenlet>
+            </widgets>
+        </section>
+    </screen>    
+    <screen name="PartyGroupTreeLine">
+        <section>
+            <widgets>
+                <label text="${partyAndGroup.groupName}" style="tabletext"/>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="PartyPersonTreeLine">
+        <section>
+            <widgets>
+                <label text="${partyAndPerson.firstName} ${partyAndPerson.lastName}" style="tabletext"/>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="CommonEmplPositionDecorator">
         <section>
             <actions>

Added: ofbiz/trunk/applications/humanres/widget/PartyTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyTrees.xml?rev=717981&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyTrees.xml (added)
+++ ofbiz/trunk/applications/humanres/widget/PartyTrees.xml Sat Nov 15 21:06:12 2008
@@ -0,0 +1,57 @@
+<?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.
+-->
+<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
+
+    <tree name="OrgTree" root-node-name="node-root" entity-name="PartyAndGroup" open-depth="1">
+        <node name="node-root" entity-name="PartyAndGroup" render-style="expand-collapse">
+            <entity-one entity-name="PartyAndGroup" value-name="partyAndGroup"/>
+            <include-screen name="PartyGroupTreeLine" location="component://humanres/widget/CommonScreens.xml"/>
+            <sub-node node-name="internalOrg-list">
+                <entity-condition entity-name="PartyRelationship" filter-by-date="true">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="partyId"/>
+                        <condition-expr field-name="partyRelationshipTypeId" operator="equals" value="GROUP_ROLLUP"/>
+                    </condition-list>
+                </entity-condition>
+            </sub-node>
+        </node>
+        <node name="internalOrg-list" entry-name="partyRelationship" entity-name="PartyRelationship" join-field-name="partyIdTo" render-style="expand-collapse">
+            <entity-one entity-name="PartyAndGroup" value-name="partyAndGroup">
+                <field-map field-name="partyId" env-name="partyRelationship.partyIdTo"/>
+            </entity-one>
+            <include-screen name="PartyGroupTreeLine" location="component://humanres/widget/CommonScreens.xml"/>
+            <sub-node node-name="employee-list">
+                <entity-condition entity-name="Employment" filter-by-date="true">
+                    <condition-list combine="and">
+                        <condition-expr field-name="partyIdFrom" operator="equals" env-name="partyRelationship.partyIdTo"/>
+                        <condition-expr field-name="roleTypeIdTo" operator="equals" value="EMPLOYEE"/>
+                    </condition-list>
+                </entity-condition>
+            </sub-node>
+        </node>
+        <node name="employee-list" entry-name="employment" entity-name="Employment" join-field-name="partyIdTo" render-style="simple">
+            <entity-one entity-name="PartyAndPerson" value-name="partyAndPerson">
+                <field-map field-name="partyId" env-name="employment.partyIdTo"/>
+            </entity-one>
+            <include-screen name="PartyPersonTreeLine" location="component://humanres/widget/CommonScreens.xml"/>
+        </node>
+    </tree>
+</trees>
\ No newline at end of file

Propchange: ofbiz/trunk/applications/humanres/widget/PartyTrees.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/humanres/widget/PartyTrees.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/applications/humanres/widget/PartyTrees.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml