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

[VIVO-1031] Improve management ["hide these"] pages

Browse source
This commit is contained in:
grahamtriggs 2015-10-20 13:38:53 +01:00
parent b1979d24c9
commit ce1bb9a9c9
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
View file

@ -71,13 +71,19 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
+ " ?subject <http://purl.obolibrary.org/obo/RO_0000053> ?role . \n" + " ?subject <http://purl.obolibrary.org/obo/RO_0000053> ?role . \n"
+ " ?role a core:ResearcherRole . \n" + " ?role a core:ResearcherRole . \n"
+ " ?role vitro:mostSpecificType ?subclass \n" + " ?role vitro:mostSpecificType ?subclass \n"
+ " OPTIONAL { ?role core:relatedBy ?activity . \n" + " OPTIONAL { \n"
+ " ?subject <http://purl.obolibrary.org/obo/RO_0000053> ?role . \n"
+ " ?role a core:ResearcherRole . \n"
+ " ?role core:relatedBy ?activity . \n"
+ " ?activity a core:Grant . \n" + " ?activity a core:Grant . \n"
+ " OPTIONAL {?activity rdfs:label ?label2} \n" + " ?activity rdfs:label ?label2 . \n"
+ " } \n" + " } \n"
+ " OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . \n" + " OPTIONAL { \n"
+ " ?subject <http://purl.obolibrary.org/obo/RO_0000053> ?role . \n"
+ " ?role a core:ResearcherRole . \n"
+ " ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . \n"
+ " ?activity a core:Project . \n" + " ?activity a core:Project . \n"
+ " OPTIONAL {?activity rdfs:label ?label2} \n" + " ?activity rdfs:label ?label2 . \n"
+ " } \n" + " } \n"
+ " OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n" + " OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n"
+ "} ORDER BY ?subclass ?label2"; + "} ORDER BY ?subclass ?label2";

15
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -70,10 +70,19 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
+ "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n" + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n"
+ " ?subject core:relatedBy ?authorship . \n" + " ?subject core:relatedBy ?authorship . \n"
+ " ?authorship a core:Authorship . \n" + " ?authorship a core:Authorship . \n"
+ " OPTIONAL { ?authorship core:relates ?pub . " + " OPTIONAL { \n "
+ " ?subject core:relatedBy ?authorship . \n"
+ " ?authorship a core:Authorship . \n"
+ " ?authorship core:relates ?pub . "
+ " ?pub a <http://purl.org/ontology/bibo/Document> . \n" + " ?pub a <http://purl.org/ontology/bibo/Document> . \n"
+ " ?pub rdfs:label ?label \n" + " ?pub rdfs:label ?label . \n"
+ " OPTIONAL { ?pub vitro:mostSpecificType ?subclass } \n" + " OPTIONAL { \n"
+ " ?subject core:relatedBy ?authorship . \n"
+ " ?authorship a core:Authorship . \n"
+ " ?authorship core:relates ?pub . "
+ " ?pub a <http://purl.org/ontology/bibo/Document> . \n"
+ " ?pub vitro:mostSpecificType ?subclass . \n"
+ " } \n"
+ " } \n" + " } \n"
+ " OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n" + " OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n"
+ "} ORDER BY ?subclass ?title"; + "} ORDER BY ?subclass ?title";