midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2018:Error with DST on Calendar window

This commit is contained in:
hieplq 2014-06-24 13:32:08 +02:00
parent 023ce77c89
commit 20776b2519
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
View File

@ -116,7 +116,7 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
calendars.setModel(scm); calendars.setModel(scm);
if (calendars.getCurrentDate() != null) if (calendars.getCurrentDate() != null)
calendars.setCurrentDate(calendars.getCurrentDate()); calendars.setCurrentDate(calendars.getCurrentDate());
calendars.setTimeZone(getTimeZone()); setTimeZone();
btnRefresh = (Toolbarbutton) component.getFellow("btnRefresh"); btnRefresh = (Toolbarbutton) component.getFellow("btnRefresh");
btnRefresh.addEventListener(Events.ON_CLICK, this); btnRefresh.addEventListener(Events.ON_CLICK, this);
@ -387,22 +387,17 @@ public class CalendarWindow extends Window implements EventListener<Event>, ITab
syncModel(); syncModel();
} }
private String getTimeZone() private void setTimeZone()
{ {
String alternateTimeZone = MSysConfig.getValue(MSysConfig.CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx())); String alternateTimeZone = MSysConfig.getValue(MSysConfig.CALENDAR_ALTERNATE_TIMEZONE, "Pacific Time=PST", Env.getAD_Client_ID(Env.getCtx()));
TimeZone defaultTimeZone = TimeZone.getDefault(); TimeZone defaultTimeZone = TimeZone.getDefault();
StringBuilder defaultTimeZoneName = new StringBuilder(defaultTimeZone.getDisplayName()); calendars.addTimeZone (defaultTimeZone.getDisplayName(), defaultTimeZone);
int defaultTimeZoneOffset = defaultTimeZone.getOffset(0) / 3600000;
defaultTimeZoneName.append("=GMT");
if (defaultTimeZoneOffset >= 0)
defaultTimeZoneName.append("+");
defaultTimeZoneName.append(defaultTimeZoneOffset);
if (!Util.isEmpty(alternateTimeZone, true)) { if (!Util.isEmpty(alternateTimeZone, true)) {
if (!alternateTimeZone.equalsIgnoreCase(defaultTimeZoneName.toString())) { if (!alternateTimeZone.equalsIgnoreCase(defaultTimeZone.getDisplayName())) {
defaultTimeZoneName.append(",").append(alternateTimeZone); String[] pair = alternateTimeZone.split("=");
calendars.addTimeZone(pair[0].trim(), pair[1].trim());
} }
} }
return defaultTimeZoneName.toString();
} }
private void updateDateLabel() { private void updateDateLabel() {