openautomation-svn

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

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

Revision: 485
          http://openautomation.svn.sourceforge.net/openautomation/?rev=485&view=rev
Author:   mayerch
Date:     2011-10-31 13:01:06 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Freature request ID: 3113716 "Addresses should be shown"

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

Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js	2011-10-31 12:37:33 UTC (rev 484)
+++ CometVisu/trunk/visu/edit/cometeditor.js	2011-10-31 13:01:06 UTC (rev 485)
@@ -553,7 +553,7 @@
                     element.find("optgroup:last")
                         .append($("<option />").attr("value", address.address)
                                     .addClass("dpt_DPT:" + address.dpt)
-                                    .html(address.name)
+                                    .html(address.address + ': ' + address.name)
                                     )
                 });
             });

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

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

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

Revision: 486
          http://openautomation.svn.sourceforge.net/openautomation/?rev=486&view=rev
Author:   mayerch
Date:     2011-10-31 13:33:40 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Fix for bug tracker ID: 3427309 "GA list unsorted in editor (transform_knx, get_adreesses)"

At least for the GA addresses. The KNX-Transforms are already sortet on my system...

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

Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js	2011-10-31 13:01:06 UTC (rev 485)
+++ CometVisu/trunk/visu/edit/cometeditor.js	2011-10-31 13:33:40 UTC (rev 486)
@@ -11,6 +11,21 @@
             dataType: "json",
             success: function(data) {
                 Editor.cache[variable] = data;
+                switch( variable )
+                {
+                  case 'addresses':
+                    // Sort list of addresses in each HG/MG
+                    for( var hg in Editor.cache.addresses )
+                    {
+                      for( var mg in Editor.cache.addresses[hg] )
+                      {
+                        Editor.cache.addresses[hg][mg].sort( function(a,b){
+                          return a.address.split('/')[2] - b.address.split('/')[2];
+                        });
+                      }
+                    }
+                    break;
+                }
             },
             error: function(xhr, textStatus, e) {
                 Editor.cache[variable] = false;

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