From 3aa9d2879feaebbfc8f7bf296ac22c6b504c0af8 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank"@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 13 Apr 2011 16:23:02 +0000
Subject: [PATCH] 1. Partial fix for NIHVIVO-2150, now the temporal vis only
 shows line graph only for the last complete 10 years.

---
 .../visualization/visualizations-beans-injection-fm.xml      | 4 ++--
 productMods/js/visualization/entitycomparison/constants.js   | 5 +++++
 productMods/js/visualization/entitycomparison/util.js        | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml
index 850a1652..06a18690 100644
--- a/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml
+++ b/productMods/WEB-INF/visualization/visualizations-beans-injection-fm.xml
@@ -71,7 +71,7 @@
                 -->
                 
                 <entry key="entity_comparison">
-                    <ref bean="entity_comparison"></ref>
+                    <ref bean="pub_temporal"></ref>
                 </entry>
                 
                                 
@@ -84,7 +84,7 @@
 				</entry>
 				
 				<entry key="entity_grant_count">
-					<ref bean="entity_grant_count"></ref>
+					<ref bean="grant_temporal"></ref>
 				</entry>	
 				                                
                 <entry key="grant_temporal">
diff --git a/productMods/js/visualization/entitycomparison/constants.js b/productMods/js/visualization/entitycomparison/constants.js
index 17f50395..f807b327 100644
--- a/productMods/js/visualization/entitycomparison/constants.js
+++ b/productMods/js/visualization/entitycomparison/constants.js
@@ -83,6 +83,11 @@ function initConstants() {
 				show : false
 			},
 			xaxis : {
+				/*
+				 * This is done to guarantee no-downward-trend on account of no content added for the 
+				 * current year.
+				 * */  
+				max : globalDateObject.getFullYear() - 1,
 				tickDecimals : 0,
 				tickSize : 10
 			},
diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js
index 0a7b5cc5..245f064b 100644
--- a/productMods/js/visualization/entitycomparison/util.js
+++ b/productMods/js/visualization/entitycomparison/util.js
@@ -230,8 +230,8 @@ function init(graphContainer) {
 	
 	var defaultFlotOptions = {
 			xaxis : {
-				min : globalDateObject.getFullYear() - 9,
-				max : globalDateObject.getFullYear(),
+				min : globalDateObject.getFullYear() - 10,
+				max : globalDateObject.getFullYear() - 1,
 				tickDecimals : 0,
 				tickSize : 2
 			},