Changeset 1156 for MDService2/trunk/MDService2

Timestamp:

03/06/11 22:29:26 (13 years ago)

Author:

gaba

Message:

​http://trac.clarin.eu/ticket/102 - query detail functionality

Location:

MDService2/trunk/MDService2/WebContent/scripts

Files:

• mdservice_model.js (modified) (8 diffs)
• mdservice_searchclause.js (modified) (2 diffs)
• mdservice_ui.js (modified) (1 diff)
• mdservice_ui_detail.js (modified) (4 diffs)

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

@@ -387 +387 @@
         createTooltip(this.container);
  };
- 
+ /*
  Query.prototype.renderDetail = function () {
          
@@ -464 +464 @@
         $('#detail-'+this.listid).find('.cmd_down').toggleClass('cmd_down cmd_up');     
 };
-
+*/
  Query.prototype.open = function (type) {
          if (type != null)
@@ -505 +505 @@
                 return uri;
 };
-
  Query.prototype.submit = function () {
                 
@@ -527 +526 @@
                                         q_header.append(result_header);
                                         
-                                        
+                                        //var q_header = $(x).find('.query_header');
+                                        addDetailFunctionality(q_header);
+                                        
                                         createTooltip($(this));
                                 });
@@ -570 +571 @@
                                 q_header.children('.result-header').remove();
                                 
-                                q_header.append(result_header);                                 
-                                q_header.find('.cmd_reload').click(function() {
+                                q_header.append(result_header);                         
+                                addDetailFunctionality(q_header);
+/*                              q_header.find('.cmd_reload').click(function() {
                                         // reload  from columns-wrapper
                                         if ($(this).parent().attr('class').indexOf("columns-wrapper") > 0) {
@@ -620 +622 @@
                                 q_header.find('.columns-wrapper').hide();
                                 q_header.find('.terms-tree').treeTable({initialState:"collapsed"});
+                                */
                         });
 
@@ -814 +817 @@
         
         // add to query columnslist // columns_widget not used
-        var qid = $(elem).closest('.query_wrapper').attr("id");
+        var qid = $(elem).closest('.detail-wrapper').attr("temp_id");
         var q = queryset.getQuery(qid);
         //q.columns_widget.add($(this).text());
@@ -828 +831 @@
         q.columns = columns_text;
         */
-}
+};
+
+function addDetailFunctionality(q_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('.detail-wrapper').attr("temp_id");
+                //var qid = str.substring(1);
+                queryset.resubmit(qid);
+        });
+        q_header.find('.cmd_prev').click(function() {
+                var qid = $(this).closest('.detail-wrapper').attr("temp_id");
+                //var qid = str.substring(7);
+                queryset.next(qid,-1);
+        });
+        q_header.find('.cmd_next').click(function() {
+                var qid = $(this).closest('.detail-wrapper').attr("temp_id");
+                //var qid = str.substring(7);
+                        queryset.next(qid,1);
+        });
+        
+        q_header.find('.value-format').change(function(){
+                var qid = $(this).closest('.detail-wrapper').attr("temp_id");
+                //var qid = str.substring(1);
+                var q = queryset.getQuery(qid);
+                q.format = $(this).find('option:selected').val();
+                queryset.resubmit(qid);
+                
+        });
+/*      q_header.find('.cmd_columns').live('click',  function(event) {
+                notifyUser("DEBUG: submit() .cmd_columns");
+                $(this).closest('.query_wrapper').find('.columns-wrapper').toggle();
+        });     
+*/
+        q_header.find('.cmd_add').click(function(){
+                
+                query_wrapper_add_column($(this));
+        });
+        
+        $('.query-columnslist .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('.detail-wrapper').attr("temp_id");
+                        var q = queryset.getQuery(qid);
+                        
+                        $(this).parent().remove();
+                        q.updatecolumnstext($(list).children());
+                                
+                }
+                if ($(this).parent().attr('class') == 'columns-wrapper'){
+                        $(this).parent().hide();
+                }
+        });
+        /*
+        q_header.find('.cmd_del').click(function(){
+                if ($(this).parent().parent().attr("class") == "query-columnslist"){
+                        var list = $(this).closest('.query-columns').children('.query-columnslist');
+                        var qid = $(this).closest('.detail-wrapper').attr("temp_id");
+                        var q = queryset.getQuery(qid);
+                        
+                        $(this).parent().remove();
+                        q.updatecolumnstext($(list).children());
+                                
+                }
+                if ($(this).parent().attr('class') == 'columns-wrapper'){
+                        $(this).parent().hide();
+                }
+        });
+        */
+        q_header.find('.columns-wrapper').hide();
+        q_header.find('.terms-tree').treeTable({initialState:"collapsed"});
+
+
+};

