diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 7583c0d9..9fecf9f1 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -110,12 +110,17 @@ ?role <${endYearUri}> ?endYear . + + ?role <${label}> ?roleLabel . + + @prefix core: <${vivoCore}> . ?person ?rolePredicate ?role. ?role a <${roleType}> . ?role core:roleIn ?roleActivity . + ?role <${label}> ?roleLabel . ?roleActivity core:relatedRole ?role . @@ -154,8 +159,9 @@ SELECT ?existingActivity WHERE { ?role core:roleIn ?existingActivity . } - -${publicationsClassGroupUri} + + SELECT ?existingRoleLabel WHERE { ?role <${label}> ?existingRoleLabel . } + { @@ -167,7 +173,7 @@ "predicate" : ["rolePredicate", "${predicateUriJson}" ], "object" : ["role", "${objectUriJson}", "URI" ], - "n3required" : [ "${n3ForNewRole}", "${startYearAssertion}" ], + "n3required" : [ "${n3ForNewRole}", "${roleLabel}", "${startYearAssertion}" ], "n3optional" : [ "${n3ForNewActivityTitle}", "${n3ForNewActivityType}", "${n3ForInverse}", "${endYearAssertion}" ], "newResources" : { "role" : "${defaultNamespace}", @@ -176,11 +182,11 @@ "urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" }, "literalsInScope": { }, "urisOnForm" : [ "roleActivity", "roleActivityType" ], - "literalsOnForm" : [ "title", "startYear", "endYear" ], + "literalsOnForm" : [ "title", "roleLabel", "startYear", "endYear" ], "filesOnForm" : [ ], "sparqlForLiterals" : { }, "sparqlForUris" : { }, - "sparqlForExistingLiterals" : { "title":"${titleQuery}", "startYear":"${startYearMonthQuery}", "endYear":"${endYearMonthQuery}" }, + "sparqlForExistingLiterals" : { "title":"${titleQuery}", "roleLabel":"${roleLabelQuery}", "startYearMonth":"${startYearMonthQuery}", "endYearMonth":"${endYearMonthQuery}" }, "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" }, "fields" : { "title" : { @@ -216,6 +222,17 @@ "rangeLang" : "", "assertions" : [ ] }, + "roleLabel" : { + "newResource" : "false", + "validators" : [ "nonempty","datatype:${stringDatatypeUriJson}" ], + "optionsType" : "UNDEFINED", + "literalOptions" : [ ], + "predicateUri" : "", + "objectClassUri" : "", + "rangeDatatypeUri" : "${stringDatatypeUriJson}", + "rangeLang" : "", + "assertions" : ["${roleLabelAssertion}" ] + }, "startYear" : { "newResource" : "false", "validators" : [ "datatype:${gYearDatatypeUriJson}" ], @@ -297,9 +314,11 @@ +

+

Dates of Participation

- - + +