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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
hudajkhan 2013-12-05 16:22:07 -05:00
commit 3fbefbbe35
9 changed files with 270 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/WEB-INF/resources/reasoner_plugins.txt
View file

@ -0,0 +1 @@
edu.cornell.mannlib.vitro.webapp.reasoner.plugin.DisableSameAs

1
productMods/css/individual/individual-2column-view.css
View file

@ -290,6 +290,7 @@ a#manageLabels {
border-bottom: 1px solid #DDE4E3; border-bottom: 1px solid #DDE4E3;
padding-bottom:1px; padding-bottom:1px;
margin-bottom:8px; margin-bottom:8px;
padding-top:18px;
} }
#individual-info div#contactContainer h3{ #individual-info div#contactContainer h3{
color:#8aa149; color:#8aa149;

7
productMods/js/homePageMaps.js
View file

@ -18,14 +18,14 @@ $(document).ready(function(){
buildGlobalMap(); buildGlobalMap();
$(this).addClass("selected"); $(this).addClass("selected");
$('a#countryLink').removeClass("selected"); $('a#countryLink').removeClass("selected");
$('a#nyLink').removeClass("selected"); $('a#localLink').removeClass("selected");
}); });
$('a#countryLink').click(function() { $('a#countryLink').click(function() {
buildCountryMap(); buildCountryMap();
$(this).addClass("selected"); $(this).addClass("selected");
$('a#globalLink').removeClass("selected"); $('a#globalLink').removeClass("selected");
$('a#nyLink').removeClass("selected"); $('a#localLink').removeClass("selected");
}); });
$('a#localLink').click(function() { $('a#localLink').click(function() {
@ -369,10 +369,11 @@ $(document).ready(function(){
var html = i18nStrings.currentlyNoResearchers; var html = i18nStrings.currentlyNoResearchers;
$('section#home-geo-focus div#timeIndicatorGeo span').html(html); $('section#home-geo-focus div#timeIndicatorGeo span').html(html);
$('section#home-geo-focus').css("height","175px"); $('section#home-geo-focus').css("height","175px");
$('section#home-geo-focus div#timeIndicator').css("margin-top","50px"); $('section#home-geo-focus div#timeIndicatorGeo').css("margin-top","50px");
$('section#home-geo-focus div#mapGlobal').hide(); $('section#home-geo-focus div#mapGlobal').hide();
$('section#home-geo-focus div#mapCountry').hide(); $('section#home-geo-focus div#mapCountry').hide();
$('section#home-geo-focus div#mapLocal').hide(); $('section#home-geo-focus div#mapLocal').hide();
$('section#home-geo-focus div#mapControls').hide();
} }
else { else {
$.each(results, function() { $.each(results, function() {

3
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -96,6 +96,9 @@
<!-- Research Areas --> <!-- Research Areas -->
<#include "individual-researchAreas.ftl"> <#include "individual-researchAreas.ftl">
<!-- Geographic Focus -->
<#include "individual-geographicFocus.ftl">
<!-- Contact and Webpages --> <!-- Contact and Webpages -->
<div id="contactsWebpages"> <div id="contactsWebpages">
<div id="contactContainer" > <div id="contactContainer" >

27
productMods/templates/freemarker/body/menupage/testMenuEdit.ftl
View file

@ -1,27 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--
Menu Edit Form
Associated with generator:
edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.MenuEditingFormGenerator
-->
<h2>${editConfiguration.formTitle}</h2>
<#assign pageTitle = editConfiguration.literalValues["title"].getString() />
<form class="editForm" action = "${editConfiguration.submitToUrl}">
<input name="title" id="title" value="${pageTitle}">
<input type="hidden" name="editKey" value="${editConfiguration.editKey}" />
<div style="margin-top: 0.2em">
<input type="submit" value="${editConfiguration.submitLabel}" />
</div>
</form>
<@dumpAll/>

33
rdf/tbox/filegraph/data-properties.owl
View file

@ -1132,17 +1132,8 @@
<owl:Class> <owl:Class>
<owl:unionOf rdf:parseType="Collection"> <owl:unionOf rdf:parseType="Collection">
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000004"/> <rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000004"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000008"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000009"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000020"/> <rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000020"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000161"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000162"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000285"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000630"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0001194"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0001200"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/OBI_0100026"/> <rdf:Description rdf:about="http://purl.obolibrary.org/obo/OBI_0100026"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/OBI_0400147"/>
</owl:unionOf> </owl:unionOf>
</owl:Class> </owl:Class>
</rdfs:domain> </rdfs:domain>
@ -1259,30 +1250,6 @@
<!-- http://purl.obolibrary.org/obo/ERO_0000405 -->
<owl:DatatypeProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000405">
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The accession number for a gene.</obo:IAO_0000112>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Unique identifier of a biological polymer sequence (DNA, RNA, protein) when it is submitted to a sequence database.</obo:IAO_0000115>
<obo:IAO_0000111 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">accession number</obo:IAO_0000111>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000120"/>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
<rdfs:domain>
<owl:Class>
<owl:unionOf rdf:parseType="Collection">
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000161"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000285"/>
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000404"/>
</owl:unionOf>
</owl:Class>
</rdfs:domain>
</owl:DatatypeProperty>
<!-- http://purl.obolibrary.org/obo/ERO_0000424 --> <!-- http://purl.obolibrary.org/obo/ERO_0000424 -->
<owl:DatatypeProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000424"> <owl:DatatypeProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000424">

18
rdf/tbox/filegraph/research-resource.owl
View file

@ -153,6 +153,7 @@
<owl:Class rdf:about="http://purl.obolibrary.org/obo/ERO_0000014"> <owl:Class rdf:about="http://purl.obolibrary.org/obo/ERO_0000014">
<rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/> <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/OBI_0000011"/>
<rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#Project"/>
<rdfs:subClassOf> <rdfs:subClassOf>
<owl:Restriction> <owl:Restriction>
<owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/> <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
@ -491,4 +492,21 @@
<obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/> <obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
</owl:Class> </owl:Class>
<!-- http://purl.obolibrary.org/obo/OBI_0100026 -->
<owl:Class rdf:about="http://purl.obolibrary.org/obo/OBI_0100026">
<rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/BFO_0000040"/>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">GROUP: OBI Biomaterial Branch</obo:IAO_0000117>
<obo:IAO_0000115 xml:lang="en">A material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs.</obo:IAO_0000115>
<obo:IAO_0000119 xml:lang="en">WEB: http://en.wikipedia.org/wiki/Organism</obo:IAO_0000119>
<obo:IAO_0000112 xml:lang="en">animal</obo:IAO_0000112>
<obo:IAO_0000112 xml:lang="en">fungus</obo:IAO_0000112>
<obo:IAO_0000111 xml:lang="en">organism</obo:IAO_0000111>
<obo:IAO_0000112 xml:lang="en">plant</obo:IAO_0000112>
<obo:IAO_0000112 xml:lang="en">virus</obo:IAO_0000112>
<obo:IAO_0000114 rdf:resource="http://purl.obolibrary.org/obo/IAO_0000121"/>
<obo:IAO_0000412 rdf:resource="http://purl.obolibrary.org/obo/obi.owl"/>
</owl:Class>
</rdf:RDF> </rdf:RDF>

208
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -1774,7 +1774,18 @@ vivo:Librarian
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0000050 obo:ERO_0000050
rdfs:label "model number"@en-US . rdfs:label "model number"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"76"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
geo:nameCurrencyFR geo:nameCurrencyFR
rdfs:label "nameCurrencyFR"@en-US ; rdfs:label "nameCurrencyFR"@en-US ;
@ -1858,7 +1869,21 @@ bibo:accepted
rdfs:label "accepted"@en-US . rdfs:label "accepted"@en-US .
obo:ERO_0000070 obo:ERO_0000070
rdfs:label "used by"@en-US . rdfs:label "used by"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"15"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vcard:Email vcard:Email
rdfs:label "Email"@en-US . rdfs:label "Email"@en-US .
@ -2517,8 +2542,18 @@ bibo:identifier
"Unique identifier of a document or collection. This data property is not seen or updated by anyone."^^xsd:string . "Unique identifier of a document or collection. This data property is not seen or updated by anyone."^^xsd:string .
obo:ERO_0000044 obo:ERO_0000044
rdfs:label "has inventory number"@en-US . rdfs:label "inventory number"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"70"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
obo:ERO_0001261 obo:ERO_0001261
rdfs:label "Analysis Service"@en-US ; rdfs:label "Analysis Service"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupactivities> . vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupactivities> .
@ -2624,7 +2659,21 @@ bibo:Website
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0001057 obo:ERO_0001057
rdfs:label "has preparation technique"@en-US . rdfs:label "has preparation technique"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"53"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
obo:BFO_0000003 obo:BFO_0000003
rdfs:label "Occurrent" . rdfs:label "Occurrent" .
@ -2693,10 +2742,6 @@ obo:ERO_0000045
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> . <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
@ -3945,7 +3990,23 @@ obo:ERO_0000572
rdfs:label "used to study"@en-US . rdfs:label "used to study"@en-US .
obo:RO_0001000 obo:RO_0001000
rdfs:label "derives from"@en-US . rdfs:label "derives from"@en-US ;
## note -- has a "some values from" restriction on Organism <http://purl.obolibrary.org/obo/OBI_0100026>
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"50"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
bibo:gtin14 bibo:gtin14
rdfs:label "Global Trade Item Number (GTIN-14)"@en-US ; rdfs:label "Global Trade Item Number (GTIN-14)"@en-US ;
@ -5673,7 +5734,22 @@ geo:nameShortEN
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:RO_0003001 obo:RO_0003001
rdfs:label "produced by"@en-US . rdfs:label "produced by"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"60"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
<http://purl.org/spar/c4o/hasGlobalCountSource> <http://purl.org/spar/c4o/hasGlobalCountSource>
rdfs:label "has global count source"@en-US ; rdfs:label "has global count source"@en-US ;
@ -5779,7 +5855,22 @@ vivo:hasSuccessorOrganization
"true"^^xsd:boolean . "true"^^xsd:boolean .
obo:RO_0003000 obo:RO_0003000
rdfs:label "produces"@en-US . rdfs:label "produces"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"63"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vivo:prerequisiteFor vivo:prerequisiteFor
rdfs:label "prerequisite for"@en-US ; rdfs:label "prerequisite for"@en-US ;
@ -6050,7 +6141,22 @@ vcard:Muse
rdfs:label "Muse"@en-US . rdfs:label "Muse"@en-US .
obo:ERO_0000034 obo:ERO_0000034
rdfs:label "has manufacturer"@en-US . rdfs:label "manufacturer"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"73"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
geo:area geo:area
rdfs:label "Area"@en-US ; rdfs:label "Area"@en-US ;
@ -6461,7 +6567,22 @@ vivo:distributes
"true"^^xsd:boolean . "true"^^xsd:boolean .
obo:OBI_0000304 obo:OBI_0000304
rdfs:label "is manufactured by"@en-US . rdfs:label "manufactured by"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"73"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vcard:hasFormattedName vcard:hasFormattedName
rdfs:label "has formatted name"@en-US . rdfs:label "has formatted name"@en-US .
@ -7160,7 +7281,22 @@ bibo:Statute
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0000405 obo:ERO_0000405
rdfs:label "has accession number"@en-US . rdfs:label "has accession number"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"10"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
vivo:fundingVehicleFor vivo:fundingVehicleFor
rdfs:label "provides funding for"@en-US ; rdfs:label "provides funding for"@en-US ;
@ -7241,7 +7377,21 @@ vivo:PostdoctoralTraining
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
obo:ERO_0000918 obo:ERO_0000918
rdfs:label "related research project"@en-US . rdfs:label "related research project"@en-US ;
vitro:displayLimitAnnot
"2"^^xsd:int ;
vitro:displayRankAnnot
"20"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
obo:OBI_0000417 obo:OBI_0000417
rdfs:label "achieves planned objective"@en-US ; rdfs:label "achieves planned objective"@en-US ;
@ -7303,7 +7453,21 @@ vcard:sound
rdfs:label "sound"@en-US . rdfs:label "sound"@en-US .
obo:ERO_0000543 obo:ERO_0000543
rdfs:label "related technique"@en-US . rdfs:label "related technique"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"80"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
bibo:numPages bibo:numPages
rdfs:label "number of pages"@en-US ; rdfs:label "number of pages"@en-US ;
@ -7435,7 +7599,7 @@ geo:GDPUnit
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
bibo:edition bibo:edition
rdfs:label "edition"@en-US ; rdfs:label "edition"@en-US ;
@ -7640,3 +7804,11 @@ vivo:hasEquipment
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot vitro:selectFromExistingAnnot
"true"^^xsd:boolean . "true"^^xsd:boolean .
<http://purl.obolibrary.org/obo/OBI_0100026>
rdfs:label "Organism"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ; ## classgroup label is research
vitro:displayRankAnnot
"1"^^xsd:int .

104
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java
View file

@ -1,51 +1,53 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator { public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String template = "addResearcherRoleToPerson.ftl"; private static String template = "addResearcherRoleToPerson.ftl";
@Override @Override
String getTemplate() { String getTemplate() {
return template; return template;
} }
@Override @Override
public String getRoleType() { public String getRoleType() {
return "http://vivoweb.org/ontology/core#ResearcherRole"; return "http://vivoweb.org/ontology/core#ResearcherRole";
} }
/** Researcher role involves hard-coded options for the "right side" of the role or activity. */ /** Researcher role involves hard-coded options for the "right side" of the role or activity. */
@Override @Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new ConstantFieldOptions( return new ConstantFieldOptions(
"", "Select one", "", "Select one",
"http://vivoweb.org/ontology/core#Grant", "Grant", "http://vivoweb.org/ontology/core#Grant", "Grant",
"http://vivoweb.org/ontology/core#Project", "Project"); "http://purl.obolibrary.org/obo/ERO_0000015", "Human Study",
} "http://vivoweb.org/ontology/core#Project", "Project",
"http://purl.obolibrary.org/obo/ERO_0000014", "Research Project");
@Override }
boolean isShowRoleLabelField() { return true; }
/* @Override
* Use the methods below to change the date/time precision in the boolean isShowRoleLabelField() { return true; }
* custom form associated with this generator. When not used, the /*
* precision will be YEAR. The other precisons are MONTH, DAY, HOUR, * Use the methods below to change the date/time precision in the
* MINUTE, TIME and NONE. * custom form associated with this generator. When not used, the
*/ * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
/* * MINUTE, TIME and NONE.
public String getStartDatePrecision() { */
String precision = VitroVocabulary.Precision.MONTH.uri(); /*
return precision; public String getStartDatePrecision() {
} String precision = VitroVocabulary.Precision.MONTH.uri();
return precision;
public String getEndDatePrecision() { }
String precision = VitroVocabulary.Precision.DAY.uri();
return precision; public String getEndDatePrecision() {
} String precision = VitroVocabulary.Precision.DAY.uri();
*/ return precision;
} }
*/
}