Changeset 1038

Timestamp:

01/04/11 23:03:20 (13 years ago)

Author:

gaba

Message:

query - columns, autocolumns

Location:

MDService2/trunk/MDService2

Files:

• WebContent/scripts/mdservice_model.js (modified) (8 diffs)
• src/xsl/mdset2view.xsl (modified) (4 diffs)
• src/xsl/terms2view.xsl (modified) (1 diff)

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

@@ -88 +88 @@
         }
         return this.columns_widget.getColumnsListText();
+};
+
+Query.prototype.updatecolumnstext = function (list) {
+        var columns_text = "";
+        $(list).each(function(index){
+                if (index > 0) {
+                        columns_text = columns_text + ",";
+                }
+                columns_text = columns_text + $(this).text();
+        });
+        this.columns = columns_text;
 };
 
@@ -377 +388 @@
                                         q_header.append(result_header);                                 
                                         q_header.find('.cmd_reload').click(function() {
+                                                // reload  from columns-wrapper
+                                                if ($(this).parent().attr('class').indexOf("columns-wrapper") > 0) {
+                                                        $(this).closest('.columns-wrapper').hide();
+                                                }
                                                 var qid = $(this).closest('.query_wrapper').attr("id");
                                                 queryset.resubmit(qid);
@@ -389 +404 @@
                                         });
                                         
-                                        q_header.find('.columns-wrapper').hide();
+                                        
                                         q_header.find('.cmd_columns').live('click',  function(event) {
                                                 notifyUser("DEBUG: submit() .cmd_columns");
@@ -395 +410 @@
                                         });     
                         
+                                        q_header.find('.cmd_add').click(function(){
+                                                
+                                                query_wrapper_add_column($(this));
+                                        });
+                                        
+                                        q_header.find('.columns-wrapper').hide();
                                 });
 
@@ -400 +421 @@
         
 Query.prototype.resubmit = function () {
-        
         
         var uri = link('recordset','htmltable', this.query_uri());
@@ -439 +459 @@
                                 q_header.append(result_header);                                 
                                 q_header.find('.cmd_reload').click(function() {
+                                        // reload  from columns-wrapper
+                                        if ($(this).parent().attr('class').indexOf("columns-wrapper") > 0) {
+                                                $(this).closest('.columns-wrapper').hide();
+                                        }
                                         var qid = $(this).closest('.query_wrapper').attr("id");
                                         queryset.resubmit(qid);
@@ -452 +476 @@
                                 q_header.find('.cmd_columns').live('click',  function(event) {
                                         notifyUser("DEBUG: resubmit() .cmd_columns");
-                                        $(this).closest('.query_wrapper').find('.columns-wrapper').show();
-                                });     
+                                        $(this).closest('.query_wrapper').find('.columns-wrapper').toggle();
+                                });
+                                
+                                q_header.find('.cmd_add').click(function(){
+                                        query_wrapper_add_column($(this));
+                                });
+
+                                q_header.find('.columns-wrapper').hide();
                         });
 
@@ -643 +673 @@
 
 $('.cmd_del').live('click',function(){
+        if ($(this).parent().parent().attr("class") == "query-columnslist"){
+                var list = $(this).closest('.query-columns').children('.query-columnslist');
+                var qid = $(this).closest('.query_wrapper').attr("id");
+                var q = queryset.getQuery(qid);
+                
+                $(this).parent().remove();
+                q.updatecolumnstext($(list).children());
+                        
+        }
         if ($(this).parent().attr('class') == 'columns-wrapper'){
                 $(this).parent().hide();
         }
 });
+
+function query_wrapper_add_column(elem){
+        var col  = '<li>' + $(elem).next().text() + '<span class="cmd cmd_del" /></li>';
+        $(elem).closest('.query-columns').children('.query-columnslist').append(col);
+        
+        // add to query columnslist // columns_widget not used
+        var qid = $(elem).closest('.query_wrapper').attr("id");
+        var q = queryset.getQuery(qid);
+        //q.columns_widget.add($(this).text());
+        q.updatecolumnstext($(elem).closest('.query-columns').children('.query-columnslist').children());
+        /*
+        var columns_text = "";
+        $(elem).closest('.query-columns').children('.query-columnslist').children().each(function(index){
+                if (index > 0) {
+                        columns_text = columns_text + ",";
+                }
+                columns_text = columns_text + $(this).text();
+        });
+        q.columns = columns_text;
+        */
+}

MDService2/trunk/MDService2/src/xsl/mdset2view.xsl

@@ -156 +156 @@
                 <div class='query-columns'>
                                 <xsl:call-template name="columns" />
-                </div><span class='cmd cmd_del'></span></div>
+                </div><span class='cmd cmd_del'></span><span class="cmd cmd_reload" /></div>
     </div>
        <div class="note" ><span class="label" >echo: </span><span class="value"><xsl:value-of select="echoedSearchRetrieveRequest" /></span>;<span class="label" >duration: </span><span class="value"><xsl:value-of select="extraResponseData/duration" /></span>;</div>
@@ -162 +162 @@
 
 <xsl:template name="columns">   
-                <ul>
+                <ul class="query-columnslist">
                         <xsl:for-each select="$columns/*">
-                                <li><xsl:value-of select="@label"/></li>
+                                <li><xsl:value-of select="@label"/><span class='cmd cmd_del'/></li>
                         </xsl:for-each>
                 </ul>
@@ -203 +203 @@
                         </xsl:apply-templates> -->                      
                 </ul>   
-                        
 <!--            <xsl:for-each select="$resultSummary" >
                                 <li><a href="{@id}" ><xsl:value-of select="@name"/></a><span class="note">|<xsl:value-of select="@count"/>|</span></li>
@@ -269 +268 @@
                         <xsl:message><xsl:copy-of select="."></xsl:copy-of> </xsl:message>
                                  <xsl:variable name="curr_col_xpath" select="@xpath" />
-                        <td>                    
+                        <td>                    
                                 <xsl:for-each select="$curr_cmd">
                                         <xsl:call-template name="format-field" >

MDService2/trunk/MDService2/src/xsl/terms2view.xsl

@@ -92 +92 @@
 
 <xsl:template match="Term" mode="table">
-                                <tr><td><a href="?q={@path}" >
-                                        <xsl:value-of select="translate(@path,'/','.')"/></a></td>
+                                <tr><td>
+                                <!-- <a href="?q={@path}" > -->
+                                        <span class="cmd cmd_add">      </span>
+                                        <span class="column-elem"><xsl:value-of select="translate(@path,'/','.')"/></span>
+                                        <!-- </a> -->
+                                        </td>
                                                 <td align="right"><xsl:value-of select="@count"/></td>
                                                 <td align="right"><xsl:value-of select="@count_text"/></td>