From 4309c7582ed823d1fdb3aeab1a449baefecc28e5 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 5 Jan 2011 21:24:17 +0000
Subject: [PATCH] Working on converting organizationHasPositionHistory to date
 time with precision NIHVIVO-631

---
 .../jsptags/InputElementFormattingTag.java    |  2 ++
 .../elements/DateTimeWithPrecisionTest.java   | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
index f98c7cb3f..8f1dd7daf 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
@@ -456,6 +456,8 @@ public class InputElementFormattingTag extends TagSupport {
            
         	if( field != null && field.getEditElement() != null ){
         	    out.print( field.getEditElement().draw(getId(), editConfig, editSub, fmConfig));
+        	}else if( getType() == null ){
+        	    log.error("type or editElement must be specified for input element " + getId() );
         	}else if( getType().equalsIgnoreCase("date") || 
                     (field != null && field.getRangeDatatypeUri() != null && field.getRangeDatatypeUri().equals(XSD.date.getURI())) ){
                 //if its a dataprop that should be a string override type and use date picker    
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/elements/DateTimeWithPrecisionTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/elements/DateTimeWithPrecisionTest.java
index 3c335723c..5e4399d4c 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/elements/DateTimeWithPrecisionTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/elements/DateTimeWithPrecisionTest.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.elements;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,11 +16,31 @@ import com.hp.hpl.jena.rdf.model.Literal;
 
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditSubmission;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field;
 
 
 public class DateTimeWithPrecisionTest {
 
+    @Test 
+    public void fieldNameTemplateVariableTest() throws Exception{
+        String FIELDNAME = "testfield";       
+        Field field = new Field();
+        field.setName(FIELDNAME);
+        DateTimeWithPrecision dtwp = new DateTimeWithPrecision(field);
+        
+        EditSubmission editSub = null;
+        EditConfiguration editConfig = new EditConfiguration();
+        editConfig.setUrisInScope(Collections.EMPTY_MAP);
+        editConfig.setLiteralsInScope(Collections.EMPTY_MAP);
+        
+        Map templateVars = dtwp.getMapForTemplate(editConfig, editSub);
+        Assert.assertNotNull(templateVars);
+        
+        Assert.assertTrue( templateVars.containsKey("fieldName") );
+        Assert.assertEquals(templateVars.get("fieldName"), "testfield");
+    }
+    
     @Test
     public void precisionSecondsValidationTest() throws Exception{
         String FIELDNAME = "testfield";