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

qrCodes changes to handle exception more gracefully, grants list view now displays the dates from the grant if they are not at the role level.

Browse source
This commit is contained in:
tworrall 2012-01-13 15:22:37 +00:00
parent 313463d37e
commit 3273fce539
4 changed files with 75 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
productMods/config/listViewConfig-hasInvestigatorRole.xml
View file

@ -18,7 +18,9 @@
?adminedBy ?adminedBy
?awardedByLabel ?awardedByLabel
?adminedByLabel ?adminedByLabel
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStartRole ?dateTimeEndRole
?dateTimeStartGrant ?dateTimeEndGrant
WHERE {
?subject ?property ?role ?subject ?property ?role
@ -48,12 +50,22 @@
} }
OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeIntervalRole core:start ?dateTimeStartValueRole .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole
} }
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . OPTIONAL { ?dateTimeIntervalRole core:end ?dateTimeEndValueRole .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
}
}
OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role core:roleContributesTo ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant
OPTIONAL { ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
}
OPTIONAL { ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} }
} }
<critical-data-required> <critical-data-required>
@ -149,14 +161,14 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeIntervalRole core:start ?dateTimeStartValueRole .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeIntervalRole core:start ?dateTimeStartValueRole .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole
} }
</query-construct> </query-construct>
@ -164,14 +176,47 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeIntervalRole core:end ?dateTimeEndValueRole .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeIntervalRole core:end ?dateTimeEndValueRole .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role core:roleContributesTo ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} WHERE {
?subject ?property ?role .
?role core:roleContributesTo ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role core:roleContributesTo ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} WHERE {
?subject ?property ?role .
?role core:roleContributesTo ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} }
</query-construct> </query-construct>

11
productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
View file

@ -1,11 +1,10 @@
<#-- $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$ -->
<#-- Page providing options for disseminating QR codes --> <#-- Page providing options for disseminating QR codes -->
<#assign qrCodeWidth = "150">
<#include "individual-qrCodeGenerator.ftl"> <#include "individual-qrCodeGenerator.ftl">
<#assign qrCodeWidth = "150">
<h2>Export QR Code <em>(<a href="${individual.qrData().aboutQrCodesUrl}" title="More info on QR codes">What is this?</a>)</em></h2> <h2>Export QR Code <em>(<a href="${individual.qrData().aboutQrCodesUrl}" title="More info on QR codes">What is this?</a>)</em></h2>
<#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" > <#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" >
@ -15,17 +14,17 @@
<section class="vcard"> <section class="vcard">
<h4>VCard</h4> <h4>VCard</h4>
<@qrCodeVCard qrCodeWidth="150" /> <@qrCodeVCard qrCodeWidth />
<textarea name="qrCodeVCard" readonly> <textarea name="qrCodeVCard" readonly>
&lt;img src="${getQrCodeUrlForVCard(qrCodeWidth)}" /&gt;<#t> &lt;img src="${getQrCodeUrlForVCard(qrCodeWidth)!}" /&gt;<#t>
</textarea><#t> </textarea><#t>
</section> </section>
<section> <section>
<h4>Hyperlink</h4> <h4>Hyperlink</h4>
<@qrCodeLink qrCodeWidth="150" /> <@qrCodeLink qrCodeWidth />
<textarea name="qrCodeLink" readonly> <textarea name="qrCodeLink" readonly>
&lt;img src="${getQrCodeUrlForLink(qrCodeWidth)}" /&gt;<#t> &lt;img src="${getQrCodeUrlForLink(qrCodeWidth)!}" /&gt;<#t>
</textarea><#t> </textarea><#t>
</section> </section>

4
productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
View file

@ -4,7 +4,7 @@
<#macro qrCodeVCard qrCodeWidth> <#macro qrCodeVCard qrCodeWidth>
<#local qrCodeUrl = getQrCodeUrlForVCard(qrCodeWidth)> <#local qrCodeUrl = getQrCodeUrlForVCard(qrCodeWidth)!>
<#if qrCodeUrl != ""> <#if qrCodeUrl != "">
<img src="${qrCodeUrl}" /> <img src="${qrCodeUrl}" />
@ -13,7 +13,7 @@
<#macro qrCodeLink qrCodeWidth> <#macro qrCodeLink qrCodeWidth>
<#local qrCodeUrl = getQrCodeUrlForLink(qrCodeWidth)> <#local qrCodeUrl = getQrCodeUrlForLink(qrCodeWidth)!>
<#if qrCodeUrl != ""> <#if qrCodeUrl != "">
<img src="${qrCodeUrl}" /> <img src="${qrCodeUrl}" />

6
productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
View file

@ -31,7 +31,11 @@
</#local> </#local>
<#local dateTime> <#local dateTime>
<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> <#if statement.dateTimeStartRole?has_content >
<@dt.yearIntervalSpan "${statement.dateTimeStartRole!}" "${statement.dateTimeEndRole!}" />
<#else>
<@dt.yearIntervalSpan "${statement.dateTimeStartGrant!}" "${statement.dateTimeEndGrant!}" />
</#if>
</#local> </#local>
${linkedIndividual} ${awardOrAdminBy} ${dateTime!} ${linkedIndividual} ${awardOrAdminBy} ${dateTime!}