re-integrating the branch /branches/iu-vis-dev-branches/vivo-post-1.1

productMods/templates/visualization/dummy_vis_client.jsp

@@ -35,7 +35,6 @@
 	<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual5611"/>
 </c:url>
 
-
 <c:url var="staticHref3" value="/visualization">
 	<c:param name="vis" value="person_pub_count"/>
 	<c:param name="vis_mode" value="short"/>
@@ -204,13 +203,13 @@
 <c:url var="coAuthorship10" value="/visualization">
 	<c:param name="vis" value="coauthorship"/>
 	<c:param name="render_mode" value="standalone"/>
-	<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/BrnerKaty"/>
 </c:url>
 
 <c:url var="coAuthorship10Data" value="/visualization">
 	<c:param name="vis" value="coauthorship"/>
 	<c:param name="render_mode" value="data"/>
-	<c:param name="uri" value="http://vivo.library.cornell.edu/ns/0.1#individual12053"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/BrnerKaty"/>
 </c:url>
 
 <c:url var="coAuthorshipSparklineData" value="/visualization">
@@ -229,6 +228,61 @@
 
 <c:url var="loadingImageLink" value="/${themeDir}site_icons/visualization/ajax-loader.gif"></c:url>
 
+<c:url var="departmentPublications" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="standalone"/>
+	<c:param name="vis_mode" value="DEPARTMENT"/>
+	<c:param name="uri" value="http://vivo-trunk.indiana.edu/individual/DepartmentBL-SLIS"/>
+</c:url>
+
+<c:url var="schoolPublications" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="standalone"/>
+	<c:param name="vis_mode" value="SCHOOL"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/SchoolofLibraryandInformationScience"/>
+</c:url>
+
+<c:url var="universityPublications" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="standalone"/>
+	<c:param name="vis_mode" value="UNIVERSITY"/>
+	<c:param name="uri" value="http://vivo-trunk.indiana.edu/individual/n7971"/>
+</c:url>
+
+<c:url var="departmentPublicationsdata" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="data"/>
+	<c:param name="vis_mode" value="DEPARTMENT"/>
+	<c:param name="uri" value="http://vivo-trunk.indiana.edu/individual/DepartmentBL-SLIS"/>
+</c:url>
+
+<c:url var="schoolPublicationsdata" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="data"/>
+	<c:param name="vis_mode" value="SCHOOL"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/SchoolofLibraryandInformationScience"/>
+</c:url>
+
+<c:url var="universityPublicationsdata" value="/visualization">
+	<c:param name="vis" value="entity_comparison"/>
+	<c:param name="render_mode" value="data"/>
+	<c:param name="vis_mode" value="UNIVERSITY"/>
+	<c:param name="uri" value="http://vivo-trunk.indiana.edu/individual/n7971"/>
+</c:url>
+
+<c:url var="coprincipalinvestigatordata" value="/visualization">
+	<c:param name="vis" value="coprincipalinvestigator"/>
+	<c:param name="render_mode" value="data"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/McDonaldRobertH"/>
+</c:url>
+
+<c:url var="freemarkertest" value="/visualization">
+	<c:param name="vis" value="freemarker"/>
+	<c:param name="render_mode" value="standalone"/>
+	<c:param name="uri" value="http://vivo.iu.edu/individual/McDonaldRobertH"/>
+</c:url>
+
+
 <style type="text/css">
 	.get_vis {
 		background-color:Yellow;
@@ -316,7 +370,7 @@ $(document).ready(function() {
 
 <h1 id="test-bed">Visualization Testbed (Not to be seen by eventual end users)</h1>
 
-
+<h2>Hello World!</h2>
 
 <a href='<c:out value="${coAuthorship1}"/>'>vis link for coauthorship -> "Erb, Hollis Nancy"</a>
 &nbsp;&nbsp;<a href='<c:out value="${coAuthorship1Data}"/>'>Data</a>
@@ -342,8 +396,24 @@ $(document).ready(function() {
 <a href='<c:out value="${coAuthorship10}"/>'>vis link for coauthorship -> "Not Working"</a>&nbsp;
 <a href='<c:out value="${coAuthorship10Data}"/>'>Data</a><br />
 
+<a href='<c:out value="${departmentPublications}"/>'>Department Publications</a>
+&nbsp;&nbsp;<a href='<c:out value="${departmentPublicationsdata}"/>'>Data</a><br />
+<a href='<c:out value="${schoolPublications}"/>'>School Publications</a>
+&nbsp;&nbsp;<a href='<c:out value="${schoolPublicationsdata}"/>'>Data</a><br />
+<a href='<c:out value="${universityPublications}"/>'>University Publications</a>
+&nbsp;&nbsp;<a href='<c:out value="${universityPublicationsdata}"/>'>Data</a><br />
+
 <br /><br /><br />
 
+<a href='<c:out value="${coprincipalinvestigatordata}"/>'>Co-PI data </a>
+
+<br /><br /><br />
+
+<a href='<c:out value="${freemarkertest}"/>'>Freemarker Test</a>
+
+<br /><br /><br />
+
+
 <a href='<c:out value="${collegeCSV}"/>'>vis data query for college -> "School of Industrial and Labor Relations (ILR)"</a><br />
 <a href='<c:out value="${collegeCSV2}"/>'>vis data query for college -> "College of Agriculture and Life Sciences (CALS)"</a><br />
 <a href='<c:out value="${collegeCSV3}"/>'>vis data query for college -> "College of Arts and Sciences"</a><br />

productMods/templates/visualization/entity_comparison.jsp

@@ -0,0 +1,189 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+<!--<script type="text/javascript" src="http://orderedlist.com/demos/quicksilverjs/javascripts/quicksilver.js"></script>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>-->
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+
+<c:set var="portalBean" value="${requestScope.portalBean}" />
+<c:set var="themeDir">
+	<c:out value="${portalBean.themeDir}" />
+</c:set>
+<c:set var='jsonContent' value='${requestScope.JsonContent}' />
+<div id="body">
+	<div id="navcontainer">
+		<ul id="navlist">
+			<li><a href="#">Temporal</a></li>
+			<li><a href="#">Geospatial</a></li>
+			<li><a href="#">Scimap</a></li>
+			<li><a href="#">Networks</a></li>
+		</ul>
+	</div>
+		<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>
+			<p style="float:left; margin-left:10px; margin-right: 10px; margin-top: 6px;">Select </p>
+			<select class="comparisonValues" style="margin-bottom: 20px;">
+				<option value="Publications" selected="selected">Publications</option>
+				<option value="Grants" disabled="disabled">Grants</option>
+				<option value="People" disabled="disabled">People</option>
+				<option value="Item4" disabled="disabled">Item4</option>
+				<option value="Item5" disabled="disabled">Item5</option>
+			</select>
+		</div>
+		<br/>	
+		<div id="leftLower">
+			<h2 style="background-color:#3D454E; color: white; margin-top: 0px; margin-bottom: 20px; padding-bottom:5px;">Choose</h2>
+			<div id="paginatedTable">
+			</div>
+		</div>
+		<div id = "stopwordsdiv">
+			* The entity types core:Person, foaf:Organization have been excluded as they are too general.
+		</div>	
+	</div>
+		<div id="rightblock">
+			<div id="graphContainer" style="width: 450px; height: 250px;"></div>
+			<div id="yaxislabel"></div>
+			<div id="bottom" style="width: 450px; height: 350px;">
+				<div id="xaxislabel">Year</div>
+				<h3><span id="comparisonParameter"></span></h3>
+			<p class="displayCounter">You have selected <span id="counter">0</span> of a maximum <span
+			id="total">10</span> <span id="entityleveltext"> schools</span> to compare.</p>
+			</div>
+		</div>		
+		<div id="bottomButtons">
+			<button id="clear" class = "metallic" type ="button">Clear</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>
+</div>
+<script type="text/javascript">
+	
+	$(document).ready(function() {
+
+		var jsonString = '${jsonContent}';
+		var jsonObject = {
+				prepare : function(arg1){
+					loadData(arg1);
+				}
+			};
+		
+		graphContainer = $("#graphContainer");
+		tableDiv = $('#paginatedTable');
+
+ 		// initial display of the grid when the page loads
+ 		init(graphContainer);
+		
+		/*
+		 * When the intra-entity parameters are clicked,
+		 * update the status accordingly.	
+		 */	        
+        $("select.comparisonValues").click(function(){
+            var selectedValue = $("select.comparisonValues option:selected").val();
+			$("#comparisonParameter").text("Total Number of " + selectedValue);
+			$('#yaxislabel').html("Number of " + selectedValue ).mbFlipText(false);
+			$("span#paramdesc").text($("select.comparisonValues option:selected").val() + ' (desc)');	
+			$("span#paramasc").text($("select.comparisonValues option:selected").val() + ' (asc)');	
+        });
+
+		//click event handler for clear button
+		$("button#clear").click(function(){
+			clearRenderedObjects();
+		});
+
+		
+		$("input[type=checkbox].easyDeselectCheckbox").live('click', function(){
+			
+			var checkbox = $(this);
+			var checkboxValue = $(this).attr("value");
+			var linkedCheckbox = labelToCheckedEntities[checkboxValue];
+			//console.log('checkbox value is '+ checkboxValue);
+			var entityToBeRemoved = labelToEntityRecord[checkboxValue];
+
+			if(!checkbox.is(':checked')){
+				//console.log("Easy deselect checkbox is unclicked!");
+				updateRowHighlighter(linkedCheckbox);
+				removeUsedColor(entityToBeRemoved);
+				removeEntityUnChecked(renderedObjects, entityToBeRemoved);                          
+             	removeGraphic(linkedCheckbox);
+             	removeCheckBoxFromGlobalSet(linkedCheckbox);
+             	$(linkedCheckbox).attr('checked', false);
+             	checkIfColorLimitIsReached();
+                displayLineGraphs();
+				updateCounter();				
+    		}
+		});
+							
+		//parse the json object and pass it to loadData
+        jsonObject.prepare(jQuery.parseJSON(jsonString));
+
+        /* 
+         *  function to populate the labelToEntityRecord object with the
+         *  values from the json file and
+         *  dynamically generate checkboxes
+         */
+        function loadData(jsonData){
+            
+           // var yearRange;
+
+            $.each(jsonData, function(index, val){
+                setOfLabels.push(val.label);
+                labelToEntityRecord[val.label] = val;
+            });
+
+			getEntityVisMode(jsonData);
+			prepareTableForDataTablePagination(jsonData);
+			setEntityLevel();
+           // calcMinandMaxYears(labelToEntityRecord, year);
+			//yearRange = (year.max - year.min);
+
+           // setLineWidthAndTickSize(yearRange, FlotOptions);     
+			//setTickSizeOfYAxis(calcMaxOfComparisonParameter(labelToEntityRecord), FlotOptions);
+            /*
+             * When the elements in the paginated div
+             * are clicked this event handler is called
+             */
+            $("input.if_clicked_on_school").live('click', function(){
+            
+                var checkbox = $(this);
+                var checkboxValue = $(this).attr("value");
+                var entity = labelToEntityRecord[checkboxValue];
+                
+				//Dynamically generate the bar, checkbox and label.
+
+                var bottomDiv = $("#bottom");
+                var hiddenLabel = createGraphic(entity, bottomDiv);
+
+                
+                var divBar = hiddenLabel.next();
+                var divLabel = hiddenLabel.prev();
+                var spanElement = divBar.next('span');
+
+                if (checkbox.is(':checked')) {
+                	
+					getNextFreeColor(entity);
+					generateBarAndLabel(entity, divBar, divLabel,checkbox, spanElement) ; 
+					renderLineGraph(renderedObjects, entity);
+					labelToCheckedEntities[checkboxValue] = checkbox;
+					                     
+		        } else if (!checkbox.is(':checked')) {
+		
+					removeUsedColor(entity);
+					removeEntityUnChecked(renderedObjects, entity);                          
+		            removeGraphic(checkbox);
+		            removeCheckBoxFromGlobalSet(checkbox);
+		                     
+		        	}
+				//console.log('Number of checked entities: ' + getSize(labelToCheckedEntities));
+				//disableUncheckedEntities();
+				setTickSizeOfAxes();
+				checkIfColorLimitIsReached();
+		    	//populateMapOfCheckedEntities();                    
+		        displayLineGraphs();
+				updateCounter(); 
+		
+		    });
+        }
+
+	});
+	
+</script>

productMods/templates/visualization/entity_comparison_inject_head.jsp

@@ -0,0 +1,62 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<c:set var="portalBean" value="${requestScope.portalBean}" />
+<c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
+<c:set var="contextPath"><c:out value="${pageContext.request.contextPath}" /></c:set>
+
+<c:url var="jquery" value="/js/jquery.js"/>
+<c:url var="flot" value="/js/jquery_plugins/flot/jquery.flot.js"/>
+<c:url var="fliptext" value="/js/jquery_plugins/fliptext/jquery.mb.flipText.js"/>
+<c:url var="jgrowl" value="/js/jquery_plugins/jgrowl/jquery.jgrowl.js"/>
+<c:url var="pagination" value="/js/jquery_plugins/pagination/jquery.pagination.js"/>
+<c:url var="livesearch" value="/js/jquery_plugins/jquery.livesearch.js"/>
+<c:url var="datatable" value="/js/jquery_plugins/datatable/jquery.dataTables.js"/>
+<c:url var="autoellipsis" value="/js/jquery_plugins/jquery.AutoEllipsis.js"/>
+
+
+<c:url var="entityComparisonUtils" value="/js/visualization/entityComparison/util.js" />
+<c:url var="entityComparisonConstants" value="/js/visualization/entityComparison/constants.js" />
+
+<!-- css related to jgrowl and pagination js files. -->
+<c:url var="paginationStyle" value="/js/jquery_plugins/pagination/pagination.css" />
+<c:url var="jgrowlStyle" value="/js/jquery_plugins/jgrowl/jquery.jgrowl.css" />
+
+<!-- css related to dataTable js files. -->
+<c:url var="demopage" value="/js/jquery_plugins/datatable/demo_page.css" />
+<c:url var="demoTable" value="/js/jquery_plugins/datatable/demo_table.css" />
+
+<c:url var="entityComparisonStyle" value="/${themeDir}css/visualization/entityComparison/layout.css" />
+<c:url var="vizStyle" value="/${themeDir}css/visualization/visualization.css" />
+
+<!-- Including jquery, entity comparison related javascript files -->
+
+<script type="text/javascript" src="${jquery}"></script>
+<script type="text/javascript" src="${flot}"></script>
+<script type="text/javascript" src="${fliptext}"></script>
+<script type="text/javascript" src="${jgrowl}"></script>
+<script type="text/javascript" src="${pagination}"></script>
+<script type="text/javascript" src="${livesearch}"></script>
+<script type="text/javascript" src="${datatable}"></script>
+<script type="text/javascript" src="${autoellipsis}"></script>
+<script type="text/javascript" src="${entityComparisonUtils}"></script>
+<script type="text/javascript" src="${entityComparisonConstants}"></script>
+
+
+<link href="${entityComparisonStyle}" rel="stylesheet" type="text/css" />
+<link href="${paginationStyle}" rel="stylesheet" type="text/css" />
+<link href="${jgrowlStyle}" rel="stylesheet" type="text/css" />
+<link href="${demopage}" rel="stylesheet" type="text/css" />
+<link href="${demoTable}" rel="stylesheet" type="text/css" />
+
+
+<link rel="stylesheet" type="text/css" href="${vizStyle}" />
+
+<script language="JavaScript" type="text/javascript">
+<!--
+
+var contextPath = "${contextPath}";
+
+// -->
+</script>

productMods/templates/visualization/person_level.jsp

@@ -18,6 +18,8 @@
 <c:set var='numOfAuthors' value='${requestScope.numOfAuthors}' />
 <c:set var='numOfCoAuthorShips' value='${requestScope.numOfCoAuthorShips}' />
 
+<c:set var='completeURL' value='${requestScope.completeURL}' />
+
 <c:url var="egoVivoProfileURL" value="/individual">
 	<c:param name="uri" value="${requestScope.egoURIParam}" />
 </c:url>
@@ -59,6 +61,7 @@ $(document).ready(function(){
 
 <div id="body">
 
+<div>complete URL = '${completeURL} '</div>
 <!--[if IE]>
 	<style type="text/css">
 	

productMods/templates/visualization/person_level_inject_head.jsp

@@ -13,6 +13,14 @@
 	<c:param name="labelField" value="label" />
 </c:url>
 
+<c:url var="egoCoPIDataFeederURL" value="/visualization">
+	<c:param name="vis" value="coprincipalinvestigator" />
+	<c:param name="render_mode" value="data" />
+	<c:param name="uri" value="${requestScope.egoURIParam}" />
+	<c:param name="labelField" value="label" />
+</c:url>
+
+
 <c:url var="egoCoAuthorsListDataFileURL" value="/visualization">
 	<c:param name="vis" value="person_level" />
 	<c:param name="render_mode" value="data" />
@@ -20,7 +28,7 @@
 	<c:param name="uri" value="${requestScope.egoURIParam}" />
 </c:url>
 
-<c:url var="swfLink" value="/${themeDir}site_icons/visualization/coauthorship/CoAuthor.swf" />
+<c:url var="swfLink" value="/${themeDir}site_icons/visualization/coauthorship/EgoCentric.swf" />
 
 <c:url var="jquery" value="/js/jquery.js"/>
 <c:url var="adobeFlashDetector" value="/js/visualization/coauthorship/AC_OETags.js" />
@@ -48,6 +56,7 @@ var swfLink = "${swfLink}";
 var egoURI = "${requestScope.egoURIParam}";
 var egoCoAuthorshipDataFeederURL = "${egoCoAuthorshipDataFeederURL}";
 var egoCoAuthorsListDataFileURL = "${egoCoAuthorsListDataFileURL}";
+var egoCoPIDataFeederURL = "${egoCoPIDataFeederURL}";
 var contextPath = "${contextPath}";
 
 // -->