Skip to content
Snippets Groups Projects
Commit ec5600af authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

No commit message 

No commit message
parent 66ed5511
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 81 deletions
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
+ 0
− 12
View file @ ec5600af
......@@ -118,12 +118,6 @@ public class Experiment extends CloneableEntity
this.startDate = startDate;
}
// public void setStartDate(String startDate) {
// Date sDate = new Date();
//
// setStartDate(sDate);
// }
public Date getEndDate() {
return endDate;
}
......@@ -132,12 +126,6 @@ public class Experiment extends CloneableEntity
this.endDate = endDate;
}
// public void setEndDate(String endDate) {
// Date eDate = new Date();
//
// setEndDate(eDate);
// }
@XmlTransient
public List<DataFolder> getDataFolderList() {
return dataFolderList;
......
src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
+ 2
− 7
View file @ ec5600af
......@@ -9,11 +9,10 @@
<c:set var="experimentObject" value="#{experimentController.selected}"/>
<p:panelGrid columns="3" styleClass="createEntityDetails">
<p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
<p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
......@@ -23,19 +22,15 @@
itemValue="#{n}"
itemLabel="#{n.name}"/>
</p:selectOneMenu>
<p:message for="experimentType"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<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}" />
<p:message for="startDate"/>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<p:calendar id="endDate" value="#{experimentObject.endDate}" />
<p:message for="endDate"/>
</p:panelGrid>
......
src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
+ 2
− 2
View file @ ec5600af
......@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<p:confirmDialog id="experimentDestroyDialog" message="Destroy experiment #{experimentController.getCurrentEntityInstanceName()}?"
header="Destroy Experiment" severity="alert" widgetVar="experimentDestroyDialogWidget"
<p:confirmDialog id="experimentDestroyDialog" message="Delete experiment #{experimentController.getCurrentEntityInstanceName()}?"
header="Delete Experiment" severity="alert" widgetVar="experimentDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="experimentDestroyDialogWidget.hide()" action="#{experimentController.destroy()}"/>
<p:commandButton value="No" onclick="PF('experimentDestroyDialogWidget').hide()" type="button" />
......
src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
+ 2
− 8
View file @ ec5600af
......@@ -10,15 +10,13 @@
<c:set var="experimentObject" value="#{experimentController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="3" styleClass="editEntityDetails">
<p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{experimentObject.id}" title="Id" styleClass="entityDataText"/>
<p:message for="id"/>
<h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
<p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
......@@ -28,19 +26,15 @@
itemValue="#{n}"
itemLabel="#{n.name}"/>
</p:selectOneMenu>
<p:message for="experimentType"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<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}" />
<p:message for="startDate"/>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<p:calendar id="endDate" value="#{experimentObject.endDate}" />
<p:message for="endDate"/>
</p:panelGrid>
</ui:composition>
src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
+ 1
− 1
View file @ ec5600af
......@@ -28,7 +28,7 @@
</p:column>
<p:column sortBy="#{experimentObject.experimentType.name}" headerText="Type"
filterBy="#{experimentObject.experimentType.name}" filterMatchMode="contains" width="120">
filterBy="#{experimentObject.experimentType.name}" filterMatchMode="exact" width="120">
<h:outputText value="#{experimentObject.experimentType.name}"/>
</p:column>
......
src/java/DmWebPortal/web/views/experiment/view.xhtml
+ 2
− 0
View file @ ec5600af
......@@ -32,6 +32,8 @@
<ui:include src="experimentDestroyDialog.xhtml"/>
</div>
</h:form>
......
src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
+ 3
− 6
View file @ ec5600af
......@@ -8,19 +8,16 @@
<c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<p:panelGrid columns="3" styleClass="createEntityDetails">
<p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="rootDataPath" value="Root Data Path" styleClass="entityDataLabel"/>
<h:inputText id="rootDataPath" value="#{experimentTypeObject.rootDataPath}" title="Root Data Path" styleClass="entityDataText"/>
<p:message for="rootDataPath"/>
</p:panelGrid>
......
src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+ 2
− 2
View file @ ec5600af
......@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<p:confirmDialog id="experimentTypeDestroyDialog" message="Destroy experiment type #{experimentTypeController.getCurrentEntityInstanceName()}?"
header="Destroy Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
<p:confirmDialog id="experimentTypeDestroyDialog" message="Delete experiment type #{experimentTypeController.getCurrentEntityInstanceName()}?"
header="Delete Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="experimentTypeDestroyDialogWidget.hide()" action="#{experimentTypeController.destroy()}"/>
<p:commandButton value="No" onclick="PF('experimentTypeDestroyDialogWidget').hide()" type="button" />
......
src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
+ 3
− 7
View file @ ec5600af
......@@ -9,23 +9,19 @@
<c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="3" styleClass="editEntityDetails">
<p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{experimentTypeObject.id}" title="Id" styleClass="entityDataText"/>
<p:message for="id"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="rootDataPath" value="Root Data Path" styleClass="entityDataLabel"/>
<h:inputText id="rootDataPath" value="#{experimentTypeObject.rootDataPath}" title="Root Data Path" styleClass="entityDataText"/>
<p:message for="rootDataPath"/>
</p:panelGrid>
</ui:composition>
......
src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+ 3
− 5
View file @ ec5600af
......@@ -8,15 +8,13 @@
<c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
<p:panelGrid columns="3" styleClass="createEntityDetails">
<p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Role Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{roleTypeObject.name}" title="Role Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:inputText id="name" value="#{roleTypeObject.name}" title="Role Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
......
src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
+ 2
− 2
View file @ ec5600af
......@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<p:confirmDialog id="roleTypeDestroyDialog" message="Destroy role #{roleTypeController.getCurrentEntityInstanceName()}?"
header="Destroy RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
<p:confirmDialog id="roleTypeDestroyDialog" message="Delete role #{roleTypeController.getCurrentEntityInstanceName()}?"
header="Delete RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="roleTypeDestroyDialogWidget.hide()" action="#{roleTypeController.destroy()}"/>
<p:commandButton value="No" onclick="PF('roleTypeDestroyDialogWidget').hide()" type="button" />
......
src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+ 2
− 5
View file @ ec5600af
......@@ -9,19 +9,16 @@
<c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="3" styleClass="editEntityDetails">
<p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{roleTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="name"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{roleTypeObject.id}" title="Id" styleClass="entityDataText"/>
<p:message for="id"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
</ui:composition>
src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
+ 3
− 10
View file @ ec5600af
......@@ -8,35 +8,28 @@
<c:set var="userInfoObject" value="#{userInfoController.selected}"/>
<p:panelGrid columns="3" styleClass="createEntityDetails">
<p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="username" value="#{userInfoObject.username}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
<p:message for="username"/>
<h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
<h:inputText id="lastName" value="#{userInfoObject.lastName}" title="Last Name" required="true" styleClass="entityDataText"/>
<p:message for="lastName"/>
<h:outputLabel for="firstName" value="First Name" styleClass="entityDataLabel"/>
<h:inputText id="firstName" value="#{userInfoObject.firstName}" title="First Name" required="true" styleClass="entityDataText"/>
<p:message for="firstName"/>
<h:inputText id="firstName" value="#{userInfoObject.firstName}" title="First Name" required="true" styleClass="entityDataText"/>
<h:outputLabel for="middleName" value="Middle Name" styleClass="entityDataLabel"/>
<h:inputText id="middleName" value="#{userInfoObject.middleName}" title="Middle Name" styleClass="entityDataText"/>
<p:message for="middleName"/>
<h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/>
<h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataText"/>
<p:message for="email"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel"/>
<p:password id="password" value="#{userInfoObject.password}" title="Password" feedback="true" styleClass="entityDataText"/>
<p:message for="password"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
......
src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
+ 2
− 2
View file @ ec5600af
......@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<p:confirmDialog id="userInfoDestroyDialog" message="Destroy user #{userInfoController.getCurrentEntityInstanceName()}?"
header="Destroy User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
<p:confirmDialog id="userInfoDestroyDialog" message="Delete user #{userInfoController.getCurrentEntityInstanceName()}?"
header="Delete User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="userInfoDestroyDialogWidget.hide()" action="#{userInfoController.destroy()}"/>
<p:commandButton value="No" onclick="PF('userInfoDestroyDialogWidget').hide()" type="button" />
......
src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
+ 3
− 11
View file @ ec5600af
......@@ -9,43 +9,35 @@
<c:set var="userInfoObject" value="#{userInfoController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
<p:panelGrid columns="3" styleClass="editEntityDetails">
<p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="username" value="#{userInfoObject.username}" rendered="#{isFieldWriteable}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputText id="usernameOutput" value="#{userInfoObject.username}" rendered="#{!isFieldWriteable}" title="Username" styleClass="entityDataEmphasizedText"/>
<p:message for="username"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{userInfoObject.id}" title="Id" styleClass="entityDataText"/>
<p:message for="id"/>
<h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
<h:inputText id="lastName" value="#{userInfoObject.lastName}" rendered="#{isFieldWriteable}" title="Last Name" required="true" styleClass="entityDataText"/>
<h:outputText id="lastNameOutput" value="#{userInfoObject.lastName}" rendered="#{!isFieldWriteable}" title="Last Name" styleClass="entityDataText"/>
<p:message for="lastName"/>
<h:outputLabel for="firstName" value="First Name" styleClass="entityDataLabel"/>
<h:inputText id="firstName" value="#{userInfoObject.firstName}" rendered="#{isFieldWriteable}" title="First Name" required="true" styleClass="entityDataText"/>
<h:outputText id="firstNameOutput" value="#{userInfoObject.firstName}" rendered="#{!isFieldWriteable}" title="First Name" styleClass="entityDataText"/>
<p:message for="firstName"/>
<h:outputText id="firstNameOutput" value="#{userInfoObject.firstName}" rendered="#{!isFieldWriteable}" title="First Name" styleClass="entityDataText"/>
<h:outputLabel for="middleName" value="Middle Name" styleClass="entityDataLabel"/>
<h:inputText id="middleName" value="#{userInfoObject.middleName}" title="Middle Name" rendered="#{isFieldWriteable}" styleClass="entityDataText"/>
<h:outputText id="middleNameOutput" value="#{userInfoObject.middleName}" title="Middle Name" rendered="#{!isFieldWriteable}" styleClass="entityDataText"/>
<p:message for="middleName"/>
<h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/>
<h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataText"/>
<p:message for="email"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel"/>
<p:password id="password" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataText"/>
<p:message for="password"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
<h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
<p:message for="description"/>
<h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
</ui:composition>
......
src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
+ 1
− 1
View file @ ec5600af
......@@ -16,7 +16,7 @@
<h:form id="adminListForm">
<div class="actionButton">
<p:commandButton id="systemRoleAddButton" onclick="PF('systemRoleAddDialogWidget').show();" rendered="#{userSystemRoleController.hasSystemRole(loginController.username)}" icon="ui-icon-plus" >
<p:commandButton id="systemRoleAddButton" value="Add" onclick="PF('systemRoleAddDialogWidget').show();" rendered="#{userSystemRoleController.hasSystemRole(loginController.username)}" icon="ui-icon-plus" >
<p:tooltip for="systemRoleAddButton" value="Add new Administrators."/>
</p:commandButton>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment