diff --git a/productMods/WEB-INF/ontologies/user/activity.rdf b/productMods/WEB-INF/ontologies/user/activity.rdf
index 7d326b48..b2752bb9 100644
--- a/productMods/WEB-INF/ontologies/user/activity.rdf
+++ b/productMods/WEB-INF/ontologies/user/activity.rdf
@@ -8,7 +8,7 @@
- professionalServiceActivityShortView.jsp
+ serviceActivityShortView.jsp
diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp
index cc488a89..7d7f977f 100644
--- a/productMods/edit/forms/organizationHasPositionHistory.jsp
+++ b/productMods/edit/forms/organizationHasPositionHistory.jsp
@@ -47,16 +47,6 @@
?positionUri ?title.
-<%--
-
- SELECT ?existingOrgName WHERE {
- ?positionUri ?existingOrgName }
-
-
- ?positionUri ?organizationName .
-
- --%>
-
SELECT ?startYearExisting WHERE {
?positionUri ?startYearExisting }
@@ -65,22 +55,6 @@
?positionUri ?startYear .
-
- SELECT ?startYearMonthExisting WHERE {
- ?positionUri ?startYearMonthExisting }
-
-
- ?positionUri ?startYearMonth .
-
-
-
- SELECT ?startDateExisting WHERE {
- ?positionUri ?startDateExisting }
-
-
- ?positionUri ?startDate .
-
-
SELECT ?endYearExisting WHERE {
?positionUri ?endYearExisting }
@@ -89,22 +63,6 @@
?positionUri ?endYear .
-
- SELECT ?endYearMonthExisting WHERE {
- ?positionUri ?endYearMonthExisting }
-
-
- ?positionUri ?endYearMonth .
-
-
-
- SELECT ?endDateExisting WHERE {
- ?positionUri ?endDateExisting }
-
-
- ?positionUri ?endDate .
-
-
<%-- Note there is really no difference in how things are set up for an object property except
below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals
or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%>
@@ -136,27 +94,20 @@
"predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["positionUri", "${objectUriJson}", "URI" ],
- "n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}" ],
- "n3optional" : [ "${startYearAssertion}","${startYearMonthAssertion}","${startDateAssertion}",
- "${endYearAssertion}","${endYearMonthAssertion}","${endDateAssertion}"],
+ "n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}", "${startYearAssertion}" ],
+ "n3optional" : [ "${endYearAssertion}" ],
"newResources" : { "positionUri" : "${defaultNamespace}/position" },
"urisInScope" : { },
"literalsInScope": { },
"urisOnForm" : [ "personUri" ],
- "literalsOnForm" : [ "title",
- "startYear", "startYearMonth", "startDate",
- "endYear", "endYearMonth", "endDate" ],
+ "literalsOnForm" : [ "title", "startYear", "endYear" ],
"filesOnForm" : [ ],
"sparqlForLiterals" : { },
"sparqlForUris" : { },
"sparqlForExistingLiterals" : {
"title" : "${titleExisting}",
"startYear" : "${startYearExisting}",
- "startYearMonth" : "${startYearMonthExisting}",
- "startDate" : "${startDateExisting}",
"endYear" : "${endYearExisting}",
- "endYearMonth" : "${endYearMonthExisting}",
- "endDate" : "${endDateExisting}"
},
"sparqlForExistingUris" : {
"personUri" : "${personUriExisting}"
@@ -186,7 +137,7 @@
},
"startYear" : {
"newResource" : "false",
- "validators" : [ ],
+ "validators" : [ "nonempty", "datatype:http://www.w3.org/2001/XMLSchema#gYear"],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
@@ -195,31 +146,9 @@
"rangeLang" : "",
"assertions" : ["${startYearAssertion}"]
},
- "startYearMonth" : {
- "newResource" : "false",
- "validators" : [],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYearMonth";
- "rangeLang" : "",
- "assertions" : [ "${startYearMonthAssertion}" ]
- },
- "startDate" : {
- "newResource" : "false",
- "validators" : [],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#Date",
- "rangeLang" : "",
- "assertions" : [ "${startDateAssertion}" ]
- },
"endYear" : {
"newResource" : "false",
- "validators" : [ ],
+ "validators" : [ "datatype:http://www.w3.org/2001/XMLSchema#gYear" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
@@ -227,29 +156,7 @@
"rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYear",
"rangeLang" : "",
"assertions" : ["${endYearAssertion}"]
- },
- "endYearMonth" : {
- "newResource" : "false",
- "validators" : [],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYearMonth";
- "rangeLang" : "",
- "assertions" : [ "${endYearMonthAssertion}" ]
- },
- "endDate" : {
- "newResource" : "false",
- "validators" : [],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#Date",
- "rangeLang" : "",
- "assertions" : [ "${endDateAssertion}" ]
- }
+ }
}
}
@@ -287,22 +194,11 @@
${title}
" >
-
+
-
- <%--
-
-
- --%>
-
-
- <%--
-
-
- --%>
-
+
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 73c5ea27..e0bb641a 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -105,9 +105,9 @@
"predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["positionUri", "${objectUriJson}", "URI" ],
- "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}" ],
+ "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}", "${startYearAssertion}" ],
"n3optional" : [ "${organizationNameAssertion}","${organizationUriAssertion}",
- "${startYearAssertion}","${endYearAssertion}"],
+ "${endYearAssertion}"],
"newResources" : { "positionUri" : "${defaultNamespace}/position" },
"urisInScope" : { },
"literalsInScope": { },
@@ -162,7 +162,7 @@
},
"startYear" : {
"newResource" : "false",
- "validators" : [ "datatype:http://www.w3.org/2001/XMLSchema#gYear" ],
+ "validators" : [ "nonempty", "datatype:http://www.w3.org/2001/XMLSchema#gYear" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
diff --git a/productMods/edit/forms/personHasServiceActivity.jsp b/productMods/edit/forms/personHasServiceActivity.jsp
index 98352420..44f94197 100644
--- a/productMods/edit/forms/personHasServiceActivity.jsp
+++ b/productMods/edit/forms/personHasServiceActivity.jsp
@@ -113,9 +113,9 @@
"predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["activityUri", "${objectUriJson}", "URI" ],
- "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}" ],
+ "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}", "${startYearMonthAssertion}" ],
"n3optional" : [ "${descriptionAssertion}", "${organizationNameAssertion}","${organizationUriAssertion}",
- "${startYearMonthAssertion}","${endYearMonthAssertion}"],
+ "${endYearMonthAssertion}"],
"newResources" : { "activityUri" : "${defaultNamespace}/serviceactivity" },
"urisInScope" : { },
"literalsInScope": { },
@@ -182,7 +182,7 @@
},
"startYearMonth" : {
"newResource" : "false",
- "validators" : [ "datatype:http://www.w3.org/2001/XMLSchema#gYearMonth" ],
+ "validators" : [ "nonempty", "datatype:http://www.w3.org/2001/XMLSchema#gYearMonth" ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",