Changeset 961 for MDService2/trunk/MDService2/WebContent

Timestamp:

12/03/10 20:44:51 (14 years ago)

Author:

gaba

Message:

query-names

Location:

MDService2/trunk/MDService2/WebContent/scripts

Files:

• mdservice2_ui.js (modified) (4 diffs)
• mdservice_model.js (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -279 +279 @@
 function appendQueryUI(json,i, qs){
         var del = '';
+        var name = '';
         //var ul;
         var id = $(qs).parent().attr('id');
@@ -300 +301 @@
         if (id == 'userqs') {
                 del = '<span class="cmd cmd_del" ><xsl:text> </xsl:text></span>';
+                name = '<div class="cmds-elem-prop"><span class="label">name:</span><input type="text" class="input-name" value="' + json.name + '"></div>';
+        } else {
+                name = '<div class="cmds-elem-prop"><span class="label">name:</span><span class="value">' + json.name +
+                '</span></div>';
         }
         var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller" ><a href="'+id + '_'+ i+'" >' + 
-        Query.fullformatstring(json) + '</a></span>' + 
+        json.name + '</a></span>' + 
         del +
         '<div class="detail" >' +
+        name +
         '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + json.squerystring +
         '</span></div>' +
@@ -313 +319 @@
         $(qs).append(x);
         
+        
+        $(qs).find('.input-name').keydown(function(ev){
+                var evStop = function(){ 
+                        ev.stopPropagation(); 
+                        ev.preventDefault(); 
+                };
+                if (ev.which === 13) {
+                        var id = parseInt( $("#serverqts_select option:selected").val());
+                        $(this).parent().parent().parent().find('a').text($(this).val());
+                        var str = $(this).parent().parent().parent().find('a').attr("href");
+                        var iq = parseInt(str.substring(7));
+                        jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq].name = $(this).val();
+                        saveWorkspace("USER");
+                        evStop();
+                }
+        });
 }
 
@@ -1043 +1065 @@
                         jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}];
                 }
-                
-                jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq] = {"squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols};
+                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols};
+                var name = Query.fullformatstring(jsonq);
+                jsonq.name = name;
+                
+                jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq] = jsonq;
                 saveWorkspace("USER");
                 appendQueryUI(jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq],iq, $('#userqueries'));

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -69 +69 @@
         }
         return this.columns_widget.getColumnsListText();
-}
+};
 
 Query.prototype.query_uri = function () {