Changeset 35040

Timestamp:

2021-04-06T00:19:44+12:00 (3 years ago)

Author:

davidb

Message:

Support for start-year and end-year text boxes

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/js/eurovision.js

@@ -223 +223 @@
 
 
+
+function ssv_load(query_text_id)
+{
+    var sample_data_sgvizler_query = $('#'+query_text_id).text().trim();
+    $('#sample-data-sgvizler-query').val(sample_data_sgvizler_query);    
+
+    if ($('#'+query_text_id+"-chart").length>0) {
+    // Override existing val with custom value
+        $('#sample-data-sgvizler-chart').val($('#'+query_text_id+"-chart").text().trim());
+    }
+    
+    if ($('#'+query_text_id+"-chart-options").length>0) {
+    // Override existing val with custom value
+        $('#sample-data-sgvizler-chart-options').val($('#'+query_text_id+"-chart-options").text().trim());
+    }
+    
+    if ($('#'+query_text_id+"-div-style").length>0) {
+    // Override existing val with custom value
+        $('#sample-div-style').val($('#'+query_text_id+"-div-style").text().trim());
+    }
+    else {
+    $('#sample-div-style').val($('#ssv-orig-div-style').text().trim());
+    }
+
+    $('.exec-ssq').hide();
+    $('#exec-'+query_text_id).show();
+}
+
+
+
 function ssv_execute(query_text_id)
 {
+    if (query_text_id) {
+    var sample_data_sgvizler_query = $('#'+query_text_id).text().trim();
+
+    if ($('#'+query_text_id+"-startyear").length>0) {
+        var start_year = $('#'+query_text_id+"-startyear").val();
+        sample_data_sgvizler_query = sample_data_sgvizler_query.replaceAll("**startyear**",start_year);
+    }
+    
+    if ($('#'+query_text_id+"-endyear").length>0) {
+        var end_year = $('#'+query_text_id+"-endyear").val();
+        sample_data_sgvizler_query = sample_data_sgvizler_query.replaceAll("**endyear**",end_year);
+    }
+    
+    $('#sample-data-sgvizler-query').val(sample_data_sgvizler_query);
+    }
+    
     
     var sgvizler_div_raw_text = $('#sample-sgvizler-div').val();
@@ -249 +295 @@
     sgvizler2.containerDraw('sgvizler-div');
 }
-
-
-function ssv_load(query_text_id)
-{
-    $('#sample-data-sgvizler-query').val($('#'+query_text_id).text().trim());
-
-    if ($('#'+query_text_id+"-chart").length>0) {
-    // Override existing val with custom value
-        $('#sample-data-sgvizler-chart').val($('#'+query_text_id+"-chart").text().trim());
-    }
-    
-    if ($('#'+query_text_id+"-chart-options").length>0) {
-    // Override existing val with custom value
-        $('#sample-data-sgvizler-chart-options').val($('#'+query_text_id+"-chart-options").text().trim());
-    }
-    
-    if ($('#'+query_text_id+"-div-style").length>0) {
-    // Override existing val with custom value
-        $('#sample-div-style').val($('#'+query_text_id+"-div-style").text().trim());
-    }
-    else {
-    $('#sample-div-style').val($('#ssv-orig-div-style').text().trim());
-    }
-    
-    $('.exec-ssq').hide();
-    $('#exec-'+query_text_id).show();
-}
-