From abf98b4d9d885ff68d2dcf53a85668738b8c8e25 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 18 Sep 2009 14:56:57 +0200
Subject: [PATCH]  ItEr26S10CUCreacionProxectoPlanificacionItEr25S11:
 Configured jfreechart maven dependencies again nexus.naval.igalia.com

   * It was included a pie chart under ResourceLoad graph
---
 .../web/ganttz/zul/resourcesLoadLayout.zul    | 56 ++++++++++++++++---
 navalplanner-webapp/pom.xml                   |  8 +++
 pom.xml                                       | 16 ++++++
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
index 1b3b19a87..90f2da42f 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
@@ -1,14 +1,54 @@
 <zk xmlns:n="http://www.zkoss.org/2005/zk/native">
 
-    <borderlayout height="300px" width="1600px" sclass="resourcesload">
-        <west size="200px" flex="true" collapsible="true" splittable="true" autoscroll="true">
-            <div id="insertionPointLeftPanel"></div>
-        </west>
+    <borderlayout height="600px" width="auto">
+        <north height="50%" collapsible="true" splittable="true">
+            <borderlayout sclass="resourcesload">
+                <west size="200px" flex="true" collapsible="true"
+                    splittable="true" autoscroll="true">
+                    <div id="insertionPointLeftPanel"></div>
+                </west>
 
-        <center autoscroll="true">
-            <div id="insertionPointRightPanel"></div>
+                <center autoscroll="true">
+                    <div id="insertionPointRightPanel"></div>
+                </center>
+            </borderlayout>
+        </north>
+        <center>
+            <borderlayout>
+                <west size="200px" flex="true" collapsible="true"
+                    splittable="true" autoscroll="true">
+
+                    <label value="ResourcesLoadGraph details"
+                        width="150px" tooltip="any" />
+                </west>
+
+                <center autoscroll="true">
+
+                    <vbox>
+                        <zscript>
+                            PieModel piemodel = new SimplePieModel();
+                            piemodel.setValue("Resources assigned over 100%", new Double(12.5));
+                            piemodel.setValue("Resources assigned under 50%", new Double(50.2));
+                            piemodel.setValue("Resources assigned at 100%", new Double(20.5));
+                            piemodel.setValue("Resources assigned between 50% and 100%", new Double(15.5));
+                        </zscript>
+                        <chart id="piechart" title="Pie Chart"
+                            width="500" height="250" type="pie" threeD="false"
+                            fgAlpha="128" onClick="drilldown()" />
+                        <zscript>
+                            piechart.setModel(piemodel);
+                    </zscript>
+                    </vbox>
+
+                </center>
+            </borderlayout>
         </center>
-
     </borderlayout>
+    <popup id="any" width="300px">
+        <vbox>
+            This is the resources load assignment page. To set this
+            element ...
+        </vbox>
+    </popup>
 
-</zk>
\ No newline at end of file
+</zk>
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 93c42f3ea..55afa9d86 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -60,6 +60,14 @@
             <groupId>org.beanshell</groupId>
             <artifactId>bsh</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jcommon</artifactId>
+        </dependency>
         <!-- Apache Commons Fileupload (required by ZK) -->
         <dependency>
             <groupId>commons-fileupload</groupId>
diff --git a/pom.xml b/pom.xml
index 5db0b0c8c..a8d5f84a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,10 @@
             <id>gettext-commons-site</id>
             <url>http://gettext-commons.googlecode.com/svn/maven-repository</url>
         </repository>
+	<repository>
+		 <id>thirdparty</id>
+		 <url>http://nexus.naval.igalia.com/content/repositories/thirdparty</url>
+	 </repository>
     </repositories>
 
      <pluginRepositories>
@@ -179,6 +183,7 @@
             <name>Codehaus Plugin Repository</name>
             <url>http://repository.codehaus.org</url>
         </pluginRepository>
+
         -->
      </pluginRepositories>
 
@@ -322,6 +327,17 @@
                 <artifactId>jgrapht-jdk1.5</artifactId>
                 <version>0.7.3</version>
             </dependency>
+            <!-- Jfreechart  -->
+            <dependency>
+                <groupId>jfree</groupId>
+                <artifactId>jfreechart</artifactId>
+                <version>1.0.13</version>
+            </dependency>
+            <dependency>
+                <groupId>jfree</groupId>
+                <artifactId>jcommon</artifactId>
+                <version>1.0.16</version>
+            </dependency>
             <!-- Joda Time -->
             <dependency>
                 <groupId>joda-time</groupId>