NIHVIVO-1073 Forgot to apply change to message displayed when no individuals are found for requested letter in alphabet to browseByVClassPeople.js

This commit is contained in:
nac26 2011-02-03 22:32:01 +00:00
parent 405ed11e45
commit 15e9eeb8dc

View file

@ -33,64 +33,70 @@ browseByVClass.getIndividuals = function(vclassUri, alpha, page, scroll) {
$.getJSON(url, function(results) { $.getJSON(url, function(results) {
individualList = ""; individualList = "";
$.each(results.individuals, function(i, item) { // Catch exceptions when empty individuals result set is returned
label = results.individuals[i].label; // This is very likely to happen now since we don't have individual counts for each letter and always allow the result set to be filtered by any letter
firstName = results.individuals[i].firstName; if ( results.individuals.length == 0 ) {
lastName = results.individuals[i].lastName; browseByVClass.emptyResultSet(results.vclass, alpha)
if ( firstName && lastName ) { } else {
fullName = firstName + ' ' + lastName; $.each(results.individuals, function(i, item) {
} else { label = results.individuals[i].label;
fullName = label; firstName = results.individuals[i].firstName;
} lastName = results.individuals[i].lastName;
moniker = results.individuals[i].moniker; if ( firstName && lastName ) {
vclassName = results.individuals[i].vclassName; fullName = firstName + ' ' + lastName;
if ( results.individuals[i].preferredTitle == "") { } else {
// Use the moniker only if it's not empty and not equal to the VClass name fullName = label;
if ( moniker != vclassName && moniker != "" ) { }
preferredTitle = moniker; moniker = results.individuals[i].moniker;
} else { vclassName = results.individuals[i].vclassName;
preferredTitle = ""; if ( results.individuals[i].preferredTitle == "") {
} // Use the moniker only if it's not empty and not equal to the VClass name
} else { if ( moniker != vclassName && moniker != "" ) {
preferredTitle = results.individuals[i].preferredTitle; preferredTitle = moniker;
} } else {
uri = results.individuals[i].URI; preferredTitle = "";
profileUrl = results.individuals[i].profileUrl; }
if ( !results.individuals[i].thumbUrl ) { } else {
image = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; preferredTitle = results.individuals[i].preferredTitle;
} else { }
image = browseByVClass.baseUrl + results.individuals[i].thumbUrl; uri = results.individuals[i].URI;
} profileUrl = results.individuals[i].profileUrl;
// Build the content of each list item, piecing together each component if ( !results.individuals[i].thumbUrl ) {
listItem = '<li class="vcard individual foaf-person" role="listitem" role="navigation">'; image = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg';
listItem += '<img src="'+ image +'" width="90" height="90" alt="'+ fullName +'" />'; } else {
listItem += '<h1 class="fn thumb"><a href="'+ profileUrl +'" title="View the profile page for '+ fullName +'">'+ fullName +'</a></h1>'; image = browseByVClass.baseUrl + results.individuals[i].thumbUrl;
// Include the calculated preferred title (see above) only if it's not empty }
if ( preferredTitle != "" ) { // Build the content of each list item, piecing together each component
listItem += '<span class="title">'+ preferredTitle +'</span>'; listItem = '<li class="vcard individual foaf-person" role="listitem" role="navigation">';
} listItem += '<img src="'+ image +'" width="90" height="90" alt="'+ fullName +'" />';
listItem += '</li>'; listItem += '<h1 class="fn thumb"><a href="'+ profileUrl +'" title="View the profile page for '+ fullName +'">'+ fullName +'</a></h1>';
// browseByVClass.individualsInVClass.append(listItem); // Include the calculated preferred title (see above) only if it's not empty
individualList += listItem; if ( preferredTitle != "" ) {
}) listItem += '<span class="title">'+ preferredTitle +'</span>';
}
listItem += '</li>';
// browseByVClass.individualsInVClass.append(listItem);
individualList += listItem;
})
// Remove existing content // Remove existing content
browseByVClass.wipeSlate(); browseByVClass.wipeSlate();
// And then add the new content // And then add the new content
browseByVClass.individualsInVClass.append(individualList); browseByVClass.individualsInVClass.append(individualList);
// Check to see if we're dealing with pagination // Check to see if we're dealing with pagination
if ( results.pages.length ) { if ( results.pages.length ) {
pages = results.pages; pages = results.pages;
browseByVClass.pagination(pages, page); browseByVClass.pagination(pages, page);
}
selectedClassHeading = '<h3 class="selected-class">'+ results.vclass.name +'</h3>';
browseByVClass.individualsContainer.prepend(selectedClassHeading);
// set selected class, alpha and page
browseByVClass.selectedVClass(results.vclass.URI);
browseByVClass.selectedAlpha(alpha);
} }
selectedClassHeading = '<h3 class="selected-class">'+ results.vclass.name +'</h3>';
browseByVClass.individualsContainer.prepend(selectedClassHeading);
// set selected class, alpha and page
browseByVClass.selectedVClass(results.vclass.URI);
browseByVClass.selectedAlpha(alpha);
}); });
}; };