From a06d2e03bab64c340100ca5b69615f397480ee8b Mon Sep 17 00:00:00 2001
From: bkoniden <bkoniden@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 23 Nov 2010 18:09:19 +0000
Subject: [PATCH] =?UTF-8?q?Committing=20the=20following=20changes=20in=20T?=
 =?UTF-8?q?emporal=20Vis=201)level=20that=20indicates=20the=20status=20of?=
 =?UTF-8?q?=20the=20page=20needs=20to=20be=20made=20"Level"=202)Make=20the?=
 =?UTF-8?q?=20range=20on=20both=20the=20axes=20-=205=20years.=203)By=20def?=
 =?UTF-8?q?ault,=20sort=20by=20publication=20count=20and=20select=20the=20?=
 =?UTF-8?q?top=205.=204)Only=20two=20levels=20=E2=80=93=20Institution=20le?=
 =?UTF-8?q?vel=20and=20Person=20level.=205)Change=20the=20name=20of=20clea?=
 =?UTF-8?q?r=20to=20"Remove=20All"=206)put=20a=20star=20next=20to=20entity?=
 =?UTF-8?q?=20type=20column=20to=20indicate=20that=20some=20types=20have?=
 =?UTF-8?q?=20been=20leftout.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/visualization/entityComparison/util.js | 21 ++++++++++++-------
 .../visualization/entity_comparison.jsp       |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/productMods/js/visualization/entityComparison/util.js b/productMods/js/visualization/entityComparison/util.js
index c4fe3a4a..8c29b75e 100644
--- a/productMods/js/visualization/entityComparison/util.js
+++ b/productMods/js/visualization/entityComparison/util.js
@@ -301,7 +301,7 @@ function setLineWidthAndTickSize(yearRange, flotOptions) {
 		flotOptions.xaxis.tickSize = 1;
 	} else if (yearRange > 15 && yearRange < 70) {
 		flotOptions.series.lines.lineWidth = 2;
-		flotOptions.xaxis.tickSize = 4;
+		flotOptions.xaxis.tickSize = 5;
 	} else {
 		flotOptions.series.lines.lineWidth = 1;
 		flotOptions.xaxis.tickSize = 10;
@@ -314,16 +314,18 @@ function setLineWidthAndTickSize(yearRange, flotOptions) {
  */
 function setTickSizeOfYAxis(maxValue, flotOptions){
 	
+	var tickSize = 0;
+	
 	if (maxValue > 0 && maxValue <= 5) {
 		flotOptions.yaxis.tickSize = 1;
 	} else if (maxValue > 5 && maxValue <= 10) {
 		flotOptions.yaxis.tickSize = 2;
 	} else 	if (maxValue > 10 && maxValue <= 15) {
-		flotOptions.yaxis.tickSize = 3;
+		flotOptions.yaxis.tickSize = 5;
 	} else if (maxValue > 15 && maxValue <= 70) {
-		flotOptions.yaxis.tickSize = maxValue/5;
+		flotOptions.yaxis.tickSize  = 5;
 	} else {
-		flotOptions.yaxis.tickSize = maxValue/7;
+		flotOptions.yaxis.tickSize = 10;
 	}
 }
 /**
@@ -706,7 +708,7 @@ function prepareTableForDataTablePagination(jsonData){
 	publicationCountTH.html('Publication Count');
 
 	var entityTypeTH = $('<th>');
-	entityTypeTH.html('Entity Type');
+	entityTypeTH.html('* Entity Type');
 
 	tr.append(checkboxTH);
 	tr.append(entityLabelTH);
@@ -752,6 +754,7 @@ function prepareTableForDataTablePagination(jsonData){
 	
 	$('#datatable').dataTable({
 		"sDom": '<"searchbar"f><"paginatedtabs"p><"datatablewrapper"t><"showentries"l>',
+		"aaSorting" : [[2, "desc"]],
 		"iDisplayLength": 10,
 		"sPaginationType": "full_numbers",
 		"aLengthMenu" : [5,10,15],
@@ -814,13 +817,17 @@ function removeStopWords(val){
 }
 
 function setEntityLevel(){
-	$('#entitylevelheading').text(' - ' + toCamelCase(entityLevel) + ' level').css('font-style', 'italic');
+	$('#entitylevelheading').text(' - ' + toCamelCase(entityLevel) + ' Level').css('font-style', 'italic');
 	$('#entityleveltext').text('  ' + entityLevel.toLowerCase() + 's ').css('font-style', 'italic');
 }
 
 function getEntityVisMode(jsonData){
 	$.each(jsonData, function(index, val){
-		entityLevel = val.visMode;
+		if (val.visMode == "SCHOOL" || val.visMode == "UNIVERSITY" || val.visMode == "DEPARTMENT"){
+			entityLevel = "Institution";
+		}else {
+			entityLevel = "Person";
+		}
 		return;
 	});
 }
diff --git a/productMods/templates/visualization/entity_comparison.jsp b/productMods/templates/visualization/entity_comparison.jsp
index d563c0aa..7305133c 100644
--- a/productMods/templates/visualization/entity_comparison.jsp
+++ b/productMods/templates/visualization/entity_comparison.jsp
@@ -17,7 +17,7 @@
 			<li><a href="#">Networks</a></li>
 		</ul>
 	</div>
-		<h1>Temporal Graph Visualization<span id="entitylevelheading"><i> School level</i></span></h1>
+		<h1>Temporal Graph Visualization<span id="entitylevelheading"><i> School Level</i></span></h1>
 	<div id="leftblock">
 		<div id="leftUpper">
 			<h2 style="background-color:#3D454E; color: white; margin-top: 0px; margin-bottom: 20px; padding-bottom:5px;">How do you want to compare?</h2>
@@ -51,7 +51,7 @@
 			</div>
 		</div>		
 		<div id="bottomButtons">
-			<button id="clear" class = "metallic" type ="button">Clear</button>
+			<button id="clear" class = "metallic" type ="button">Remove All</button>
 			<button id="csv" class = "metallic" type ="button">Save as CSV</button>
 			<button id="image" class= "metallic" type="button" onClick="window.print()"> Save as Image</button>				
 		</div>