diff gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp @ 164:5570d9b3282f

Implemented a better GUI-Structure for displaying the Statisticdata. issue83 gnv/trunk@327 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Thu, 12 Nov 2009 10:22:30 +0000
parents 0f4362d75e9e
children 9602f4bffc07
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp	Wed Nov 11 16:24:02 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_statistics_inc.jsp	Thu Nov 12 10:22:30 2009 +0000
@@ -4,28 +4,32 @@
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%>
 <%@page import="java.util.Collection"%>
 <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticValue"%>
+<%@page import="java.util.Iterator"%>
+<%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactStatisticsSet"%><div id="statistics">
 <%
     SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request);
-    Collection<ArtifactStatisticValue> statistics = sm.getStatistics();
+    Collection<ArtifactStatisticsSet> statistics = sm.getStatistics();
 %>
-
-
-<%@page import="java.util.Iterator"%><div id="statistics">
   <fieldset>
       <legend class="expandableFieldset">
             <bean:message key="gnviewer.statistics.header.title"/>
         </legend>
+        <%if (statistics != null){
+            Iterator<ArtifactStatisticsSet> it = statistics.iterator();
+            while (it.hasNext()){
+                ArtifactStatisticsSet set = it.next(); 
+        %>
         <div id="statisticValues">
-        <%if (statistics != null){%>
+             <h1><%=set.getName()%></h1>
             <table id="statistics">
               <tr>
                   <th><bean:message key="gnviewer.statistics.table.header.param"/></th>
                   <th><bean:message key="gnviewer.statistics.table.header.value"/></th>
               </tr>
-        <% Iterator<ArtifactStatisticValue> it = statistics.iterator();
-            while (it.hasNext()){
-                ArtifactStatisticValue asv = it.next(); 
-        %>
+              <% Iterator<ArtifactStatisticValue> sit = set.getStatisticValues().iterator();
+                 while (sit.hasNext()){
+                     ArtifactStatisticValue asv = sit.next(); 
+              %>
               <tr>
                   <td><bean-el:message key="<%=asv.getKey()%>"/></td>
                   <td><%=asv.getValue()%></td>
@@ -34,5 +38,6 @@
             </table>
         <%} %>
         </div>
+        <%}%>
     </fieldset>
 </div>
\ No newline at end of file

http://dive4elements.wald.intevation.org