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

No commit message 

No commit message
parent 9068b7b9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 83 additions and 44 deletions
src/java/DmWebPortal/web/views/experiment/experimentPolicyAddDialog.xhtml
+ 32
− 38
View file @ 25127f79
......@@ -11,7 +11,7 @@
header="Add experiment policies" widgetVar="experimentPolicyAddDialogWidget" dynamic="true" styleClass="dialog" width="800">
<p:dataTable id="addExperimentPolicyList"
var="experimentPolicyObject"
var="missingPolicy"
value="#{experimentController.noPolicyValueTable.listDataModel}"
filteredValue="#{experimentController.noPolicyValueTable.filteredObjectList}"
paginator="true"
......@@ -19,52 +19,46 @@
rows="#{experimentController.rows}"
binding="#{experimentController.noPolicyValueTable.listDataTable}"
widgetVar="experimentPolicyAddTableWidgetVar"
selection="#{experimentController.getNoPolicyValueTable().getNoPropertyList(experimentPolicyObject.getId()).selectedObjectList}"
rowKey="#{propertyValue.getPolicyProperty().name}"
selection="#{experimentController.getNoPolicyValueTable().selectedObjectList}"
rowKey="#{missingPolicy.id}"
rowSelectMode="true"
selectionMode="multiple"
emptyMessage="No policies found.">
<p:columnGroup type="header" >
<p:column headerText="Property" />
<p:column headerText="Value" />
<p:column headerText="Units" />
<p:column headerText="Description" />
</p:columnGroup>
<p:subTable var="propertyValue" value="#{experimentController.getNoPolicyValueTable().getNoPropertyList(experimentPolicyObject.getId())}" >
<f:facet name="header" >
<h:outputText value="#{experimentPolicyObject.policyType.name} Policy"/>
</f:facet>
<p:column headerText="PolicyType">
<h:outputText value="#{missingPolicy.getPolicyProperty().getPolicyType().name}"/>
</p:column>
<p:column headerText="Property" >
<h:outputText value="#{missingPolicy.getPolicyProperty().name}"/>
</p:column>
<p:column headerText="Value">
<h:inputText id="missingPolicy" value="#{missingPolicy.value}" rendered="#{!missingPolicy.hasAllowedValues()}" styleClass="entityDataTextShort"/>
<p:column >
<h:outputText value="#{propertyValue.getPolicyProperty().name}"/>
</p:column>
<p:column>
<h:inputText id="propertyValue" value="#{propertyValue.value}" rendered="#{!policyPropertyController.hasAllowedValues(propertyValue.getPolicyProperty())}" styleClass="entityDataTextShort"/>
<p:selectOneMenu id="missingPolicySelect" value="#{missingPolicy.value}" styleClass="entityDataText" rendered="#{missingPolicy.hasAllowedValues()}">
<f:selectItems value="#{missingPolicy.getPolicyProperty().allowedPolicyValueList}"
var="allowedPolicyValue"
itemValue="#{allowedPolicyValue.policyValue}"
itemLabel="#{allowedPolicyValue.policyValue}" />
</p:selectOneMenu>
<p:tooltip for="missingPolicy" value="Modify property value" />
</p:column>
<p:column headerText="Units">
<h:outputText value="#{missingPolicy.getPolicyProperty().units}"/>
</p:column>
<p:column headerText="Description">
<h:outputText value="#{missingPolicy.getPolicyProperty().description}"/>
</p:column>
<p:selectOneMenu id="propertyValueSelect" value="#{propertyValue.value}" styleClass="entityDataText" rendered="#{policyPropertyController.hasAllowedValues(propertyValue.getPolicyProperty())}">
<f:selectItems value="#{propertyValue.getPolicyProperty().allowedPolicyValueList}"
var="allowedPolicyValue"
itemValue="#{allowedPolicyValue.policyValue}"
itemLabel="#{allowedPolicyValue.policyValue}" />
</p:selectOneMenu>
<p:tooltip for="propertyValue" value="Modify property value" />
</p:column>
<p:column>
<h:outputText value="#{propertyValue.getPolicyProperty().units}"/>
</p:column>
<p:column>
<h:outputText value="#{propertyValue.getPolicyProperty().description}"/>
</p:column>
</p:subTable>
<f:facet name="footer">
<p:commandButton value="Add" action="#{experimentController.addExperimentUser()}" oncomplete="PF('experimentUserAddDialogWidget').hide()" update="@form"/>
<p:commandButton value="Clear Selection" onclick="PF('experimentUserAddTableWidgetVar').unselectAllRows()" />
</f:facet>
<f:facet name="footer">
<p:commandButton value="Add" action="#{experimentController.addExperimentPolicyPropertyValues()}" oncomplete="PF('experimentPolicyAddDialogWidget').hide()" update="@form"/>
<p:commandButton value="Clear Selection" onclick="PF('experimentPolicyAddTableWidgetVar').unselectAllRows()" />
</f:facet>
</p:dataTable>
</p:dialog>
</ui:composition>
src/java/DmWebPortal/web/views/experiment/experimentPolicyRemoveDialog.xhtml
+ 1
− 1
View file @ 25127f79
......@@ -7,7 +7,7 @@
<p:confirmDialog id="experimentPolicyRemoveDialog" message="Remove policy #{experimentController.getRemovedPolicyName()} from Experiment?"
header="Remove Policy" severity="alert" widgetVar="experimentPolicyRemoveDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="PF('experimentPolicyRemoveDialogWidget').hide()" action="#{experimentController.updateExperimentPolicy()}" actionListener="#{experimentController.removePolicy()}" update="@form"/>
<p:commandButton value="Yes" oncomplete="PF('experimentPolicyRemoveDialogWidget').hide()" action="#{experimentController.updateRemovedExperimentPolicy()}" actionListener="#{experimentController.removePolicy()}" update="@form"/>
<p:commandButton value="No" onclick="PF('experimentPolicyRemoveDialogWidget').hide()" type="button" />
</p:confirmDialog>
</ui:composition>
src/java/DmWebPortal/web/views/experiment/list.xhtml
+ 3
− 1
View file @ 25127f79
......@@ -7,11 +7,13 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Experiments List</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<div class="pageTitle">
<h1>Experiments</h1>
<h1>Experiments</h1>
</div>
<h:form id="viewExperimentListForm">
......
src/java/DmWebPortal/web/views/experiment/view.xhtml
+ 4
− 0
View file @ 25127f79
......@@ -7,7 +7,11 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Experiment View</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{experimentController.notSelected()}" />
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<h:form id="viewExperimentForm">
......
src/java/DmWebPortal/web/views/experimentType/create.xhtml
+ 3
− 1
View file @ 25127f79
......@@ -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 Type Edit</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/experimentType/edit.xhtml
+ 4
− 1
View file @ 25127f79
......@@ -6,8 +6,11 @@
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 Type Edit</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{experimentTypeController.notSelected()}" />
<h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/experimentType/list.xhtml
+ 2
− 0
View file @ 25127f79
......@@ -7,6 +7,8 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Experiment Types List</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/experimentType/view.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Experiment Type View</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{experimentTypeController.notSelected()}" />
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<h:form id="viewExperimentTypeForm">
......
src/java/DmWebPortal/web/views/home.xhtml
+ 2
− 0
View file @ 25127f79
......@@ -9,6 +9,8 @@
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Data Management System Portal Home</title>
<h:outputScript library="js/common" name="forwardFromHome.js" rendered="#{!loginController.loggedIn}" />
<ui:composition template="../templates/dmViewTemplate.xhtml">
......
src/java/DmWebPortal/web/views/loginHelp.xhtml
+ 1
− 1
View file @ 25127f79
......@@ -8,7 +8,7 @@
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="../resources/css/login.css" rel="stylesheet" type="text/css" />
<title>Data Management System Login</title>
<title>Data Management System Login Help</title>
</h:head>
......
src/java/DmWebPortal/web/views/policyProperty/create.xhtml
+ 3
− 1
View file @ 25127f79
......@@ -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>Policy Property 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/policyProperty/edit.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Policy Property Edit</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{policyPropertyController.notSelected()}" />
<h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/policyProperty/view.xhtml
+ 4
− 0
View file @ 25127f79
......@@ -7,7 +7,11 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Policy Property View</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{policyPropertyController.notSelected()}" />
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<h:form id="viewPolicyPropertyForm">
......
src/java/DmWebPortal/web/views/policyType/edit.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Policy Type Edit</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{policyTypeController.notSelected()}" />
<h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/policyType/list.xhtml
+ 2
− 0
View file @ 25127f79
......@@ -7,6 +7,8 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Policy Types List</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/policyType/view.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Policy Type View</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{policyTypeController.notSelected()}" />
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<h:form id="viewPolicyTypeForm">
......
src/java/DmWebPortal/web/views/roleType/edit.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Role Type Edit</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{roleTypeController.notSelected()}" />
<h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/roleType/list.xhtml
+ 2
− 0
View file @ 25127f79
......@@ -7,6 +7,8 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Role Types List</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
......
src/java/DmWebPortal/web/views/roleType/view.xhtml
+ 3
− 0
View file @ 25127f79
......@@ -7,7 +7,10 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>Role Type View</title>
<h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
<h:outputScript library="js/common" name="noBack.js" rendered="#{roleTypeController.notSelected()}" />
<ui:composition template="../../templates/dmViewTemplate.xhtml">
<ui:define name="middleCenter">
<h:form id="viewRoleTypeForm">
......
src/java/DmWebPortal/web/views/userInfo/create.xhtml
+ 2
− 0
View file @ 25127f79
......@@ -7,6 +7,8 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
<title>User 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">
......
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