@prefix core: <${vivoCore}> .
@@ -129,8 +148,8 @@
"predicate" : ["rolePredicate", "${predicateUriJson}" ],
"object" : ["role", "${objectUriJson}", "URI" ],
- "n3required" : [ "${n3ForNewRole}" ],
- "n3optional" : [ "${n3ForNewActivity}", "${n3ForInverse}" ],
+ "n3required" : [ "${n3ForNewRole}", "${startYearMonthAssertion}" ],
+ "n3optional" : [ "${n3ForNewActivity}", "${n3ForInverse}", "${endYearMonthAssertion}" ],
"newResources" : { "role" : "${defaultNamespace}",
"roleActivity" : "${defaultNamespace}" },
@@ -138,7 +157,7 @@
"urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" },
"literalsInScope": { },
"urisOnForm" : [ "roleActivity", "roleActivityType" ],
- "literalsOnForm" : [ "title" ],
+ "literalsOnForm" : [ "title", "startYearMonth", "endYearMonth" ],
"filesOnForm" : [ ],
"sparqlForLiterals" : { },
"sparqlForUris" : { },
@@ -177,6 +196,28 @@
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ ]
+ },
+ "startYearMonth" : {
+ "newResource" : "false",
+ "validators" : [ "datatype:${gYearMonthDatatypeUriJson}" ],
+ "optionsType" : "UNDEFINED",
+ "literalOptions" : [ ],
+ "predicateUri" : "",
+ "objectClassUri" : "",
+ "rangeDatatypeUri" : "${gYearMonthDatatypeUriJson}",
+ "rangeLang" : "",
+ "assertions" : ["${startYearMonthAssertion}"]
+ },
+ "endYearMonth" : {
+ "newResource" : "false",
+ "validators" : [ "datatype:${gYearMonthDatatypeUriJson}" ],
+ "optionsType" : "UNDEFINED",
+ "literalOptions" : [ ],
+ "predicateUri" : "",
+ "objectClassUri" : "",
+ "rangeDatatypeUri" : "${gYearMonthDatatypeUriJson}",
+ "rangeLang" : "",
+ "assertions" : ["${endYearMonthAssertion}"]
}
}
}
@@ -189,7 +230,7 @@
EditConfiguration.putConfigInSession(editConfig,session);
}
- //editConfig.addValidator(new PersonHasPublicationValidator());
+ editConfig.addValidator(new StartDateBeforeEndDate("startYearMonth","endYearMonth") );
//this will return the browser to the new activity entity after an edit.
editConfig.setEntityToReturnTo("?roleActivity");
@@ -213,6 +254,7 @@
%>
+
@@ -231,6 +273,9 @@
" class="verifyMatch">(Verify this match)
+
+
+
diff --git a/productMods/edit/forms/css/autocomplete.css b/productMods/edit/forms/css/autocomplete.css
index f771a59e..46519f7d 100644
--- a/productMods/edit/forms/css/autocomplete.css
+++ b/productMods/edit/forms/css/autocomplete.css
@@ -7,4 +7,15 @@
.acSelectionInfo {
background-color: #d9d9d9;
padding: .5em 1em;
+}
+
+
+/* jQuery UI autocomplete */
+ul.ui-autocomplete {
+ font-size: .95em;
+}
+
+li.ui-menu-item a.ui-corner-all {
+ text-align: left;
+ padding-left: .25em;
}
\ No newline at end of file
diff --git a/productMods/edit/forms/css/customForm.css b/productMods/edit/forms/css/customForm.css
index 076a3ea4..9bfb1e34 100644
--- a/productMods/edit/forms/css/customForm.css
+++ b/productMods/edit/forms/css/customForm.css
@@ -104,13 +104,3 @@ option {
width: 30%;
}
-
-/* jQuery UI autocomplete */
-ul.ui-autocomplete {
- font-size: .95em;
-}
-
-li.ui-menu-item a.ui-corner-all {
- text-align: left;
- padding-left: .25em;
-}
\ No newline at end of file
diff --git a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
index 8692614b..fd603423 100644
--- a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
+++ b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
@@ -23,3 +23,4 @@
.verifyMatch {
margin-left: .5em;
}
+