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

1. Fix for people directly not attached to an organizations not showing up, if the organization happens to be higher up in the hierarchy where it has other sub-organizations beneath it.

Browse source 
2. Made changes to the front-end to reflect new content in temporal vis.
This commit is contained in:
cdtank 2011-02-04 22:36:23 +00:00
parent 85789d5e02
commit a9214be4a2
6 changed files with 107 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
productMods/js/visualization/entitycomparison/gui-event-manager.js
View file

@ -138,9 +138,8 @@ $(document).ready(function() {
labelToEntityRecord[val.label] = val;
});
getEntityVisMode(jsonData);
prepareTableForDataTablePagination(jsonData);
setEntityLevel();
setEntityLevel(getEntityVisMode(jsonData));
$(".disabled-checkbox-event-receiver").live("click", function () {

31
productMods/js/visualization/entitycomparison/util.js
View file

@ -1085,26 +1085,41 @@ function removeStopWords(val){
return typeStringWithoutStopWords.substring(1, typeStringWithoutStopWords.length);
}
function setEntityLevel(){
$('#entitylevelheading').text(' - ' + toCamelCase(entityLevel) + ' Level').css('font-style', 'italic');
function setEntityLevel(entityLevel){
//$('#entitylevelheading').text(' - ' + toCamelCase(entityLevel) + ' Level').css('font-style', 'italic');
$('#entityleveltext').text(' ' + entityLevel.toLowerCase()).css('font-style', 'italic');
$('#entityHeader').text(toCamelCase(entityLevel)).css('font-weight', 'bold');
$('#entityHeader').text(entityLevel).css('font-weight', 'bold');
$('#headerText').css("color", "#2485ae");
}
function getEntityVisMode(jsonData){
var entityLevels = new Array();
$.each(jsonData, function(index, val) {
if (val.visMode == "PERSON"){
entityLevel = "People";
entityLevels.push("People");
} else {
entityLevel = "Organizations";
entityLevels.push("Organizations");
}
return;
});
/* To provide graceful degradation set entity level to a default error message.*/
entitylevel = "ENTITY LEVEL UNDEFINED ERROR";
var uniqueEntityLevels = $.unique(entityLevels);
/*
* This case is when organizations & people are mixed because both are directly attached
* to the parent organization.
* */
if (uniqueEntityLevels.length > 1) {
entityLevel = "Organizations & People";
} else if (uniqueEntityLevels.length === 1) {
entityLevel = uniqueEntityLevels[0];
} else {
/* To provide graceful degradation set entity level to a default error message.*/
entitylevel = "ENTITY LEVEL UNDEFINED ERROR";
}
return entityLevel;
}
function toCamelCase(string){