From 15e9eeb8dc0fef36123a25ee52ac95e50e640cf5 Mon Sep 17 00:00:00 2001 From: nac26 Date: Thu, 3 Feb 2011 22:32:01 +0000 Subject: [PATCH] NIHVIVO-1073 Forgot to apply change to message displayed when no individuals are found for requested letter in alphabet to browseByVClassPeople.js --- .../js/menupage/browseByVClassPeople.js | 120 +++++++++--------- 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/productMods/js/menupage/browseByVClassPeople.js b/productMods/js/menupage/browseByVClassPeople.js index d1cd07f7..c6e90f59 100644 --- a/productMods/js/menupage/browseByVClassPeople.js +++ b/productMods/js/menupage/browseByVClassPeople.js @@ -33,64 +33,70 @@ browseByVClass.getIndividuals = function(vclassUri, alpha, page, scroll) { $.getJSON(url, function(results) { individualList = ""; - $.each(results.individuals, function(i, item) { - label = results.individuals[i].label; - firstName = results.individuals[i].firstName; - lastName = results.individuals[i].lastName; - if ( firstName && lastName ) { - fullName = firstName + ' ' + lastName; - } else { - fullName = label; + // Catch exceptions when empty individuals result set is returned + // 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 + if ( results.individuals.length == 0 ) { + browseByVClass.emptyResultSet(results.vclass, alpha) + } else { + $.each(results.individuals, function(i, item) { + label = results.individuals[i].label; + firstName = results.individuals[i].firstName; + lastName = results.individuals[i].lastName; + if ( firstName && lastName ) { + fullName = firstName + ' ' + lastName; + } else { + fullName = label; + } + moniker = results.individuals[i].moniker; + vclassName = results.individuals[i].vclassName; + if ( results.individuals[i].preferredTitle == "") { + // Use the moniker only if it's not empty and not equal to the VClass name + if ( moniker != vclassName && moniker != "" ) { + preferredTitle = moniker; + } else { + preferredTitle = ""; + } + } else { + preferredTitle = results.individuals[i].preferredTitle; + } + uri = results.individuals[i].URI; + profileUrl = results.individuals[i].profileUrl; + if ( !results.individuals[i].thumbUrl ) { + image = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; + } else { + image = browseByVClass.baseUrl + results.individuals[i].thumbUrl; + } + // Build the content of each list item, piecing together each component + listItem = '
  • '; + listItem += ''+ fullName +''; + listItem += '

    '+ fullName +'

    '; + // Include the calculated preferred title (see above) only if it's not empty + if ( preferredTitle != "" ) { + listItem += ''+ preferredTitle +''; + } + listItem += '
  • '; + // browseByVClass.individualsInVClass.append(listItem); + individualList += listItem; + }) + + // Remove existing content + browseByVClass.wipeSlate(); + + // And then add the new content + browseByVClass.individualsInVClass.append(individualList); + + // Check to see if we're dealing with pagination + if ( results.pages.length ) { + pages = results.pages; + browseByVClass.pagination(pages, page); } - moniker = results.individuals[i].moniker; - vclassName = results.individuals[i].vclassName; - if ( results.individuals[i].preferredTitle == "") { - // Use the moniker only if it's not empty and not equal to the VClass name - if ( moniker != vclassName && moniker != "" ) { - preferredTitle = moniker; - } else { - preferredTitle = ""; - } - } else { - preferredTitle = results.individuals[i].preferredTitle; - } - uri = results.individuals[i].URI; - profileUrl = results.individuals[i].profileUrl; - if ( !results.individuals[i].thumbUrl ) { - image = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; - } else { - image = browseByVClass.baseUrl + results.individuals[i].thumbUrl; - } - // Build the content of each list item, piecing together each component - listItem = '
  • '; - listItem += ''+ fullName +''; - listItem += '

    '+ fullName +'

    '; - // Include the calculated preferred title (see above) only if it's not empty - if ( preferredTitle != "" ) { - listItem += ''+ preferredTitle +''; - } - listItem += '
  • '; - // browseByVClass.individualsInVClass.append(listItem); - individualList += listItem; - }) - - // Remove existing content - browseByVClass.wipeSlate(); - - // And then add the new content - browseByVClass.individualsInVClass.append(individualList); - - // Check to see if we're dealing with pagination - if ( results.pages.length ) { - pages = results.pages; - browseByVClass.pagination(pages, page); + + selectedClassHeading = '

    '+ results.vclass.name +'

    '; + browseByVClass.individualsContainer.prepend(selectedClassHeading); + + // set selected class, alpha and page + browseByVClass.selectedVClass(results.vclass.URI); + browseByVClass.selectedAlpha(alpha); } - - selectedClassHeading = '

    '+ results.vclass.name +'

    '; - browseByVClass.individualsContainer.prepend(selectedClassHeading); - - // set selected class, alpha and page - browseByVClass.selectedVClass(results.vclass.URI); - browseByVClass.selectedAlpha(alpha); }); }; \ No newline at end of file