Menu
▾
▴
[Jaffa-svn] SF.net SVN: jaffa:[3781] trunk/JaffaRIA/source/html/tests/extjs/ serverTimeZone
|
From: <Se...@us...> - 2009-04-08 19:45:25
|
Revision: 3781
http://jaffa.svn.sourceforge.net/jaffa/?rev=3781&view=rev
Author: SeanZ
Date: 2009-04-08 19:45:21 +0000 (Wed, 08 Apr 2009)
Log Message:
-----------
fix the compiling problem of *_RIA.jsp and add stOffset to ServerTimeZone.jsp
Modified Paths:
--------------
trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone.jsp
trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone_RIA.jsp
Modified: trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone.jsp
===================================================================
--- trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone.jsp 2009-04-08 01:17:43 UTC (rev 3780)
+++ trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone.jsp 2009-04-08 19:45:21 UTC (rev 3781)
@@ -87,6 +87,7 @@
Date.serverTimezone = {
longName: '<%= serverTZ.getDisplayName(false, TimeZone.LONG, request.getLocale()) %>',
shortName: '<%= serverTZ.getDisplayName(false, TimeZone.SHORT, request.getLocale()) %>',
+ tzOffset: parseInt('<%= serverTZ.getOffset((new Date()).getTime()) %>'), // current timezone offset.
stdOffset: parseInt('<%= serverTZ.getRawOffset() %>') // standard offset
};
// if daylight savings time is needed, should bring in displayNames, offset value, and start/end date of DST.
Modified: trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone_RIA.jsp
===================================================================
--- trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone_RIA.jsp 2009-04-08 01:17:43 UTC (rev 3780)
+++ trunk/JaffaRIA/source/html/tests/extjs/serverTimeZone/ServerTimeZone_RIA.jsp 2009-04-08 19:45:21 UTC (rev 3781)
@@ -11,7 +11,7 @@
--%>
<%@page import="java.util.*,java.text.*" %>
-<%@ page import = "org.jaffa.util.URLHelper,org.jaffa.util.MessageHelper,org.jaffa.security.SecurityManager" %>
+<%@ page import = "org.jaffa.util.URLHelper" %>
<%
TimeZone utcTZ = TimeZone.getTimeZone("Etc/GMT");
@@ -37,13 +37,14 @@
while(rnames.hasMoreElements()) {
String nm = (String) rnames.nextElement();
try {
- Date dd = new Date(Long.parseLong(request.getParameter(nm)));
+ cd.clear();
+ cd.setTimeInMillis(Long.parseLong(request.getParameter(nm)));
if (dateStrings.length()>0) {
dateStrings.append(",");
dateValues.append(",");
}
- dateStrings.append(nm+":'"+dd.toString()+"'");
- dateValues.append(nm+":new Date("+dd.getTime()+")");
+ dateStrings.append(nm+":'"+utcDF.format(cd.getTime())+"'");
+ dateValues.append(nm+":new Date("+cd.getTimeInMillis()+")");
} catch (NumberFormatException ex) {}
}
%>
@@ -54,6 +55,7 @@
<%} else {%>
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Server Time Zone (<%= serverTZStr %>)</title>
<base href='<%=URLHelper.getBase((HttpServletRequest) pageContext.getRequest())%>'/>
@@ -63,24 +65,16 @@
</jsp:include>
<script type="text/javascript">
- // Firebug hack
- if(!console) var console={debug:Ext.emptyFn,info:Ext.emptyFn,warn:Ext.emptyFn,error:Ext.emptyFn,trace:Ext.emptyFn,dir:Ext.emptyFn};
- // Stop ref's to ExtJS site
- Ext.BLANK_IMAGE_URL = "<%= rcp %>/js/extjs/resources/images/default/s.gif";
-
var valuesFromServer = {
- dateStrings : {serverGen: '<%= sgDate.toString() %>'},
- dateValues : {serverGen: new Date(<%= sgDate.getTime() %>)},
+ dateStrings : {serverGen: '<%= utcDF.format(cd.getTime()) %>', dtGen: '<%= utcDF.format(cd.getTime()) %>'},
+ dateValues : {serverGen: new Date(<%= cd.getTimeInMillis() %>), dtGen: new Date(<%= cd.getTimeInMillis() %>)},
appCtx : '<%= rcp %>'
}
</script>
+
+ <script type="text/javascript" src="ServerTimeZone.js"></script>
- <script type="text/javascript" src="<%= rcp %>/js/extjs/jaffa/dateOverrides/util/Date.js"></script>
- <script type="text/javascript" src="<%= rcp %>/js/extjs/jaffa/dateOverrides/form/DateField.js"></script>
-
- <script type="text/javascript" src="<%= rcp %>/tests/extjs/serverTimeZone/ServerTimeZone.js"></script>
-
</head>
<body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|