cockpit/js/instance.js in cpee-1.3.177 vs cockpit/js/instance.js in cpee-1.3.178

@@ -22,10 +22,12 @@
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'dataelements' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'attributes' + '&' +
+               'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
@@ -40,21 +42,23 @@
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'dataelements' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'endpoints' + '&' +
                'events' + '=' + 'change' + '&' +
+               'topic'  + '=' + 'attributes' + '&' +
+               'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
                'topic'  + '=' + 'handlerwrapper' + '&' +
                'events' + '=' + 'result' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
 $(document).ready(function() {// {{{
   $("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
   $("button[name=base]").click(function(){ create_instance(null); });
-  $("button[name=instance]").click(function(){ ui_tab_click("#tabinstance"); monitor_instance(false); });
+  $("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false); });
   $("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),load_testset); });
   $("button[name=loadtestsetfile]").click(load_testsetfile);
   $("button[name=loadmodelfile]").click(load_modelfile);
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
   $("button[name=savetestset]").click(function(){ save_testset(); });
@@ -69,23 +73,27 @@
     success: function(res){
       $('testset',res).each(function(){
         var ts = $(this).text();
         $('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
       });
-      var q = $.parseQuery();
+      var q = $.parseQuerySimple();
       if (q.monitor && q.load) {
         $("input[name=instance-url]").val(q.monitor);
-        $("select[name=testset-names]").val(q.load)
-        ui_tab_click("#tabexecution");
+        $("#predefinedtestsets div.menuitem").each(function(k,v){
+          if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
+        });
+        ui_activate_tab("#tabexecution");
         monitor_instance(true);
       } else if (q.load) {
-        $("select[name=testset-names]").val(q.load)
-        ui_tab_click("#tabexecution");
+        $("#predefinedtestsets div.menuitem").each(function(k,v){
+          if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
+        });
+        ui_activate_tab("#tabexecution");
         create_instance(q.load);
       } else if (q.monitor) {
         $("input[name=instance-url]").val(q.monitor);
-        ui_tab_click("#tabexecution");
+        ui_activate_tab("#tabexecution");
         // ui_toggle_vis_tab($("#instance td.switch"));
         monitor_instance(false);
       }  
     }
   });
@@ -214,10 +222,14 @@
                   monitor_instance_dsl();
                   break;
                 case 'endpoints':
                   monitor_instance_endpoints();
                   break;
+                case 'attributes':
+                  monitor_instance_attributes();
+                  monitor_instance_transformation();
+                  break;
                 case 'state':
                   monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
                   break;
                 case 'position':
                   monitor_instance_pos_change($('event > notification',data).text());
@@ -244,17 +256,18 @@
         }
       });
 
       monitor_instance_dataelements();
       monitor_instance_endpoints();
+      monitor_instance_attributes();
       monitor_instance_transformation();
       monitor_instance_dsl();
       monitor_instance_state();
     },
     error: function(a,b,c) {
       alert("This ain't no CPEE instance");
-      ui_tab_click("#tabnew");
+      ui_activate_tab("#tabnew");
     }
   });      
 }// }}}
 
 function monitor_instance_dataelements() {// {{{
@@ -312,10 +325,39 @@
       }  
     }
   });
 }// }}}
 
+function monitor_instance_attributes() {// {{{
+  var url = $("#current-instance").text();
+  $.ajax({
+    type: "GET", 
+    url: url + "/properties/values/attributes/",
+    success: function(res){
+      var values = $("value > *",res);
+      var temp = {}
+      values.each(function(){
+        temp[this.nodeName] = $(this).text();
+      });
+      var temp_xml = serialize_hash(temp);
+
+      if (temp_xml != save['attributes']) {
+        save['attributes'] = temp_xml;
+        var ctv = $("#dat_attributes");
+        ctv.empty();
+        $.each(temp,function(a,b){
+          var node = $("#dat_template_pair tr").clone(true);
+          $('.pair_name',node).val(a);
+          $('.pair_value',node).val(b);
+          ctv.append(node);
+        });
+        ctv.append(temp);
+      }  
+    }
+  });
+}// }}}
+
 function monitor_instance_dsl() {// {{{
   var url = $("#current-instance").text();
   $.ajax({
     type: "GET",
     dataType: "text",
@@ -652,10 +694,9 @@
   });
  }// }}}
 
 function load_testsetfile_after() { //{{{
   if (running) return;
-  console.log('rrrr');
   running = true;
   if (typeof window.FileReader !== 'function') {
     alert('FileReader not yet supportet');
     return;
   }