litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

commented out console.log statements in util.js and attached click event functionality to change event for select.comparisonValues in entityComparison*.ftl

Browse source
This commit is contained in:
bkoniden 2011-01-14 18:52:21 +00:00
parent 9a0e725cad
commit 2a48f7e864
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
View file

@ -122,29 +122,29 @@ var subOrganizationTemporalGraphPubURL = "${subOrganizationTemporalGraphPubURL}"
// initial display of the grid when the page loads // initial display of the grid when the page loads
init(graphContainer); 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);
$('#yaxislabel').css("color", "#595B5B");
$('#comparisonHeader').html(selectedValue).css('font-weight', 'bold');
});
//click event handler for clear button //click event handler for clear button
$("a#clear").click(function(){ $("a#clear").click(function(){
clearRenderedObjects(); clearRenderedObjects();
}); });
/*
* When the intra-entity parameters are clicked,
* update the status accordingly.
*/
$("select.comparisonValues").change(function(){ $("select.comparisonValues").change(function(){
console.log($("select.comparisonValues option:selected").text());
if($("select.comparisonValues option:selected").text() === "by Publications"){ if($("select.comparisonValues option:selected").text() === "by Publications"){
window.location = subOrganizationTemporalGraphPubURL + "&uri=" + "${organizationURI}"; window.location = subOrganizationTemporalGraphPubURL + "&uri=" + "${organizationURI}";
} }
var selectedValue = $("select.comparisonValues option:selected").val();
$("#comparisonParameter").text("Total Number of " + selectedValue);
$('#yaxislabel').html("Number of " + selectedValue).mbFlipText(false);
$('#yaxislabel').css("color", "#595B5B");
$('#comparisonHeader').html(selectedValue).css('font-weight', 'bold');
}); });
$("input[type=checkbox].easyDeselectCheckbox").live('click', function(){ $("input[type=checkbox].easyDeselectCheckbox").live('click', function(){
@ -152,7 +152,6 @@ var subOrganizationTemporalGraphPubURL = "${subOrganizationTemporalGraphPubURL}"
var checkbox = $(this); var checkbox = $(this);
var checkboxValue = $(this).attr("value"); var checkboxValue = $(this).attr("value");
var linkedCheckbox = labelToCheckedEntities[checkboxValue]; var linkedCheckbox = labelToCheckedEntities[checkboxValue];
//console.log('checkbox value is '+ checkboxValue);
var entityToBeRemoved = labelToEntityRecord[checkboxValue]; var entityToBeRemoved = labelToEntityRecord[checkboxValue];
if(!checkbox.is(':checked')){ if(!checkbox.is(':checked')){

26
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
View file

@ -120,28 +120,30 @@ var subOrganizationTemporalGraphGrantURL = "${subOrganizationTemporalGraphGrantU
// initial display of the grid when the page loads // initial display of the grid when the page loads
init(graphContainer); 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);
$('#yaxislabel').css("color", "#595B5B");
$('#comparisonHeader').html(selectedValue).css('font-weight', 'bold');
});
//click event handler for clear button //click event handler for clear button
$("a#clear").click(function(){ $("a#clear").click(function(){
clearRenderedObjects(); clearRenderedObjects();
}); });
/*
* When the intra-entity parameters are clicked,
* update the status accordingly.
*/
$("select.comparisonValues").change(function(){ $("select.comparisonValues").change(function(){
console.log($("select.comparisonValues option:selected").text());
if($("select.comparisonValues option:selected").text() === "by Grants"){ if($("select.comparisonValues option:selected").text() === "by Grants"){
window.location = subOrganizationTemporalGraphGrantURL + "&uri=" + "${organizationURI}"; window.location = subOrganizationTemporalGraphGrantURL + "&uri=" + "${organizationURI}";
} }
var selectedValue = $("select.comparisonValues option:selected").val();
$("#comparisonParameter").text("Total Number of " + selectedValue);
$('#yaxislabel').html("Number of " + selectedValue).mbFlipText(false);
$('#yaxislabel').css("color", "#595B5B");
$('#comparisonHeader').html(selectedValue).css('font-weight', 'bold');
}); });
$("input[type=checkbox].easyDeselectCheckbox").live('click', function(){ $("input[type=checkbox].easyDeselectCheckbox").live('click', function(){