diff --git a/src/java/DmWebPortal/src/java/resources.properties b/src/java/DmWebPortal/src/java/resources.properties index 8e894af5dbbcdff5701aef870cd0d9b3b511f3d7..d165d4847740cd4b4a1fa4d190e8db4ac0f82108 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 8783af2ae87600e92adda9cf266df52e75bace39..d2653e55d06689fde8459a75246f6a43fbbd5800 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 0e5fe46f420e4d6b654fa9d294a514959af9a3c6..6c876cb35f722cbf6b35610c9d875b005bd66802 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>