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

External vocabulary service and integration of Agrovoc with work beginning for applying concept semantic type to UMLS concepts.

Browse source
This commit is contained in:
hudajkhan 2013-08-07 16:08:11 -04:00
parent 9fda9d2922
commit 2ea474b6ef
44 changed files with 1387 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- List of positions for the individual -->
<#-- List of positions for the individual --> <h3>Positions!${core}personInPosition</h3>
<#assign positions = propertyGroups.pullProperty("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = positions.localName>

5
productMods/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
View file

@ -2,6 +2,9 @@
<#-- List of research areas for the individual -->
<#assign researchAreas = propertyGroups.pullProperty("${core}hasResearchArea")!>
<#assign concepts = propertyGroups.pullProperty("${core}hasAssociatedConcept")!>
<#if concepts?has_content> concepts has content <#else> concepts dont have content</#if>
<h2>RESEARCH AREAS: ${core}hasResearchArea</h2>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = researchAreas.localName>
<h2 id="${localName}" class="mainPropGroup">
@ -11,5 +14,5 @@
</h2>
<ul id="individual-${localName}" role="list" >
<@p.objectProperty researchAreas editable />
</ul>
</ul> <#else> Research areas does not have content
</#if>

3
productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
View file

@ -96,6 +96,9 @@
<input type="hidden" id="conceptNode" name="conceptNode" value=""/> <!-- Field value populated by JavaScript -->
<input type="hidden" id="conceptLabel" name="conceptLabel" value="" /> <!-- Field value populated by JavaScript -->
<input type="hidden" id="conceptSource" name="conceptSource" value="" /> <!-- Field value populated by JavaScript -->
<input type="hidden" id="conceptSemanticTypeURI" name="conceptSemanticTypeURI" value="" /> <!-- Field value populated by JavaScript -->
<input type="hidden" id="conceptSemanticTypeLabel" name="conceptSemanticTypeLabel" value="" /> <!-- Field value populated by JavaScript -->
<div id="selectedConcept" name="selectedConcept" class="acSelection">
<p class="inline">
</p>

7
productMods/templates/freemarker/edit/forms/js/addConcept.js
View file

@ -54,6 +54,7 @@ var addConceptForm = {
this.externalConceptURI = $('#conceptNode');
this.externalConceptLabel = $('#conceptLabel');
this.externalConceptSource = $('#conceptSource');
this.externalConceptSemanticTypeLabel = $("#conceptSemanticTypeLabel");
//remove links
this.removeConceptLinks = $('a.remove');
this.errors = $('#errors');
@ -236,23 +237,27 @@ var addConceptForm = {
}
var i;
var len = checkedElements.length;
var checkedConcept, checkedConceptElement, conceptLabel, conceptSource;
var checkedConcept, checkedConceptElement, conceptLabel, conceptSource, conceptSemanticType;
var conceptNodes = [];
var conceptLabels = [];
var conceptSources = [];
var conceptSemanticTypes = [];
checkedElements.each(function() {
checkedConceptElement = $(this);
checkedConcept = checkedConceptElement.val();
conceptLabel = checkedConceptElement.attr("label");
conceptSource = checkedConceptElement.attr("conceptDefinedBy");
conceptSemanticType = checkedConceptElement.attr("conceptType");
conceptNodes.push(checkedConcept);
conceptLabels.push(conceptLabel);
conceptSources.push(conceptSource);
conceptSemanticTypes.push(conceptSemanticType);
});
this.externalConceptURI.val(conceptNodes);
this.externalConceptLabel.val(conceptLabels);
this.externalConceptSource.val(conceptSources);
this.externalConceptSemanticTypeLabel.val(conceptSemanticTypes);
return true;
},
generateIndividualConceptDisplay: function(cuiURI, label, definition, type, definedBy, isBestMatch) {