From 7aad9c2154730b9a8170bc55811fe803d0485dbc Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 26 Mar 2010 21:58:00 +0000
Subject: [PATCH] NIHVIVO-193 Allow for form-specific Javascript to be loaded
 into the head of form pages.

---
 .../edit/forms/personHasPositionHistory.jsp   | 31 +++++++++++++++----
 .../customForms/personHasPositionHistory.js   |  0
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 productMods/js/customForms/personHasPositionHistory.js

diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 5f3e8524..e3af80d4 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -1,5 +1,9 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Arrays" %>
+
 <%@ page import="com.hp.hpl.jena.rdf.model.Literal"%>
 <%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
 <%@ page import="com.hp.hpl.jena.vocabulary.XSD" %>
@@ -225,17 +229,32 @@
 		request.setAttribute("title","Create a new position entry for " + subjectName);
 		submitLabel = "Create new position history entry";
 	}
+	
+	List<String> customJs = new ArrayList<String>(Arrays.asList("../js/customForms/personHasPositionHistory.js"));
+	request.setAttribute("customJs", customJs);
 %>
 
-<jsp:include page="${preForm}"/>
+<jsp:include page="${preForm}" />
 
 <h2>${title}</h2>
+
 <form action="<c:url value="/edit/processRdfForm2.jsp"/>" >
-	<v:input type="text" label="title" id="title" size="30" />
-	<v:input type="select" label="organization" id="organizationUri"  />
-	<v:input type="text" label="organization name (if not in dropdown above)" id="organizationName" size="30" />
-    <v:input type="text" label="start year (YYYY)" id="startYear" size="4"/>    
-    <v:input type="text" label="end year (YYYY)" id="endYear" size="4"/>
+    <div id="existingOrg">
+        <v:input type="select" label="Organization" id="organizationUri"  />  
+    </div>
+    
+    <div id="newOrg">
+    
+    </div>
+    
+    <div id="position"> 
+	   <v:input type="text" label="Position Title" id="title" size="30" />
+        <v:input type="select" label="Position Type" id="type" />
+
+        <v:input type="text" label="Start Year" id="startYear" size="4"/>    
+        <v:input type="text" label="End Year" id="endYear" size="4"/>
+    </div>
+    
     <p class="submit"><v:input type="submit" id="submit" value="<%=submitLabel%>" cancel="${param.subjectUri}"/></p>
 </form>
 
diff --git a/productMods/js/customForms/personHasPositionHistory.js b/productMods/js/customForms/personHasPositionHistory.js
new file mode 100644
index 00000000..e69de29b