X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fqueryupdater%2Fstatic%2Fjs%2Fqueryupdater.js;h=252d349c434a1e1a3deb6c54c6c50d0abfda2971;hb=ba476841726dc818c0efd3ed25e42955a39fc504;hp=ac7fc0aeccf3e70f473371fa4db69c8037c6553d;hpb=c99f1bd98ff355bd3f63b4929739ea5bd92cd6a3;p=unfold.git

diff --git a/plugins/queryupdater/static/js/queryupdater.js b/plugins/queryupdater/static/js/queryupdater.js
index ac7fc0ae..252d349c 100644
--- a/plugins/queryupdater/static/js/queryupdater.js
+++ b/plugins/queryupdater/static/js/queryupdater.js
@@ -29,10 +29,13 @@
     var QueryUpdater = Plugin.extend({
 
         init: function(options, element) {
-	    this.classname="queryupdater";
+	        this.classname="queryupdater";
             this._super(options, element);
 
             var self = this;
+
+            this.initial = Array();
+
             this.table = this.elmt('table').dataTable({
 // the original querytable layout was
 //                sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t<'row'<'col-xs-5'i><'col-xs-7'p>>",
@@ -70,6 +73,7 @@
 
         do_update: function(e) {
             var self = e.data;
+
             var username = e.data.options.username;
             var urn = data.value;
             // XXX check that the query is not disabled
@@ -99,8 +103,13 @@
                                 });
                         }
                         $('#slamodal').modal('hide');
-                        console.log("Executing raise_event after sending SLA");
-                        // manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+                        self.spin();
+                        console.log("Executing do_update after sending SLA");
+                        // XXX check that the query is not disabled
+                        manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+
+                        // how to stop the spinning after the event? 
+                        // this should be triggered by some on_updatequery_done ?
                     }); 
                 });
 
@@ -112,9 +121,15 @@
                 });
 
             } else {
-                console.log("Executing raise_event");
+                self.spin();
+                console.log("do_update");
+                // XXX check that the query is not disabled
                 manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+
+                // how to stop the spinning after the event? 
+                // this should be triggered by some on_updatequery_done ?
             }
+
         },
 
 	// related buttons are also disabled in the html template
@@ -165,6 +180,7 @@
 
         set_state: function(data)
         {
+            console.log("function set_state");
             var action;
             var msg;
             var button = '';
@@ -257,11 +273,15 @@
 
         on_new_record: function(record)
         {
+            console.log("query_updater on_new_record");
+            console.log(record);
+
             // if (not and update) {
 
                 // initial['resource'], initial['lease'] ?
-                this.initial.push(record.urn);
+                this.initial.push(record);
 
+            //this.set_record_state(record, RECORD_STATE_ATTACHED);
                 // We simply add to the table
             // } else {
                 //                 \ this.initial_resources
@@ -322,7 +342,7 @@
 
         on_query_in_progress: function()
         {
-	    messages.debug("queryupdater.on_query_in_progress");
+	        messages.debug("queryupdater.on_query_in_progress");
             this.spin();
         },
 
@@ -338,12 +358,9 @@
             this.clear();
         },
 
-        on_new_record: function(record)
-        {
-        },
-
         on_query_done: function()
         {
+            console.log("on_query_done");
             this.unspin();
         },
 
@@ -351,12 +368,14 @@
         // NOTE: record_key could be sufficient 
         on_added_record: function(record)
         {
+            console.log("on_added_record = ",record);
             this.set_record_state(record, RECORD_STATE_ADDED);
             // update pending number
         },
 
         on_removed_record: function(record_key)
         {
+            console.log("on_removed_record = ",record_key);
             this.set_record_state(RECORD_STATE_REMOVED);
         },
 
@@ -372,6 +391,8 @@
 
         on_field_state_changed: function(result)
         {
+            console.log("on_field_state_changed");
+            console.log(result);
             messages.debug(result)
             /* this.set_state(result.request, result.key, result.value, result.status); */
             this.set_state(result);
@@ -418,7 +439,7 @@
              if (!change)
                 return;
              // ioi: Refubrished
-             var initial = this.initial_resources;
+             var initial = this.initial;
              //var r_removed  = []; //
              /*-----------------------------------------------------------------------
                 TODO: remove this dirty hack !!!