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

Faux data properties and fixes for current faux properties view (#352)

Browse source 
* Faux data properties

* Use not disjointed classes for faux properties domain and range options

* Fix faux object property shadowing real property
List faux data properties
List faux properties which base properties domain don't match current subject

* Write exception to log in VClassDaoJena

* filter faux properties returned in possiblePropInstForIndividual

* safety checks added

* extracted getBaseLabel method, fixed base labels for data properties

* fix for prev commit

* Formatting fixes

* More formatting fixes

* More formatting fixes

* More formatting fixes

* More formatting fixes

* More formatting fixes

Co-authored-by: Georgy Litvinov <georgy.litvinov@tib.eu>
This commit is contained in:
Georgy Litvinov 2022-12-16 11:40:49 +01:00 • committed by GitHub
parent c885162d8d
commit a0a1a6664b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 1088 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

45
webapp/src/main/webapp/templates/edit/specific/dataprops_edit.jsp
View file

@ -71,6 +71,51 @@
</td>
</tr>
<tr><td colspan="3"><hr/></td></tr>
<!-- _____________________________________________ faux properties __________________________________________ -->
<tr valign="bottom" align="center">
<td colspan="2" valign="bottom" align="left">
<c:if test="${!empty fauxproperties}">
<c:forEach var="fauxproperty" items="${fauxproperties}">
<ul style="list-style-type:none;">
<li>
<c:choose>
<c:when test="${empty fauxproperty.domainLabel}">
<c:url var="fauxpropertyURL" value="editForm">
<c:param name="controller" value="FauxProperty"/>
<c:param name="baseUri" value="${datatypeProperty.URI}"/>
<c:param name="rangeUri" value="${fauxproperty.rangeURI}" />
</c:url>
<a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
no domain,
</c:when>
<c:otherwise>
<c:url var="fauxpropertyURL" value="editForm">
<c:param name="controller" value="FauxProperty"/>
<c:param name="baseUri" value="${datatypeProperty.URI}"/>
<c:param name="domainUri" value="${fauxproperty.domainURI}" />
<c:param name="rangeUri" value="${fauxproperty.rangeURI}" />
</c:url>
<a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
domain: ${fauxproperty.domainLabel},
</c:otherwise>
</c:choose>
range: ${fauxproperty.rangeLabel}
</li>
</ul>
</c:forEach>
</c:if>
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="create" value="create"/>
<input type="hidden" name="baseUri" value="${datatypeProperty.URI}"/>
<input type="hidden" name="controller" value="FauxProperty"/>
<input type="submit" class="form-button" value="Create New Faux Property"/>
</form>
</td>
</tr>
<tr><td colspan="3"><hr/></td></tr>
<!-- _____________________________________________ superproperties __________________________________________ -->
<tr valign="bottom" align="center">

6
webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
View file

@ -40,7 +40,7 @@
<tbody>
<tr>
<td class="classDetail">${i18n().base_property_capitalized}:</td>
<td><a href='propertyEdit?uri=${ks["baseURI"]?url!}'>${ks["base"]!}</a></td>
<td><a href='${ks["editUrl"]}?uri=${ks["baseURI"]?url!}'>${ks["base"]!}</a></td>
</tr>
<tr>
<td class="classDetail">${i18n().group_capitalized}:</td>
@ -66,12 +66,13 @@
<#assign baseLabel = key?substring(0,key?index_of("|")) />
<#assign baseUri = key?substring(key?index_of("|")+1) />
<div>
<a href='propertyEdit?uri=${baseUri?url}'>${baseLabel}</a>
<a href='${fauxList["editUrl"]}?uri=${baseUri?url}'>${baseLabel}</a>
</div>
<#assign keysTwo = fauxList?keys />
<#assign firstLoop = true />
<#list keysTwo as k2>
<#assign faux = fauxList[k2] />
<#if faux?is_hash >
<table id="classHierarchy1" class="classHierarchy" <#if !firstLoop >style="margin-top:-16px"</#if>>
<tbody>
<tr>
@ -94,6 +95,7 @@
</tbody>
</table>
<#assign firstLoop = false />
</#if>
</#list>
</section>
</#list>