No commit message

No commit message

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java

@@ -86,14 +86,18 @@ public class ExperimentTypeController extends CrudEntityController<ExperimentTyp
         }
     }
     
-      @Override
+     @Override
      protected String getObjectAlreadyExistMessage(ExperimentType experimentType)  {
         if (experimentType == null) {
             return null;
         }
         return "Experiment Type " + experimentType.getName() + " already exists."; 
     }
-
+     
+    public boolean notSelected() {
+        return current == null;
+    }
+    
     @FacesConverter(forClass = ExperimentType.class)
     public static class ExperimentTypeControllerConverter implements Converter
     {

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java

@@ -205,7 +205,11 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
         policyPropertyFacade.edit(current);
         return "/views/policyProperty/edit?faces-redirect=true";
     }
-
+    
+    public boolean notSelected() {
+        return current == null;
+    }
+    
     @FacesConverter(forClass = PolicyProperty.class)
     public static class PolicyPropertyControllerConverter implements Converter
     {

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyTypeController.java

@@ -93,6 +93,10 @@ public class PolicyTypeController extends CrudEntityController<PolicyType, Polic
          return super.prepareView(current);
      }
 
+    public boolean notSelected() {
+        return current == null;
+    }
+    
     @FacesConverter(forClass = PolicyType.class)
     public static class PolicyTypeControllerConverter implements Converter
     {

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/RoleTypeController.java

@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 public class RoleTypeController extends CrudEntityController<RoleType, RoleTypeFacade>
 {
     private static final Logger logger = Logger.getLogger(RoleTypeController.class.getName());
-    private int rows = 25;
+    private final int rows = 25;
 
     @EJB
     private RoleTypeFacade roleTypeFacade;
@@ -103,6 +103,10 @@ public class RoleTypeController extends CrudEntityController<RoleType, RoleTypeF
         return roleType.isIsSystemRole();
     }
 
+    public boolean notSelected() {
+        return current == null;
+    }
+    
     @FacesConverter(forClass = RoleType.class)
     public static class RoleTypeControllerConverter implements Converter {
 

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserInfoController.java

@@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
 public class UserInfoController extends CrudEntityController<UserInfo, UserInfoFacade> {
 
     private static final Logger logger = Logger.getLogger(UserInfoController.class.getName());
-    private int rows = 25;
+    private final int rows = 25;
 
     @EJB
     private UserInfoFacade userInfoFacade;
@@ -134,7 +134,7 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF
                 experimentUser.setDescription(experiment.getDescription());
                 userExperiments.add(experimentUser);
                 for (RoleType roleType : roleTypes) {
-                    boolean inRole = (getCurrent().getExperimetRole(roleType.getId(), experiment.getId()) != null);
+                    boolean inRole = (getCurrent().getExperimentRole(roleType.getId(), experiment.getId()) != null);
                     experimentUser.setIsInRole(roleType, inRole);
                 }
             }
@@ -297,7 +297,11 @@ public class UserInfoController extends CrudEntityController<UserInfo, UserInfoF
         this.passwordEntry = passwordEntry;
     }
 
-@FacesConverter(forClass = UserInfo.class)
+    public boolean notSelected() {
+        return current == null;
+    }
+    
+    @FacesConverter(forClass = UserInfo.class)
     public static class UserInfoControllerConverter implements Converter
     {
 

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/UserSystemRoleController.java

@@ -54,6 +54,7 @@ public class UserSystemRoleController  implements Serializable
         public List<UserInfo> findAll() {
             return userInfoFacade.findNoSystemRoleUsers(systemRole.getId());
         }
+        
     }
     
     private SystemRoleTypeTable systemRoleTable;

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/ExperimentPolicyPropertyValueFacade.java

@@ -6,7 +6,6 @@
 
 package gov.anl.aps.dm.portal.model.beans;
 
-import gov.anl.aps.dm.portal.model.entities.ExperimentPolicy;
 import gov.anl.aps.dm.portal.model.entities.ExperimentPolicyPropertyValue;
 import java.util.List;
 import javax.ejb.Stateless;
@@ -44,7 +43,7 @@ public class ExperimentPolicyPropertyValueFacade extends AbstractFacade<Experime
         }
         return null;
     }
-        
+    
     public List<ExperimentPolicyPropertyValue> findByExperimentPolicyId(int id) {
         try {
             return (List<ExperimentPolicyPropertyValue>) em.createNamedQuery("ExperimentPolicyPropertyValue.findByExperimentPolicyId")

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

@@ -59,10 +59,10 @@ public class Experiment extends CloneableEntity
     @Column(name = "description")
     private String description;
     @Column(name = "start_date")
-    @Temporal(TemporalType.DATE)
+    @Temporal(TemporalType.TIMESTAMP)
     private Date startDate;
     @Column(name = "end_date")
-    @Temporal(TemporalType.DATE)
+    @Temporal(TemporalType.TIMESTAMP)
     private Date endDate;
     @ManyToMany(mappedBy = "experimentList")
     private List<DataFolder> dataFolderList;

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

@@ -70,7 +70,7 @@ public class PolicyProperty extends CloneableEntity
     @JoinColumn(name = "policy_type_id", referencedColumnName = "id")
     @ManyToOne(optional = false)
     private PolicyType policyType;
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "policyProperty")
+    @OneToMany(cascade = CascadeType.ALL)
     private List<ExperimentPolicyPropertyValue> experimentPolicyPropertyValueList;
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "policyProperty")
     private List<AllowedPolicyValue> allowedPolicyValueList;

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

