No commit message

No commit message

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java

@@ -58,10 +58,10 @@ public class Experiment extends CloneableEntity
     @Size(max = 2000)
     @Column(name = "description")
     private String description;
-    @Column(name = "start_date")
+    @Column(name = "start_date", columnDefinition="TIMESTAMP WITH TIME ZONE")
     @Temporal(TemporalType.TIMESTAMP)
     private Date startDate;
-    @Column(name = "end_date")
+    @Column(name = "end_date", columnDefinition="TIMESTAMP WITH TIME ZONE")
     @Temporal(TemporalType.TIMESTAMP)
     private Date endDate;
     @ManyToMany(mappedBy = "experimentList")

src/java/DmWebPortal/src/java/resources.properties

-DatePattern=MM/dd/yyyy HH:mm:ss
-
+DatePattern=MM/dd/yyyy 
+DateTimePattern=MM/dd/yyyy hh:mm aaa
+DateTimeZonePattern=MM/dd/yyyy hh:mm aaa z
 PersistenceErrorOccured=A persistence error occurred.
 Previous=Previous
 Next=Next

src/java/DmWebPortal/web/WEB-INF/web.xml

@@ -25,12 +25,20 @@
         <exception-type>javax.faces.application.ViewExpiredException</exception-type>
         <location>/login.xhtml</location>
     </error-page>
-<!--    <navigation-rule>
-	<from-view-id>/views/policyType/view.xhtml</from-view-id>
-	<navigation-case>
-		<from-outcome>/views/policyType/view</from-outcome>
-		<to-view-id>/views/policyProperty/view.xhtml</to-view-id>
-		<redirect />
-	</navigation-case>
-</navigation-rule>-->
+    <security-constraint>
+        <display-name>Restrict Private Files</display-name>
+        <web-resource-collection>
+            <web-resource-name>Restricted Files</web-resource-name>
+            <url-pattern>/templates/*</url-pattern>
+            <url-pattern>/views/allowedPolicyValue/private/*</url-pattern>
+            <url-pattern>/views/common/*</url-pattern>
+            <url-pattern>/views/experiment/private/*</url-pattern>
+            <url-pattern>/views/experimentType/private/*</url-pattern>
+            <url-pattern>/views/policyProperty/private/*</url-pattern>
+            <url-pattern>/views/policyType/private/*</url-pattern>
+            <url-pattern>/views/roleType/private/*</url-pattern>
+            <url-pattern>/views/userInfo/private/*</url-pattern>
+            <url-pattern>/views/userSystemRole/private/*</url-pattern>
+        </web-resource-collection>
+    </security-constraint>
 </web-app>

src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml

@@ -27,10 +27,10 @@
         <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>      
 
         <h:outputLabel for="startDate" value="Start Date"/>
-        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
+        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
         
         <h:outputLabel for="endDate" value="End Date" />
-        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
         
     </p:panelGrid>
 

src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml

@@ -19,10 +19,10 @@
         <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>  
         
         <h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
-        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
+        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
         
         <h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
-        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
 
     </p:panelGrid>
 

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.DatePattern}" type="date" />
+                          <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
             </h:outputText>
         </p:column>
         
@@ -49,7 +49,7 @@
                   filterBy="#{experimentObject.endDate}" filterMatchMode="contains" >
 
             <h:outputText value="#{experimentObject.endDate}">
-                <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+                <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago"/>
             </h:outputText>
         </p:column>
 

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.DatePattern}" type="date" />
+            <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
         </h:outputText>
 
         
         <h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
         <h:outputText  id="endDate" value="#{experimentObject.endDate}" styleClass="entityDataText">
-            <f:convertDateTime pattern="#{resources.DatePattern}" type="date" />
+            <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="America/Chicago" />
         </h:outputText>
        
     </p:panelGrid>