Changeset 1229 for MDService2/trunk

Timestamp:

04/21/11 11:26:40 (13 years ago)

Author:

gaba

Message:

bookmark - load
query workspace - detail...
save query
infos
columns changes

Location:

MDService2/trunk/MDService2

Files:

• WebContent/index.jsp (modified) (3 diffs)
• WebContent/scripts/mdservice_model.js (modified) (5 diffs)
• WebContent/scripts/mdservice_ui.js (modified) (4 diffs)
• WebContent/scripts/mdservice_ui_detail.js (modified) (5 diffs)
• WebContent/scripts/mdservice_ui_load.js (modified) (2 diffs)
• WebContent/scripts/mdservice_widgets.js (modified) (1 diff)
• src/xsl/mdset2view.xsl (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -66 +66 @@
 <!-- QUERYSEARCH - BLOCK -->     
 <div class="cmds-ui-block init-show"  id="querysearch" >
-                <div class="header ui-widget-header ui-state-default ui-corner-top" >Querysearch</div>
+                <div class="header ui-widget-header ui-state-default ui-corner-top" ><span>Querysearch</span></div>
                 <div class="content" id="query-input" >         
                          <s:form action="searchretrieve">                                                       
@@ -120 +120 @@
 <!-- QUERYLIST BLOCK -->
 <div id="querylistblock" class="cmds-ui-block">
-<div class="header ui-widget-header ui-state-default ui-corner-top" >QUERYLIST</div>
-<div class="content">
-<div id="querylist"></div>
+<div class="header ui-widget-header ui-state-default ui-corner-top" ><span>QUERYLIST</span></div>
+<div class="content"  id="querylist">
 </div>
 </div>
         
 <div id="detailblock" class="cmds-ui-block">
-<div class="header ui-widget-header ui-state-default ui-corner-top" >DETAIL</div>
-<div class="content"></div>
+<div class="header ui-widget-header ui-state-default ui-corner-top" ><span>DETAIL</span></div>
+<div class="content" id="details"></div>
 </div>
 
 <div id="public-space" class="cmds-ui-block">
-                <div class="header">Public Space</div>
+                <div class="header"><span>Public Space</span></div>
 
                 <div id="serverqs" class="content" >
@@ -139 +138 @@
 
 <div class="cmds-ui-block init-show" id="user-space">
-        <div class="header" >Personal Workspace</div>   
+        <div class="header" ><span>Personal Workspace</span></div>      
         <div id="userqs" class="content">
                         <div id="userquerysets" >               

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

@@ -502 +502 @@
 };
 
+Query.prototype.updateColumns = function(slid){
+        if (selectionlistset.getselectionlist(slid).autoSelected()){
+                        this.columns = "";
+                } else
+                {
+                        this.columns = selectionlistset.getselectionlist(slid).listwidget.getListText();
+                }
+};
 Query.prototype.next = function(pages){
         var start = 0;
@@ -520 +528 @@
         
                 if (num > 0){
-                        this.startItem =        start;
+                        this.startItem = start;
                         this.maximumItems = num;
                         this.resubmit();
+                        updateQueryDetailPane(this);
                 }
         }
@@ -719 +728 @@
         var sl = selectionlistset.getselectionlist(slid);
         sl.listwidget.add(new ListItem($(elem).closest('.treecol').children('.column-elem').text()));
+        
+        $(elem).data('query').updateColumns(slid);
+
 };
 
@@ -746 +758 @@
                 //queryset.resubmit(qid);
                 */
+                // update columns if  reloaded from detail pane
+                /*
+                if ($(this).parent().attr('class') != 'result-header'){
+                        var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id");
+                        if (selectionlistset.getselectionlist(slid).autoSelected()){
+                                $(this).data('query').columns = "";
+                        } else
+                        {
+                                $(this).data('query').columns = selectionlistset.getselectionlist(slid).listwidget.getListText();
+                        }
+                }
+                */
+                var slid = $(this).closest('.detail-wrapper').find('.selectionlist-widget').attr("id");
+                if (slid != undefined){
+                        $(this).data('query').updateColumns(slid);
+                }
                 $(this).data('query').resubmit();
         });
@@ -774 +802 @@
                 $(this).data('query').resubmit();
         });
-        q_header.find('.cmd_add').click(function(){
-                
+        //q_header.find('.cmd_add').click(function(){
+        q_header.find('.cmd_columns').data('query', query);
+        q_header.find('.cmd_columns').click(function(){
                 query_wrapper_add_column($(this));
+                $(this).data('query').resubmit();
         });
         q_header.find('.columns-wrapper').hide();

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js

@@ -57 +57 @@
                 // autocomplete correction
                 searchclauseset.addsearchclause(new SearchClause("","",""),"",0,0);
+                createInfos();
         
 });