MDService2/trunk/MDService2/WebContent/scripts/mdservice_searchclause.js

@@ -192 +192 @@
  SearchClause.prototype.initAutocomplete = function(){
         
-         if (element_autocomplete.size == 0) return;
+         if (element_autocomplete.length == 0) return;
          
          //autocomplete
@@ -259 +259 @@
 
                 this.GetIndexInput().autocompleteArray(element_autocomplete,{
-                        autoFill:true,
-                        width:150,
+                        //autoFill:true,
+                        //width:150,
                         onFindValue:findValue,
                         onItemSelect:selectItem

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

@@ -77 +77 @@
                 }
                 else {
-                        did = $(this).parent().siblings('.ui-dialog-content').find('.detail-wrapper').attr('id');
+                        if ($(this).parent().siblings('.ui-dialog-content').length > 0){
+                                did = $(this).parent().siblings('.ui-dialog-content').find('.detail-wrapper').attr('id');
+                        }
                 }       
                 if (did != undefined){

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

@@ -1 +1 @@
  
-function Detail(name, content, url, type, detailwidget) {
-        this.name = name;
-        this.content = content;
-        this.content_wrapper = '';
-        this.url = url;
-        this.type = type;
+function Detail(detailwidget) {
         this.detailwidget = detailwidget;
         
         this.did = '';
         this.content_parent = undefined;
-};
-
+        this.content_wrapper = '';
+        
+        this.url = undefined;
+        this.type = undefined;
+        this.name = undefined;
+        this.content = undefined;
+        this.temp_id = "";
+        
+        this.setData();
+         
+};
+Detail.prototype.update = function(detailwidget){
+        this.detailwidget = detailwidget;
+        this.temp_id = "";
+        this.setData();
+        
+};
+Detail.prototype.setData = function(){
+        
+        var widget = this.detailwidget;
+        if ($(widget).parents('.result').length > 0){
+                this.name = "record";
+        } else {
+                if ($(widget).parents('.result-summary').length > 0) {
+                        this.name = "values";
+                } else {
+                        this.name = $(widget).closest('.ui-widget').attr('name');
+                }
+        }
+        
+        this.type = blocks_settings[this.name].detail.type;
+        switch (this.name){
+        case 'query':
+                //TODO class standard rename
+                this.content = $(widget).closest('.query_wrapper').find('.columns-wrapper');
+                this.url  = undefined;
+                this.temp_id  = $(widget).closest('.query_wrapper').attr('id');
+                break;
+        case 'record':
+                this.content = undefined;
+                this.url = $(widget).parent().find("a").attr('href');
+                break;
+        case 'values':
+                this.content = undefined;
+                this.url = $(widget).parent().find("a").attr('href');
+                break;
+        default:
+        }
+};
 Detail.prototype.getTitle = function(){
         var title = "";
@@ -17 +59 @@
         return title;
 };
-
 Detail.prototype.create = function(){
-        var cw = "<div id='" + this.did + "' class='detail-wrapper ui-widget' >" + 
+        var cw = "<div id='" + this.did + "' temp_id='" + this.temp_id  + "' class='detail-wrapper ui-widget' >" + 
         "<div class='detail-header ui-widget-header ui-state-default'>" +// ui-corner-top'>" +
         "<span class='cmd cmd_get'></span>" + 
@@ -29 +70 @@
         
 };
-Detail.prototype.update = function(content, url, type, detailwidget){
-        
-        this.url = url;
-        this.content = content;
-        this.type = type;
-        this.detailwidget = detailwidget;
-        
-};
+
 Detail.prototype.openContent = function() {
         if (this.content != undefined){
@@ -113 +147 @@
                 }
                 detail = this.details[name];
-                url = this.getdetailurl(name, widget)
+                //url = this.getdetailurl(name, widget);
                 if (detail == undefined) {
-                        content = this.getdetailcontent(name, widget);
-                        detail = new Detail(name, content, url, blocks_settings[name].detail.type, widget );
+                        //content = this.getdetailcontent(name, widget);
+                        detail = new Detail( widget );
                         this.adddetail(detail);
                 } else {
                         detail.close();
-                        content = this.getdetailcontent(name, widget);
-                        detail.update(content, url, blocks_settings[name].detail.type, widget );
+                        //content = this.getdetailcontent(name, widget);
+                        detail.update( widget );
                 }