From 638c0211ec3f1a0554eba1a999d6a8f504289842 Mon Sep 17 00:00:00 2001 From: nac26 Date: Fri, 14 Jan 2011 15:12:35 +0000 Subject: [PATCH] NIHVIVO-1073 NIHVIVO-634 NIHVIVO-641 Refactoring default vitro level behavior of menupages (does not assume any classes and is not ontology aware) --- webapp/web/js/menupage/browseByVClass.js | 29 ++++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js index ee8dfa6c7..eef4eff6a 100644 --- a/webapp/web/js/menupage/browseByVClass.js +++ b/webapp/web/js/menupage/browseByVClass.js @@ -68,17 +68,26 @@ var browseByVClass = { $.getJSON(url, function(results) { $.each(results.individuals, function(i, item) { - indivLabel = results.individuals[i].label; - firstName = results.individuals[i].firstName; - lastName = results.individuals[i].lastName; - indivUri = results.individuals[i].URI; - indivProfileUrl = results.individuals[i].profileUrl; - if ( !results.individuals[i].thumbUrl ) { - indivImage = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; - } else { - indivImage = browseByVClass.baseUrl + results.individuals[i].thumbUrl; + label = results.individuals[i].label; + moniker = results.individuals[i].moniker; + vclassName = results.individuals[i].vclassName; + uri = results.individuals[i].URI; + profileUrl = results.individuals[i].profileUrl; + if ( results.individuals[i].thumbUrl ) { + image = browseByVClass.baseUrl + results.individuals[i].thumbUrl; } - browseByVClass.individualsInVClass.append('
  • '+ firstName + ' ' + lastName +'

    '+ firstName + ' ' + lastName + '

    core:preferredTitle org from preferredTitle??

  • '); + // Build the content of each list item, piecing together each component + listItem = '
  • '; + if ( typeof image !== "undefined" ) { + listItem += ''+ label +''; + } + listItem += '

    '+ label +'

    '; + // Include the moniker only if it's not empty and not equal to the VClass name + if ( moniker != vclassName && moniker != "" ) { + listItem += '

    '+ moniker +'

    '; + } + listItem += '
  • '; + browseByVClass.individualsInVClass.append(listItem); }) // set selected class and alpha browseByVClass.selectedVClass(results.vclass.URI);