+
+function createInfos(){
+        var info = "<span class='cmd cmd_info'></span>";
+        $('.cmds-ui-block').children('.header').append(info);
+        createTooltip($('.cmds-ui-block').children('.header'));
+        
+        $('.cmds-ui-block').children('.header').children('.cmd_info').click(function(){
+                var a = $(this).parent().next().attr('id');
+                var uri = window.location.pathname + "static/info.xml";
+                $.get(uri,{"id":a}, showDetail,'html');
+                return false;
+        });     
+}
 
 
@@ -145 +159 @@
                         
         });             
-
+        $(".detail-caller-inline").live('click',function(event) {
+                event.preventDefault();
+                $(this).parent().children('.detail').toggle();
+                $(this).children('.cmd_down, .cmd_up').toggleClass('cmd_down cmd_up');
+                        
+        });     
+        
         // cmd_up cmd_down
         $('.cmd_up').live('click',  function(event) {
@@ -339 +359 @@
                 //$("#qs_select").append(new Option(Query.simplequerystring(qstring),iq));
         });
-        
+        /*
         $('#querylist .cmd-xml').live('click',  function(event) {
                 var qid = $(this).closest('.query_wrapper').attr("id");
@@ -350 +370 @@
                 queryset.getQuery(qid).open('htmlpage');
         });
+        */
         /*
         $('#querylist .cmd-link').live('click',  function(event) {

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_detail.js

@@ -154 +154 @@
                         var name = $(this).closest('.detail-wrapper').attr("id");
                         if (name == "detail_values"){
-                                $(this).find(".cmd_columns").click(function(event) {
+                                //$(this).find(".cmd_columns").click(function(event) {
+                                $(this).find(".cmd_query").click(function(event) {
                                         event.preventDefault();
                                         handleValueSelection($(this));
@@ -165 +166 @@
                                                 handleValueCaller($(this));
                                         });             
-                                $(this).find(".terms-tree").find('.treecol').find(".cmd_columns").click(function(event) {
+                                $(this).find(".terms-tree").find('.treecol').find(".cmd_query").click(function(event) {
                                                 event.preventDefault();
                                                 handleIndexSelection($(this));
@@ -392 +393 @@
                         // detail data
                         var did = $(data).attr("id");
-                        var detail = detailcaller.getdetail(did);
-                        var pos = $(detail.detailwidget).offset();
-                        pos.top = pos.top + $(detail.detailwidget).height();
+                        if (did != undefined){
+                                if ((did.indexOf("-info") == -1) && (did.length > 0)) {
+                                        var detail = detailcaller.getdetail(did);
+                                        var pos = $(detail.detailwidget).offset();
+                                        pos.top = pos.top + $(detail.detailwidget).height();
+                                        $("#detail-float").dialog('option', 'position', [pos.left,pos.top]);    
+                                }
+                        }
                         
                         $('#detail-float').html(data);
@@ -400 +406 @@
                         if (title == undefined) title = $('#detail-float').find('.title, .inner-title').first().text();
                         $('#detail-float').dialog( "option", "title", title );
-                        $("#detail-float").dialog('option', 'position', [pos.left,pos.top]);
+                        
                         
 
@@ -463 +469 @@
 
 }
+
+function updateQueryDetailPane(query){
+        var detail = detailcaller.getdetail("detail_query");
+        if (detail != undefined){
+                if (query.listid == detail.temp_id){
+                        $(detail.content_wrapper).find('.cmd_xml').attr('href',query.link("xml"));
+                        $(detail.content_wrapper).find('.cmd_link').attr('href',query.link("fullpage"));
+                }
+        }
+}

MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js

@@ -256 +256 @@
                 qq = "";
         }
-        var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller" ><a href="'+id + '_'+ i+'" >' + 
+        var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller-inline" ><a href="'+id + '_'+ i+'" >' + 
         json.name + '</a></span>' + 
         del +
@@ -276 +276 @@
         $(qs).append(x);
         
+        $(qs).find('.detail').css({'z-index' : '1000'});
         
         $(qs).find('.input-name').keydown(function(ev){

MDService2/trunk/MDService2/WebContent/scripts/mdservice_widgets.js

@@ -168 +168 @@
                 var lvid = $(this).closest('.widget-wrapper').attr('id');
                 var lv;
+                var sl;
+                var q;
                 if (lvid.beginsWith("sl")){
-                        var sl = $(this).closest('.selectionlist-widget').attr("id");
+                        sl = $(this).closest('.selectionlist-widget').attr("id");
                         lv = selectionlistset.getselectionlist( sl).listwidget;
+                        q = $(this).closest('.detail-wrapper').find('.cmd_reload').data();
                 } else {
                         lv = listwidgetset.getlistwidget(lvid);
                 }
                 lv.remove(colid);
-                
+                //resubmit query
+                if (lvid.beginsWith("sl")){
+                        q.query.updateColumns(sl);
+                        q.query.resubmit();
+                }
                 /*
                 if ($(this).parent().parent().parent().attr('class') == 'query-columns'){

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

@@ -141 +141 @@
   </xsl:attribute></input></span>
   <span class="cmd cmd_reload" />
+  <span class="cmd cmd_save" />
 <!--    <button class="reload">reload</button>-->
         <span class="cmd cmd_prev">