From 86a9c7804c368eaec907481743cca06fc0747cfa Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Thu, 5 Dec 2013 10:41:31 -0500 Subject: [PATCH 1/4] Changes to annotations on eagle-i properties for biological specimen and instrument --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 197 +++++++++++++++++-- 1 file changed, 180 insertions(+), 17 deletions(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 139583c1..e43c8d0d 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -1774,7 +1774,18 @@ vivo:Librarian . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . + geo:nameCurrencyFR rdfs:label "nameCurrencyFR"@en-US ; @@ -1858,7 +1869,21 @@ bibo:accepted rdfs:label "accepted"@en-US . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . vcard:Email 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 . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . + obo:ERO_0001261 rdfs:label "Analysis Service"@en-US ; vitro:inClassGroup . @@ -2624,7 +2659,21 @@ bibo:Website . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:BFO_0000003 rdfs:label "Occurrent" . @@ -2693,10 +2742,6 @@ obo:ERO_0000045 ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; vitro:inPropertyGroupAnnot . @@ -3945,7 +3990,22 @@ obo:ERO_0000572 rdfs:label "used to study"@en-US . obo:RO_0001000 - rdfs:label "derives from"@en-US . + rdfs:label "derives from"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "50"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + bibo:gtin14 rdfs:label "Global Trade Item Number (GTIN-14)"@en-US ; @@ -5673,7 +5733,22 @@ geo:nameShortEN . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + rdfs:label "has global count source"@en-US ; @@ -5779,7 +5854,22 @@ vivo:hasSuccessorOrganization "true"^^xsd:boolean . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + vivo:prerequisiteFor rdfs:label "prerequisite for"@en-US ; @@ -6050,7 +6140,22 @@ vcard:Muse rdfs:label "Muse"@en-US . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + geo:area rdfs:label "Area"@en-US ; @@ -6461,7 +6566,22 @@ vivo:distributes "true"^^xsd:boolean . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + vcard:hasFormattedName rdfs:label "has formatted name"@en-US . @@ -7160,7 +7280,22 @@ bibo:Statute . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + vivo:fundingVehicleFor rdfs:label "provides funding for"@en-US ; @@ -7241,7 +7376,21 @@ vivo:PostdoctoralTraining . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:OBI_0000417 rdfs:label "achieves planned objective"@en-US ; @@ -7303,7 +7452,21 @@ vcard:sound rdfs:label "sound"@en-US . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . bibo:numPages rdfs:label "number of pages"@en-US ; From 935d006963eace3545e16c0a54e28d9be901adcb Mon Sep 17 00:00:00 2001 From: tworrall Date: Thu, 5 Dec 2013 15:14:45 -0500 Subject: [PATCH 2/4] minor style changes for 2 column foaf person page --- productMods/css/individual/individual-2column-view.css | 1 + .../body/individual/individual--foaf-person-2column.ftl | 3 +++ 2 files changed, 4 insertions(+) diff --git a/productMods/css/individual/individual-2column-view.css b/productMods/css/individual/individual-2column-view.css index 71f2b279..081991d6 100644 --- a/productMods/css/individual/individual-2column-view.css +++ b/productMods/css/individual/individual-2column-view.css @@ -290,6 +290,7 @@ a#manageLabels { border-bottom: 1px solid #DDE4E3; padding-bottom:1px; margin-bottom:8px; + padding-top:18px; } #individual-info div#contactContainer h3{ color:#8aa149; diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 783105ff..2de768a2 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -96,6 +96,9 @@ <#include "individual-researchAreas.ftl"> + + <#include "individual-geographicFocus.ftl"> +
From 417179fd8165ca1e5751b2fdb0d6c389d998930c Mon Sep 17 00:00:00 2001 From: Jon Corson-Rikert Date: Thu, 5 Dec 2013 15:58:19 -0500 Subject: [PATCH 3/4] adding Organism to the class group publications (labeled research) to see if the derives from property works --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index ae1fc559..5121948c 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -3991,6 +3991,7 @@ obo:ERO_0000572 obo:RO_0001000 rdfs:label "derives from"@en-US ; + ## note -- has a "some values from" restriction on Organism vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot @@ -7598,7 +7599,7 @@ geo:GDPUnit vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + . bibo:edition rdfs:label "edition"@en-US ; @@ -7805,4 +7806,9 @@ vivo:hasEquipment "true"^^xsd:boolean . - rdfs:label "Organism"@en-US . + rdfs:label "Organism"@en-US ; + vitro:inClassGroup ; ## classgroup label is research + vitro:displayRankAnnot + "1"^^xsd:int . + + From 691da05ff82c83427ba9d20f23c9743ca2b32d3e Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Thu, 5 Dec 2013 16:05:22 -0500 Subject: [PATCH 4/4] data property adjustments --- rdf/tbox/filegraph/data-properties.owl | 33 -------------------------- 1 file changed, 33 deletions(-) diff --git a/rdf/tbox/filegraph/data-properties.owl b/rdf/tbox/filegraph/data-properties.owl index 5799c1e7..b7eaf46e 100644 --- a/rdf/tbox/filegraph/data-properties.owl +++ b/rdf/tbox/filegraph/data-properties.owl @@ -1132,17 +1132,8 @@ - - - - - - - - - @@ -1259,30 +1250,6 @@ - - - - - PERSON: Melissa Haendel - PERSON: Melissa Haendel - The accession number for a gene. - Unique identifier of a biological polymer sequence (DNA, RNA, protein) when it is submitted to a sequence database. - accession number - - - - - - - - - - - - - - -