Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-11-22 09:57:06 -05:00
commit 92315f345c
2 changed files with 109 additions and 76 deletions

View file

@ -1,28 +1,28 @@
<#-- $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$ -->
<#--Two stage form for service provider role--> <#--Two stage form for service provider role-->
<#-- <#--
Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
roleDescriptor. roleDescriptor.
The other required values (roleType, optionsType, objectClassUri, and literalOptions are The other required values (roleType, optionsType, objectClassUri, and literalOptions are
set in the JAVA class corresponding to the form, e.g. AddMemberRoleToPersonGenerator.java. set in the JAVA class corresponding to the form, e.g. AddMemberRoleToPersonGenerator.java.
Optional values can be set, but each of these has default values Optional values can be set, but each of these has default values
set in addRoleToPersonTwoStage.ftl: set in addRoleToPersonTwoStage.ftl:
buttonText buttonText
typeSelectorLabel typeSelectorLabel
numDateFields numDateFields
showRoleLAbelField showRoleLAbelField
roleExamples--> roleExamples-->
<#--Variable assignments for Add Clinical Role To Person--> <#--Variable assignments for Add Clinical Role To Person-->
<#assign roleDescriptor = "${i18n().membership}" /> <#assign roleDescriptor = "${i18n().membership}" />
<#assign typeSelectorLabel = "${i18n().membership_in}" /> <#assign typeSelectorLabel = "${i18n().membership_in}" />
<#assign roleActivityVClass = "${i18n().organizations}" /> <#assign roleActivityVClass = "${i18n().organizations}" />
<#assign genericLabel = "${i18n().organization_capitalized}" /> <#assign genericLabel = "${i18n().organization_capitalized}" />
<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" /> <#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835'}" />
<#--Each of the two stage forms will include the form below--> <#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl"> <#include "addRoleToPersonTwoStage.ftl">

View file

@ -1,49 +1,82 @@
/* $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$ */
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator { public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String template = "addMemberRoleToPerson.ftl"; private static String template = "addMemberRoleToPerson.ftl";
private static String VCLASS_URI = "http://xmlns.com/foaf/0.1/Organization"; private static String VCLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
@Override @Override
String getTemplate() { String getTemplate() {
return template; return template;
} }
@Override @Override
String getRoleType() { String getRoleType() {
return "http://vivoweb.org/ontology/core#MemberRole"; return "http://vivoweb.org/ontology/core#MemberRole";
} }
@Override @Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new ChildVClassesOptions(VCLASS_URI) return new ConstantFieldOptions(
.setDefaultOptionLabel( "Select one"); "","Select type",
} "http://vivoweb.org/ontology/core#AcademicDepartment","Academic Department",
"http://vivoweb.org/ontology/core#Association","Association",
@Override "http://vivoweb.org/ontology/core#Center","Center",
boolean isShowRoleLabelField(){return true;} "http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization",
"http://vivoweb.org/ontology/core#College","College",
/* "http://vivoweb.org/ontology/core#Committee","Committee",
* Use the methods below to change the date/time precision in the "http://vivoweb.org/ontology/core#Company","Company",
* custom form associated with this generator. When not used, the "http://vivoweb.org/ontology/core#Consortium","Consortium",
* precision will be YEAR. The other precisons are MONTH, DAY, HOUR, "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
* MINUTE, TIME and NONE. "http://vivoweb.org/ontology/core#Department","Department",
*/ "http://vivoweb.org/ontology/core#Division","Division",
/* "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
public String getStartDatePrecision() { "http://vivoweb.org/ontology/core#Foundation","Foundation",
String precision = VitroVocabulary.Precision.MONTH.uri(); "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
return precision; "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
} "http://xmlns.com/foaf/0.1/Group","Group",
"http://vivoweb.org/ontology/core#Hospital","Hospital",
public String getEndDatePrecision() { "http://vivoweb.org/ontology/core#Institute","Institute",
String precision = VitroVocabulary.Precision.DAY.uri(); "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
return precision; "http://vivoweb.org/ontology/core#Library","Library",
} "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
*/ "http://vivoweb.org/ontology/core#Museum","Museum",
} "http://xmlns.com/foaf/0.1/Organization","Organization",
"http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
"http://vivoweb.org/ontology/core#Program","Program",
"http://vivoweb.org/ontology/core#Publisher","Publisher",
"http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
"http://vivoweb.org/ontology/core#School","School",
"http://vivoweb.org/ontology/core#Team","Team",
"http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
"http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
"http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
"http://vivoweb.org/ontology/core#University","University");
}
@Override
boolean isShowRoleLabelField(){return true;}
/*
* Use the methods below to change the date/time precision in the
* custom form associated with this generator. When not used, the
* precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
* MINUTE, TIME and NONE.
*/
/*
public String getStartDatePrecision() {
String precision = VitroVocabulary.Precision.MONTH.uri();
return precision;
}
public String getEndDatePrecision() {
String precision = VitroVocabulary.Precision.DAY.uri();
return precision;
}
*/
}