Updated grapgh generation

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19434 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/generic/statistics/class_statistics.inc b/gosa-core/plugins/generic/statistics/class_statistics.inc
index 7e1760ee21d59a0cf718e1cec39e55319532e9c5..34c6a7fa88da07df2d656022ad9bcb5b201dd0a9 100644 (file)
--- a/gosa-core/plugins/generic/statistics/class_statistics.inc
+++ b/gosa-core/plugins/generic/statistics/class_statistics.inc
@@ -247,7 +247,8 @@ class statistics extends plugin
 
 
         /* Prepare actions-per-interval array.
-         */    
+         */   
+        $gData['actionsPerInterval'] = array(); 
         foreach($res['actionsPerInterval'] as $category => $data){
             if(empty($category)) continue;
             foreach($data as $dateStr => $count){

diff --git a/gosa-core/plugins/generic/statistics/statistics.tpl b/gosa-core/plugins/generic/statistics/statistics.tpl
index 79013406145d3d22f5b8a4ce88cc454117e831e9..0e417a755f2131e3dbed6f25803702cb7c23dbde 100644 (file)
--- a/gosa-core/plugins/generic/statistics/statistics.tpl
+++ b/gosa-core/plugins/generic/statistics/statistics.tpl
@@ -53,7 +53,6 @@
     </table>
     <hr>
 
-    
     <table>
         <tr>
             <td>
@@ -69,19 +68,17 @@
         </tr>
     </table>
 
-    <hr>
-    <table>
-        <tr>
-            <td>
-                {if isset($graphIDs.2) && $graphIDs.2}
+    {if isset($graphIDs.2) && $graphIDs.2}
+        <hr>
+        <table>
+            <tr>
+                <td>
                     <img src='plugins/statistics/getGraph.php?id={$graphIDs.2}'>
                     <input type='hidden' name='graphPosted_2' value='1'>
-                {/if}
-            </td>
-        </tr>
-        <tr>
-            <td>
-                {if isset($graphIDs.2) && $graphIDs.2}
+                </td>
+            </tr>
+            <tr>
+                <td>
                     {foreach from=$seriesListPerGraph.2 key=key item=item}
                         <span style='padding-right:20px'>
                         <input type='checkbox' name='addSeries_2_{$key}' value='1'
@@ -89,24 +86,27 @@
                             {if !($key|in_array:$skipSeries.2)} checked {/if}>{$item}
                         </span>
                     {/foreach} 
-                {/if}
-            </td>
-        </tr>
-    </table>
+                </td>
+            </tr>
+        </table>
+    {/if}
 
-    <hr>
 
     {if isset($graphIDs.3) && $graphIDs.3}
         <img src='plugins/statistics/getGraph.php?id={$graphIDs.3}'>
+        <hr>
     {/if}
     {if isset($graphIDs.4) && $graphIDs.4}
         <img src='plugins/statistics/getGraph.php?id={$graphIDs.4}'>
+        <hr>
     {/if}
     {if isset($graphIDs.5) && $graphIDs.5}
         <img src='plugins/statistics/getGraph.php?id={$graphIDs.5}'>
+        <hr>
     {/if}
     {if isset($graphIDs.6) && $graphIDs.6}
         <img src='plugins/statistics/getGraph.php?id={$graphIDs.6}'>
+        <hr>
     {/if}
 
 {/if}