diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp
index 73b84141..7861d45d 100644
--- a/productMods/edit/forms/organizationHasPositionHistory.jsp
+++ b/productMods/edit/forms/organizationHasPositionHistory.jsp
@@ -87,7 +87,7 @@
?organizationUri <${orgForPositionPred}> ?positionUri .
?positionUri <${positionInOrgPred}> ?organizationUri .
- ?positionUri <${type}> <${positionType}> .
+ ?positionUri a ?positionType .
@@ -166,6 +166,18 @@
?endNode <${dateTimePrecision}> ?existingEndPrecision . }
+
+ ?positionUri a ?positionType .
+
+
+
+ SELECT ?existingPositionType WHERE {
+ ?positionUri a ?existingPositionType . }
+
+
+
+${positionClass}
+
{
"formUrl" : "${formUrl}",
@@ -176,7 +188,7 @@
"predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["positionUri", "${objectUriJson}", "URI" ],
- "n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}"],
+ "n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}", "${positionTypeAssertion}"],
"n3optional" : [ "${n3ForStart}" , "${n3ForEnd}" ],
"newResources" : { "positionUri" : "${defaultNamespace}",
"intervalNode" : "${defaultNamespace}",
@@ -184,7 +196,7 @@
"endNode" : "${defaultNamespace}" },
"urisInScope" : { },
"literalsInScope": { },
- "urisOnForm" : [ "personUri" ],
+ "urisOnForm" : [ "personUri", "positionType" ],
"literalsOnForm" : [ "title", "startYear", "endYear" ],
"filesOnForm" : [ ],
"sparqlForLiterals" : { },
@@ -196,6 +208,7 @@
},
"sparqlForExistingUris" : {
"personUri" : "${personUriExisting}",
+ "positionType" : "${positionTypeQuery}" ,
"intervalNode" : "${existingIntervalNodeQuery}",
"startNode" : "${existingStartNodeQuery}",
"endNode" : "${existingEndNodeQuery}",
@@ -225,6 +238,17 @@
"rangeLang" : "",
"assertions" : [ "${personUriAssertion}" ]
},
+ "positionType" : {
+ "newResource" : "false",
+ "validators" : [ "nonempty" ],
+ "optionsType" : "CHILD_VCLASSES_WITH_PARENT",
+ "literalOptions" : [ "Select one" ],
+ "predicateUri" : "",
+ "objectClassUri" : "${positionClassUriJson}",
+ "rangeDatatypeUri" : "",
+ "rangeLang" : "",
+ "assertions" : [ "${positionTypeAssertion}" ]
+ },
"startField" : {
"newResource" : "false",
"validators" : [ ],
@@ -299,6 +323,7 @@
${title}
" >
+