@@ -244,7 +244,7 @@ public class UserInfo extends CloneableEntity
         userExperimentRoleList.add(userExperimentRole);
     }
     
-    public UserExperimentRole getExperimetRole(int roleId, int experimentId) {
+    public UserExperimentRole getExperimentRole(int roleId, int experimentId) {
         for (UserExperimentRole experimentRole : userExperimentRoleList) {
             if ((experimentRole.getUserExperimentRolePK().getRoleTypeId() == roleId) && (experimentRole.getUserExperimentRolePK().getExperimentId() == experimentId))
                 return experimentRole;

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

-DatePattern=MM-dd-yyy
+DatePattern=MM/dd/yyyy HH:mm:ss
 
 PersistenceErrorOccured=A persistence error occurred.
 Previous=Previous

src/java/DmWebPortal/web/resources/js/common/noBack.js

+  window.history.forward();
+

src/java/DmWebPortal/web/templates/dmViewTemplate.xhtml

@@ -11,7 +11,7 @@
     <h:head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <link href="/dm/resources/css/portal.css" rel="stylesheet" type="text/css" />
-        <title>Data Management System Portal</title>
+
     </h:head>
 
     <h:body>

src/java/DmWebPortal/web/views/allowedPolicyValue/create.xhtml

@@ -6,7 +6,9 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-    
+  
+    <title>Allowed Policy Value Create</title>
+
     <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
     <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
     <ui:composition template="../../templates/dmViewTemplate.xhtml">

src/java/DmWebPortal/web/views/experiment/create.xhtml

@@ -6,7 +6,9 @@
                 xmlns:f="http://java.sun.com/jsf/core"
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-    
+ 
+    <title>Experiment Create</title>
+
     <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
     <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
     <ui:composition template="../../templates/dmViewTemplate.xhtml">

src/java/DmWebPortal/web/views/experiment/edit.xhtml

@@ -7,7 +7,10 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
+    <title>Experiment Edit</title>
+
     <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}" />
+    <h:outputScript library="js/common" name="noBack.js" rendered="#{experimentController.notSelected()}" />
     <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin and experimentController.isRestricted()}"/>
 
     <ui:composition template="../../templates/dmViewTemplate.xhtml" >

src/java/DmWebPortal/web/views/experiment/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" />
+        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
         
         <h:outputLabel for="endDate" value="End Date" />
-        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" />
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}" />
         
     </p:panelGrid>
 

src/java/DmWebPortal/web/views/experiment/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" />
+        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
         
         <h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
-        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" />
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" pattern="#{resources.DatePattern}"/>
 
     </p:panelGrid>
 

src/java/DmWebPortal/web/views/experiment/experimentPoliciesEditSelection.xhtml

@@ -7,6 +7,15 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
+    <ui:include src="experimentPolicyAddDialog.xhtml" />
+
+    <ui:param name="isAdmin" value="#{loginController.admin}" />
+
+    <p:commandButton id="experimentPolicyAddButton" value="Add" onclick="PF('experimentPolicyAddDialogWidget').show();" rendered="true" icon="ui-icon-plus" >
+        <p:tooltip for="experimentPolicyAddButton" value="Add new properties." />
+    </p:commandButton>
+    <p:commandButton id="addPoliciesNoOp" style="visibility:hidden" value="NoOp"/>
+    <p:defaultCommand target="addPoliciesNoOp"/>
 
     <p:dataTable id="experimentPoliciesListDataTable"                              
                  var="experimentPolicyObject" 
@@ -54,7 +63,7 @@
             </p:column>
         <p:column headerText="Actions" >
             <div class="actionLink">
-                <p:commandLink oncomplete="PF('experimentPolicyRemoveDialogWidget').show()" rendered="#{loginController.admin or experimentController.canDeleteExperiment(experimentController.current)}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                <p:commandLink oncomplete="PF('experimentPolicyRemoveDialogWidget').show()" rendered="#{loginController.admin or experimentController.canDeleteExperiment(experimentController.current)}" styleClass="ui-icon ui-icon-trash" title="Remove" update="@form">
                     <f:setPropertyActionListener value="#{propertyValue}" target="#{experimentController.experimentPropertyToDelete}"/>
                 </p:commandLink>
             </div>