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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-21 15:07:03 -05:00
commit 4b7ba331cc
4 changed files with 102 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

57
productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
View file

@ -1,29 +1,30 @@
<#-- $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. AddOutreachProviderRoleToPersonGenerator.java. set in the JAVA class corresponding to the form, e.g. AddOutreachProviderRoleToPersonGenerator.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().outreach_comm_service}" /> <#assign roleDescriptor = "${i18n().outreach_comm_service}" />
<#assign typeSelectorLabel = "${i18n().outreach_comm_service_in}" /> <#assign typeSelectorLabel = "${i18n().outreach_comm_service_in}" />
<#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,http://purl.org/NET/c4dm/event.owl#Event'}" />
<#--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">

57
productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
View file

@ -1,29 +1,30 @@
<#-- $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. AddServiceProviderRoleToPersonGenerator.java. set in the JAVA class corresponding to the form, e.g. AddServiceProviderRoleToPersonGenerator.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 Service Provider Role To Person--> <#--Variable assignments for Add Service Provider Role To Person-->
<#assign roleDescriptor = "${i18n().service_to_profession}" /> <#assign roleDescriptor = "${i18n().service_to_profession}" />
<#assign typeSelectorLabel = "${i18n().service_to_profession_in}" /> <#assign typeSelectorLabel = "${i18n().service_to_profession_in}" />
<#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,http://purl.org/NET/c4dm/event.owl#Event'}" />
<#--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">

6
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
View file

@ -26,11 +26,13 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new ConstantFieldOptions( return new ConstantFieldOptions(
"","Select type", "","Select type",
"http://vivoweb.org/ontology/core#AcademicDepartment","Academic Department",
"http://vivoweb.org/ontology/core#Association","Association", "http://vivoweb.org/ontology/core#Association","Association",
"http://vivoweb.org/ontology/core#Center","Center", "http://vivoweb.org/ontology/core#Center","Center",
"http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization", "http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization",
"http://vivoweb.org/ontology/core#College","College", "http://vivoweb.org/ontology/core#College","College",
"http://vivoweb.org/ontology/core#Committee","Committee", "http://vivoweb.org/ontology/core#Committee","Committee",
"http://vivoweb.org/ontology/core#Company","Company",
"http://vivoweb.org/ontology/core#Consortium","Consortium", "http://vivoweb.org/ontology/core#Consortium","Consortium",
"http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory", "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
"http://vivoweb.org/ontology/core#Department","Department", "http://vivoweb.org/ontology/core#Department","Department",
@ -40,18 +42,20 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
"http://vivoweb.org/ontology/core#Foundation","Foundation", "http://vivoweb.org/ontology/core#Foundation","Foundation",
"http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization", "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
"http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency", "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
"http://xmlns.com/foaf/0.1/Group","Group",
"http://vivoweb.org/ontology/core#Hospital","Hospital", "http://vivoweb.org/ontology/core#Hospital","Hospital",
"http://vivoweb.org/ontology/core#Institute","Institute", "http://vivoweb.org/ontology/core#Institute","Institute",
"http://vivoweb.org/ontology/core#Laboratory","Laboratory", "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
"http://vivoweb.org/ontology/core#Library","Library", "http://vivoweb.org/ontology/core#Library","Library",
"http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
"http://vivoweb.org/ontology/core#Museum","Museum", "http://vivoweb.org/ontology/core#Museum","Museum",
"http://xmlns.com/foaf/0.1/Organization","Organization", "http://xmlns.com/foaf/0.1/Organization","Organization",
"http://vivoweb.org/ontology/core#PrivateCompany","Private Company", "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
"http://vivoweb.org/ontology/core#Program","Program", "http://vivoweb.org/ontology/core#Program","Program",
"http://vivoweb.org/ontology/core#Publisher","Publisher", "http://vivoweb.org/ontology/core#Publisher","Publisher",
"http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization", "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
"http://vivoweb.org/ontology/core#Team","Team",
"http://vivoweb.org/ontology/core#School","School", "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#ServiceProvidingLaboratory","Service Providing Lab",
"http://vivoweb.org/ontology/core#StudentOrganization","Student Organization", "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
"http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office", "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",

45
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
View file

@ -3,7 +3,7 @@
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.ChildVClassesOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator { public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
@ -21,11 +21,44 @@ public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoS
/** Service Provider role involves hard-coded options for the /** Service Provider role involves hard-coded options for the
* "right side" of the role or activity. */ * "right side" of the role or activity. */
@Override @Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new return new ConstantFieldOptions(
ChildVClassesOptions(OPTION_CLASS_URI) "","Select type",
.setDefaultOptionLabel("Select type"); "http://vivoweb.org/ontology/core#AcademicDepartment","Academic Department",
} "http://vivoweb.org/ontology/core#Association","Association",
"http://vivoweb.org/ontology/core#Center","Center",
"http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization",
"http://vivoweb.org/ontology/core#College","College",
"http://vivoweb.org/ontology/core#Committee","Committee",
"http://vivoweb.org/ontology/core#Company","Company",
"http://vivoweb.org/ontology/core#Consortium","Consortium",
"http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
"http://vivoweb.org/ontology/core#Department","Department",
"http://vivoweb.org/ontology/core#Division","Division",
"http://purl.org/NET/c4dm/event.owl#Event","Event",
"http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
"http://vivoweb.org/ontology/core#Foundation","Foundation",
"http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
"http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
"http://xmlns.com/foaf/0.1/Group","Group",
"http://vivoweb.org/ontology/core#Hospital","Hospital",
"http://vivoweb.org/ontology/core#Institute","Institute",
"http://vivoweb.org/ontology/core#Laboratory","Laboratory",
"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 @Override
boolean isShowRoleLabelField(){return true;} boolean isShowRoleLabelField(){return true;}