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

[hansbak-2]

Author: hansbak
Date: Thu Aug 18 06:39:04 2011
New Revision: 1159056

URL: http://svn.apache.org/viewvc?rev=1159056&view=rev
Log:
replace the HR company tree with a jquery version

Modified:
    ofbiz/trunk/applications/humanres/build.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
    ofbiz/trunk/applications/humanres/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/humanres/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/build.xml?rev=1159056&r1=1159055&r2=1159056&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/build.xml (original)
+++ ofbiz/trunk/applications/humanres/build.xml Thu Aug 18 06:39:04 2011
@@ -32,6 +32,7 @@ under the License.
     <path id="local.class.path">
         <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
         <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
         <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/entity/lib" includes="*.jar"/>
         <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
@@ -41,15 +42,12 @@ under the License.
         <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
         <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
         <fileset dir="../../applications/securityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../product/build/lib" includes="*.jar"/>
      </path>
 
     <!-- ================================================================== -->
-    <!-- Compilation of the source files                                                                                                                         -->
-    <!-- ================================================================== -->
-
-    <target name="classes" depends="prepare"/>
-
-    <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 

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=1159056&r1=1159055&r2=1159056&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Thu Aug 18 06:39:04 2011
@@ -1054,6 +1054,11 @@ under the License.
         <response name="success" type="view" value="EditEmplLeaveStatus"/>
         <response name="error" type="view" value="EditEmplLeaveStatus"/>
     </request-map>
+    <request-map uri="getHRChild">
+        <security auth="false" https="true"/>
+        <event type="java" path="org.ofbiz.humanres.HumanResServices" invoke="getChildHRCategoryTree"/>
+        <response name="success" type="none"/>
+    </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>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=1159056&r1=1159055&r2=1159056&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Aug 18 06:39:04 2011
@@ -37,6 +37,8 @@ under the License.
                 <set field="activeApp" value="humanres" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/partymgr/static/partymgr.js" global="true"/>
                 <set field="layoutSettings.styleSheets[]" value="/partymgr/static/partymgr.css" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
                 <set field="applicationMenuName" value="HumanResAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://humanres/widget/HumanresMenus.xml" global="true"/>
                 <set field="applicationTitle" value="${uiLabelMap.HumanResManagerApplication}" global="true"/>
@@ -69,12 +71,13 @@ under the License.
         <section>
             <actions>
                 <set field="partyId" from-field="defaultOrganizationPartyId"/>
+                <script location="component://humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy"></script>
             </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.FormFieldTitle_company}">
                     <section>
                         <widgets>
-                            <include-tree name="OrgTree" location="component://humanres/widget/PartyTrees.xml"/>
+                            <platform-specific><html><html-template location="component://humanres/webapp/humanres/humanres/category/CategoryTree.ftl"/></html></platform-specific>
                         </widgets>
                     </section>
                 </screenlet>