diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 9fecf9f1..b96fd6da 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -119,8 +119,7 @@ ?person ?rolePredicate ?role. ?role a <${roleType}> . - ?role core:roleIn ?roleActivity . - ?role <${label}> ?roleLabel . + ?role core:roleIn ?roleActivity . ?roleActivity core:relatedRole ?role . @@ -128,15 +127,15 @@ ?roleActivity a ?roleActivityType . - - ?roleActivity <${label}> ?title . + + ?roleActivity <${label}> ?activityLabel . ?role ?inverseRolePredicate ?person. - + PREFIX core: <${vivoCore}> PREFIX rdfs: <${rdfs}> SELECT ?existingTitle WHERE { @@ -173,8 +172,8 @@ "predicate" : ["rolePredicate", "${predicateUriJson}" ], "object" : ["role", "${objectUriJson}", "URI" ], - "n3required" : [ "${n3ForNewRole}", "${roleLabel}", "${startYearAssertion}" ], - "n3optional" : [ "${n3ForNewActivityTitle}", "${n3ForNewActivityType}", "${n3ForInverse}", "${endYearAssertion}" ], + "n3required" : [ "${n3ForNewRole}", "${roleLabel}", "${startYearAssertion}", "${roleLabelAssertion}" ], + "n3optional" : [ "${n3ForNewActivityLabel}", "${n3ForNewActivityType}", "${n3ForInverse}", "${endYearAssertion}" ], "newResources" : { "role" : "${defaultNamespace}", "roleActivity" : "${defaultNamespace}" }, @@ -182,14 +181,14 @@ "urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" }, "literalsInScope": { }, "urisOnForm" : [ "roleActivity", "roleActivityType" ], - "literalsOnForm" : [ "title", "roleLabel", "startYear", "endYear" ], + "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear" ], "filesOnForm" : [ ], "sparqlForLiterals" : { }, "sparqlForUris" : { }, - "sparqlForExistingLiterals" : { "title":"${titleQuery}", "roleLabel":"${roleLabelQuery}", "startYearMonth":"${startYearMonthQuery}", "endYearMonth":"${endYearMonthQuery}" }, + "sparqlForExistingLiterals" : { "activityLabel":"${activityLabelQuery}", "roleLabel":"${roleLabelQuery}", "startYearMonth":"${startYearMonthQuery}", "endYearMonth":"${endYearMonthQuery}" }, "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" }, "fields" : { - "title" : { + "activityLabel" : { "newResource" : "false", "validators" : [ ${labelRequired} "datatype:${stringDatatypeUriJson}" ], "optionsType" : "UNDEFINED", @@ -198,7 +197,7 @@ "objectClassUri" : "", "rangeDatatypeUri" : "${stringDatatypeUriJson}", "rangeLang" : "", - "assertions" : ["${n3ForNewActivityTitle}" ] + "assertions" : ["${n3ForNewActivityLabel}" ] }, "roleActivityType" : { "newResource" : "true", @@ -306,7 +305,7 @@
-

+

<%-- RY maybe make this a label and input field. See what looks best. --%> @@ -314,7 +313,7 @@
-

+

Dates of Participation