NIHVIVO-650 Reworked Freemarker sparkline implementation for better controller/view separation

productMods/js/visualization/sparkline.js

@@ -3,20 +3,28 @@
 /* Javascript for sparkline visualization on person profile page */
 
 var visualization = {
-	render: function(visualizationData) {
+	render: function(url) {
-		var container = $('#' + visualizationData.container);
+		var containerId = 'vis_container',
-        //$(container).empty().html('<img src="${loadingImageLink}" />');
+		    container = $('#' + containerId);
+			
+        //container.empty().html('<img src="${loadingImageLink}" />');
        
         $.ajax({
-            url: visualizationData.url,
+            url: url,
-            dataType: "html",
+			data: {
+				'render_mode': 'dynamic',
+				'vis': 'person_pub_count',
+				'vis_mode': 'short',
+				'container': containerId
+			},
+            dataType: 'html',
             success:function(data){
-                $(container).html(data);
+                container.html(data);
             }
         });		
 	}
 };
 
 $(document).ready(function() {
-    visualization.render(visualizationData);
+    visualization.render(visualizationUrl);
 });

productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl

@@ -2,19 +2,13 @@
 
 <#-- Template for sparkline visualization on individual profile page -->
 
-<#if visualization.url??>
+<#if visualizationUrl??>
     <div id="vis_container">&nbsp;</div>
     
-    <#assign visContainer = "vis_container">
-    <#assign visUrl = "${visualization.url}&container=${visContainer}">
-    
     ${stylesheets.addFromTheme("/visualization/visualization.css")}
     ${scripts.add("/js/visualization/sparkline.js")}
     
     <script type="text/javascript">
-    var visualizationData = {
+        var visualizationUrl = '${visualizationUrl}';
-        url: '${visUrl}',
-        container: '${visContainer}'
-    };
     </script>
 </#if>