Changeset 1062 for MDService2/trunk/MDService2/WebContent

Timestamp:

01/12/11 23:43:57 (13 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2/WebContent/scripts

Files:

• mdservice2_ui.js (modified) (5 diffs)
• mdservice_model.js (modified) (3 diffs)
• mdservice_widgets.js (modified) (1 diff)

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

@@ -410 +410 @@
                 '</span></div>';
         }
+                
+        var timestr = "";
+        if (json.time != undefined){
+                timestr = json.time;
+        }
+        var squery = json.squerystring;
+        if (squery = "[NULL]"){
+                squery = "";
+        }
+        var qq = json.querystring;
+        if (qq = "[NULL]"){
+                qq = "";
+        }
         var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller" ><a href="'+id + '_'+ i+'" >' + 
         json.name + '</a></span>' + 
@@ -415 +428 @@
         '<div class="detail" >' +
         name +
-        '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + json.squerystring + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">query:</span><span class="value">' + Query.simplequerystring(json.querystring) + '</span></div>' + 
+        '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + squery + '</span></div>' +
+        '<div class="cmds-elem-prop"><span class="label">query:</span><span class="value">' + Query.simplequerystring(qq) + '</span></div>' + 
         '<div class="cmds-elem-prop"><span class="label">collections:</span><span class="value">' + Query.collectiontext(json) + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">columns:</span><span class="value">' + Query.columns + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">time:</span><span class="value">'   + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">startRecord:</span><span class="value">' + Query.startRecord + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">maxRecord:</span><span class="value">' + Query.maximumRecords + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">repository:</span><span class="value">' + Query.repository + '</span></div>' +
-        '<div class="cmds-elem-prop"><span class="label">options:</span><span class="value">' +  '</span></div>' +
+        '<div class="cmds-elem-prop"><span class="label">columns:</span><span class="value">' + Query.columnstext(json) + '</span></div>' +
+        '<div class="cmds-elem-prop"><span class="label">time:</span><span class="value">' + timestr + '</span></div>' +
+        //'<div class="cmds-elem-prop"><span class="label">startRecord:</span><span class="value">' + Query.startRecord + '</span></div>' +
+        //'<div class="cmds-elem-prop"><span class="label">maxRecord:</span><span class="value">' + Query.maximumRecords + '</span></div>' +
+        //'<div class="cmds-elem-prop"><span class="label">repository:</span><span class="value">' + Query.repository + '</span></div>' +
+        '<div class="cmds-elem-prop"><span class="label">bookmark:</span><span class="value">' + json.bookmark + '</span></div>' +
+        '<div class="cmds-elem-prop"><span class="label">options:</span><span class="value">' + Query.optionstext(json) +  '</span></div>' +
         '</div>';
         
-        //var d1 = Date.parse('2010-10-18, 10:06 AM'); alert(d1.toString('dd/mm/yyyy HH:mm:ss GMT')); 
-        //isNull(Query.options,"") +
+        //dt = Date.parse('2010-10-18, 10:06 AM'); dt.toString('dd/mm/yyyy HH:mm:ss GMT') 
         $(qs).append(x);
         
@@ -1185 +1198 @@
                         json_options = queryset.getoptions(qid);
                 }
-                 
+        
                 // JSON conversion
                 if (qstring.length == 0){
@@ -1200 +1213 @@
                         jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}];
                 }
-                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "options" : json_options, "bookmark" : bookmark};
+                var dt = new Date();
+                var str_time = dateFormat(dt);//dt.toString("dd/mm/yyyy HH:mm:ss");
+                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "options" : json_options, "bookmark" : bookmark, "time" : str_time};
                 
                 var name;
@@ -1311 +1326 @@
                 var id = $('#qts_select option').size();
                 var dt = new Date();
-                var str_time = dt.toString("yyyy-MM-dd HH:mm:ss");
+                var str_time = dateFormat(dt);//dt.toString("yyyy-MM-dd HH:mm:ss");
                 
                 if (id == 0){

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

@@ -82 +82 @@
         }
         
+        if (json.time == undefined){
+                this.time_created = null;
+        } else {
+                this.time_created = json.time;
+        }
 };
 
@@ -181 +186 @@
         }
         return collection_text;
+};
+
+Query.columnstext = function(json) {
+        var columns_text = "";
+        if (json.columns != "null"){
+                $.each(json.columns,function(i,item){
+                        columns_text = columns_text + "," + item;
+                });
+                if (columns_text.length > 1) {
+                        columns_text = columns_text.substring(1);       
+                }
+        }
+        return columns_text;
+};
+
+Query.optionstext = function(json) {
+        var options_text = "";
+        if (json.options == undefined){
+                return "";
+        }
+        if (json.options != "null"){
+                $.each(json.options,function(i,item){
+                        options_text = options_text + "," + item;
+                });
+                if (options_text.length > 1) {
+                        options_text = options_text.substring(1);       
+                }
+        }
+        return options_text;
 };
 
@@ -626 +660 @@
                         } 
                 }
-                
+
                 if (opts != null) {
                         json_opts = [{}];
                         json_opts[0] = opts;
                 }
-                return opts;
+                return json_opts;
         },
         resubmit: function(qid){

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

@@ -341 +341 @@
 
 
+        
+        function dateFormat(dt){
+        
+                var str = "";
+                var month = dt.getMonth() + 1;
+                if (month < 10){
+                        month = "0" + month                     
+                }
+                var day = dt.getDay();
+                if (day < 10){
+                        day = "0" + day;
+                }
+                var hours = dt.getHours();
+                if (hours < 10) {
+                        hours = "0" + hours;
+                }
+                var minute = dt.getMinutes();
+                if (minute < 10) {
+                        minute = "0" + hours;
+                }
+                var second = dt.getSeconds();
+                if (second < 10) {
+                        second = "0" + second;
+                }
+                str = dt.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minute + ":" + second;
+                
+                return str;
+        }