From 2008d1bae3ad422e4b2e21ead3796aaa49212885 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Wed, 25 Mar 2015 20:33:30 +0000
Subject: [PATCH] experiment table
---
src/java/DmWebPortal/src/java/resources.properties | 5 +++--
.../views/experiment/private/experimentListDataTable.xhtml | 4 ++--
.../views/experiment/private/experimentViewPanelGrid.xhtml | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/java/DmWebPortal/src/java/resources.properties b/src/java/DmWebPortal/src/java/resources.properties
index 8e894af5..d165d484 100644
--- a/src/java/DmWebPortal/src/java/resources.properties
+++ b/src/java/DmWebPortal/src/java/resources.properties
@@ -1,6 +1,7 @@
DatePattern=MM/dd/yyyy
-DateTimePattern=MM/dd/yyyy hh:mm aaa
-DateTimeZonePattern=MM/dd/yyyy hh:mm aaa z
+DateTimePattern=MM/dd/yyyy hh:mm a
+DateTimeZonePattern=MM/dd/yyyy hh:mm a z
+Timezone=America/Chicago
PersistenceErrorOccured=A persistence error occurred.
Previous=Previous
Next=Next
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
index 8783af2a..d2653e55 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentListDataTable.xhtml
@@ -41,7 +41,7 @@
filterBy="#{experimentObject.startDate}" filterMatchMode="contains" >
<h:outputText value="#{experimentObject.startDate}">
- <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="#{resources.Timezone}"/>
</h:outputText>
</p:column>
@@ -49,7 +49,7 @@
filterBy="#{experimentObject.endDate}" filterMatchMode="contains" >
<h:outputText value="#{experimentObject.endDate}">
- <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="#{resources.Timezone}"/>
</h:outputText>
</p:column>
diff --git a/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
index 0e5fe46f..6c876cb3 100644
--- a/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml
@@ -21,13 +21,13 @@
<h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
<h:outputText id="startDate" value="#{experimentObject.startDate}" styleClass="entityDataText">
- <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="#{resources.Timezone}" />
</h:outputText>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<h:outputText id="endDate" value="#{experimentObject.endDate}" styleClass="entityDataText">
- <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
+ <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="#{resources.Timezone}" />
</h:outputText>
</p:panelGrid>
--
GitLab