[Openautomation-svn] SF.net SVN: openautomation:[682] CometVisu/trunk/visu/edit

[<ma...@us...>]

Revision: 682
          http://openautomation.svn.sourceforge.net/openautomation/?rev=682&view=rev
Author:   makki1
Date:     2012-02-05 16:00:07 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
CV-Editor: Dropdown-list for RRD in diagram-widgets

Modified Paths:
--------------
    CometVisu/trunk/visu/edit/cometeditor.js
    CometVisu/trunk/visu/edit/get_widget_diagram.php

Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js	2012-02-05 10:53:34 UTC (rev 681)
+++ CometVisu/trunk/visu/edit/cometeditor.js	2012-02-05 16:00:07 UTC (rev 682)
@@ -214,6 +214,17 @@
                         }
 
                         break;
+                    case "string": //FIXME: for filling in RRD-name, better would be change attribute e.type=rrd?
+                        if (index == "rrd") {
+                            $input.append($("<select id=\"add_rrd\" />"));
+                            $input.find("select:first").append(Editor.getRRDObject());
+                            if (typeof values._attributes != "undefined"
+                                && typeof values._attributes[index] != "undefined") {
+                                $input.find("option[value='" + values._attributes[index] + "']").attr("selected", "selected");
+                            }
+                            //FIXME: provide text-input if RRDs failed to get fetched
+                            break;
+                        } //else fall through
                     default:
                         $input.append($("<input type=\"text\" id=\"add_" +  index + "\" />"));
 
@@ -627,6 +638,20 @@
         return Editor.cache.cachedDPTObject;
     }
 
+    Editor.getRRDObject = function() {
+        if (typeof Editor.cache.cachedRRDObject == "object") {
+            return Editor.cache.cachedRRDObject.clone();
+        }
+        var element = $("<select />");
+        $.each(Editor.cache.rrdCache, function(file, rrdEntry) {
+            file = file.substring(0,file.lastIndexOf("."));
+            element.append($("<option />").attr("value", file)
+                    .html("" + rrdEntry.name + ": " + file + ".rrd (" + rrdEntry.address + ")") 
+                    );
+        });
+        Editor.cache.cachedRRDObject = element.children();
+        return Editor.cache.cachedRRDObject;
+    }
 };
 
 var CometEditorHTMLLayer = function() {

Modified: CometVisu/trunk/visu/edit/get_widget_diagram.php
===================================================================
--- CometVisu/trunk/visu/edit/get_widget_diagram.php	2012-02-05 10:53:34 UTC (rev 681)
+++ CometVisu/trunk/visu/edit/get_widget_diagram.php	2012-02-05 16:00:07 UTC (rev 682)
@@ -21,7 +21,7 @@
     $arrRRDParts = explode("_", $filebase, 2);
     $arrRRDtype = explode(".", $arrRRDParts[1], 2);
     $arrAdresses[$filebase] = array(
-                                        "adddress" => $arrOW[$arrRRDParts[0]]['eib_ga_'.$arrRRDtype[0]],
+                                        "address" => $arrOW[$arrRRDParts[0]]['eib_ga_'.$arrRRDtype[0]],
                                         "name"    => utf8_encode($arrOW[$arrRRDParts[0]]['name']),
                                         "dpt"     => $arrGA[$arrOW[$arrRRDParts[0]]['eib_ga_'.$arrRRDtype[0]]]['DPTSubId']
                                         );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.