Changeset 5423 for trunk/www/common/annotations/annotate.jsp

Timestamp:

Sep 23, 2010, 11:09:55 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1512: Add support for datetime annotation types

Makes it possible to crete TIMESTAMP annotation types and to enter values for them.

This is basically 3) in the ticket description.

File:

• trunk/www/common/annotations/annotate.jsp (modified) (5 diffs)

trunk/www/common/annotations/annotate.jsp

@@ -2 +2 @@
   ------------------------------------------------------------------
   Copyright (C) 2005 Nicklas Nordborg
-  Copyright (C) 2006 Jari Häkkinen, Nicklas Nordborg
+  Copyright (C) 2006 Jari H�kkinen, Nicklas Nordborg
   Copyright (C) 2007 Nicklas Nordborg
 
@@ -88 +88 @@
   String htmlDateFormat = HTML.encodeTags(dateFormat);
 
+  Formatter<Date> dateTimeFormatter = FormatterFactory.getDateTimeFormatter(sc);
+  String dateTimeFormat = FormatterSettings.getDateTimeFormat(sc);
+  String jsDateTimeFormat = HTML.javaScriptEncode(dateTimeFormat);
+  String htmlDateTimeFormat = HTML.encodeTags(dateTimeFormat);
+  
   final Annotatable item = itemId == 0 ? null : (Annotatable)itemType.getById(dc, itemId);
   final boolean writePermission = item == null ? true : item.hasPermission(Permission.WRITE);
@@ -190 +195 @@
       List values = null;
       Unit unit = at.getDefaultUnit();
+      Type valueType = at.getValueType();
       if (existing != null && existing.containsKey(at))
       {
@@ -206 +212 @@
         for (Object value : values)
         {
-          if (value instanceof Date) value = dateFormatter.format((Date)value);
+          if (value instanceof Date) 
+          {
+            if (valueType == Type.TIMESTAMP)
+            {
+              value = dateTimeFormatter.format((Date)value);
+            }
+            else
+            {
+              value = dateFormatter.format((Date)value);
+            }
+          }
           %>
           values[values.length] = '<%=HTML.javaScriptEncode(value.toString())%>';
@@ -807 +823 @@
             <%
           }
+          else if (valueType == Type.TIMESTAMP)
+          {
+            %>
+            <table>
+            <tr>
+            <td>
+              <b><%=HTML.encodeTags(at.getName())%></b> (Timestamp)<br>
+              <input <%=clazz%> type="text" name="<%=inputName%>" value=""
+                size="30" maxlength="30" title="Enter date + time in format: <%=htmlDateTimeFormat%>"
+                onblur="valueOnBlur(this.value)">
+            </td>
+            <td>
+                <br>
+                <base:button 
+                  onclick="<%="Dates.selectDateTime('Value', 'annotations', '"+inputName+"', 'setDateCallback', '"+jsDateTimeFormat+"')"%>" 
+                  image="calendar.png"
+                  title="Calendar&hellip;" 
+                  tooltip="Select date and time from a calendar" 
+                />
+            </td>
+            </tr>
+            </table>
+            <%
+          }
           if (at.supportUnits() && !at.isEnumeration())
           {