litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2085 Add position type field to organizationHasPosition form.

Browse source
This commit is contained in:
ryounes 2011-03-22 21:28:37 +00:00
parent caa941049b
commit 3a7943c07a
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
productMods/edit/forms/organizationHasPositionHistory.jsp
View file

@ -87,7 +87,7 @@
<v:jsonset var="n3ForStmtToOrg" > <v:jsonset var="n3ForStmtToOrg" >
?organizationUri <${orgForPositionPred}> ?positionUri . ?organizationUri <${orgForPositionPred}> ?positionUri .
?positionUri <${positionInOrgPred}> ?organizationUri . ?positionUri <${positionInOrgPred}> ?organizationUri .
?positionUri <${type}> <${positionType}> . ?positionUri a ?positionType .
</v:jsonset> </v:jsonset>
<v:jsonset var="n3ForStart"> <v:jsonset var="n3ForStart">
@ -166,6 +166,18 @@
?endNode <${dateTimePrecision}> ?existingEndPrecision . } ?endNode <${dateTimePrecision}> ?existingEndPrecision . }
</v:jsonset> </v:jsonset>
<v:jsonset var="positionTypeAssertion">
?positionUri a ?positionType .
</v:jsonset>
<v:jsonset var="positionTypeQuery">
SELECT ?existingPositionType WHERE {
?positionUri a ?existingPositionType . }
</v:jsonset>
<c:set var="positionClass" value="${vivoCore}Position" />
<v:jsonset var="positionClassUriJson">${positionClass}</v:jsonset>
<c:set var="editjson" scope="request"> <c:set var="editjson" scope="request">
{ {
"formUrl" : "${formUrl}", "formUrl" : "${formUrl}",
@ -176,7 +188,7 @@
"predicate" : ["predicate", "${predicateUriJson}" ], "predicate" : ["predicate", "${predicateUriJson}" ],
"object" : ["positionUri", "${objectUriJson}", "URI" ], "object" : ["positionUri", "${objectUriJson}", "URI" ],
"n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}"], "n3required" : [ "${n3ForStmtToOrg}", "${titleAssertion}" , "${personUriAssertion}", "${positionTypeAssertion}"],
"n3optional" : [ "${n3ForStart}" , "${n3ForEnd}" ], "n3optional" : [ "${n3ForStart}" , "${n3ForEnd}" ],
"newResources" : { "positionUri" : "${defaultNamespace}", "newResources" : { "positionUri" : "${defaultNamespace}",
"intervalNode" : "${defaultNamespace}", "intervalNode" : "${defaultNamespace}",
@ -184,7 +196,7 @@
"endNode" : "${defaultNamespace}" }, "endNode" : "${defaultNamespace}" },
"urisInScope" : { }, "urisInScope" : { },
"literalsInScope": { }, "literalsInScope": { },
"urisOnForm" : [ "personUri" ], "urisOnForm" : [ "personUri", "positionType" ],
"literalsOnForm" : [ "title", "startYear", "endYear" ], "literalsOnForm" : [ "title", "startYear", "endYear" ],
"filesOnForm" : [ ], "filesOnForm" : [ ],
"sparqlForLiterals" : { }, "sparqlForLiterals" : { },
@ -196,6 +208,7 @@
}, },
"sparqlForExistingUris" : { "sparqlForExistingUris" : {
"personUri" : "${personUriExisting}", "personUri" : "${personUriExisting}",
"positionType" : "${positionTypeQuery}" ,
"intervalNode" : "${existingIntervalNodeQuery}", "intervalNode" : "${existingIntervalNodeQuery}",
"startNode" : "${existingStartNodeQuery}", "startNode" : "${existingStartNodeQuery}",
"endNode" : "${existingEndNodeQuery}", "endNode" : "${existingEndNodeQuery}",
@ -225,6 +238,17 @@
"rangeLang" : "", "rangeLang" : "",
"assertions" : [ "${personUriAssertion}" ] "assertions" : [ "${personUriAssertion}" ]
}, },
"positionType" : {
"newResource" : "false",
"validators" : [ "nonempty" ],
"optionsType" : "CHILD_VCLASSES_WITH_PARENT",
"literalOptions" : [ "Select one" ],
"predicateUri" : "",
"objectClassUri" : "${positionClassUriJson}",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ "${positionTypeAssertion}" ]
},
"startField" : { "startField" : {
"newResource" : "false", "newResource" : "false",
"validators" : [ ], "validators" : [ ],
@ -299,6 +323,7 @@
<h2>${title}</h2> <h2>${title}</h2>
<form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" > <form class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
<v:input type="text" label="Position Title ${requiredHint}" id="title" size="30"/> <v:input type="text" label="Position Title ${requiredHint}" id="title" size="30"/>
<v:input type="select" label="Position Type ${requiredHint}" id="positionType" />
<v:input type="select" label="Person" id="personUri" /> <v:input type="select" label="Person" id="personUri" />
<v:input id="startField" label="Start Year ${yearHint}" /> <v:input id="startField" label="Start Year ${yearHint}" />
<v:input id="endField" label="End Year ${yearHint}" /> <v:input id="endField" label="End Year ${yearHint}" />