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

updates for concepts and labels

Browse source
This commit is contained in:
hudajkhan 2013-09-24 13:44:58 -04:00
parent 213f8ffd91
commit 91fd8a4c1b
11 changed files with 792 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

6
productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
View file

@ -8,6 +8,12 @@
<label for="firstName">${i18n().first_name} ${requiredHint}</label>
<input size="30" type="text" id="firstName" name="firstName" value="${firstNameValue}" />
</p>
<#--TODO: With ISF changes, add middle name input-->
<!--p-->
<!--label for="middleName">${i18n().middle_name} ${requiredHint}</label>
<input size="30" type="text" id="middleName" name="middleName" value="${middleNameValue}" />
</p-->
<p>
<label for="lastName">${i18n().last_name} ${requiredHint}</label>

3
productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
View file

@ -5,6 +5,9 @@
<#--Get existing value for specific data literals and uris, in case the form is returned because of an error-->
<#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName")/>
<#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName")/>
<#--With ISF changes, we also have a niddle name value, also add error field below-->
<#--assign middleNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "middleName") /-->
<#assign labelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "label")/>
<#assign newLabelLanguageValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "newLabelLanguage")/>

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

@ -101,9 +101,8 @@
<form id="addConceptForm" class="customForm" action="${submitUrl}">
<#assign checkedSource = false />
<h4 class="services">${i18n().external_vocabulary_services}</h4>
<#list sources?keys?sort as sourceUri>
<#assign thisSource = sources[sourceUri]/>
<input type="radio" name="source" value="${sourceUri}" role="radio" <#if checkedSource = false><#assign checkedSource = true/>checked="checked"</#if>>
<#list sources?values?sort_by("label") as thisSource>
<input type="radio" name="source" value="${thisSource.url}" role="radio" <#if checkedSource = false><#assign checkedSource = true/>checked="checked"</#if>>
<label class="inline" for="${thisSource.label}"> <a href="${thisSource.url}">${thisSource.label}</a> &nbsp;(${thisSource.description})</label>
<br />
</#list>
@ -180,6 +179,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarke
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/addConcept.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/json2.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/addConcept.js"></script>')}

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

@ -321,8 +321,11 @@ var addConceptForm = {
this.externalConceptLabel.val(conceptLabels);
this.externalConceptSource.val(conceptSources);
this.externalConceptSemanticTypeLabel.val(conceptSemanticTypes);
this.externalConceptBroaderUris.val(conceptBroaderUris);
this.externalConceptNarrowerUris.val(conceptNarrowerUris);
//Using JSON here because there may be multiple broader and narrower uris per concept
//and using a regular string representation does not differentiate between which set of uris
//would belong to which concept
this.externalConceptBroaderUris.val(JSON.stringify(conceptBroaderUris));
this.externalConceptNarrowerUris.val(JSON.stringify(conceptNarrowerUris));
return true;
},