Compare revisions

8c32e6de · 8c32e6de · 8c32e6de · 8c32e6de · 8c32e6de · 8c32e6de
--- a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyListEditDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/policyPropertyListEditDataTable.xhtml
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this license header, choose License Headers in Project Properties.
+To change this template file, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE html>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <div class="actionButton">
+        <p:commandButton id="policyPropertyAddButton" action="#{policyPropertyController.prepareCreate()}" rendered="#{loginController.admin}" value="Add" alt="Add new Policy Property" icon="ui-icon-plus" update="@form">
+            <p:tooltip for="policyPropertyAddButton" value="Create new Policy Property."/>
+        </p:commandButton>        
+        <p:commandButton id="policyPropertyResetFiltersButton" action="#{policyTypeController.prepareEdit(policyTypeController.current)}" actionListener="#{policyPropertyController.resetList()}" alt="Clear Filters" icon="ui-icon-refresh" styleClass="actionButtonRight">
+            <p:tooltip for="policyPropertyResetFiltersButton" value="Reset list filters."/>
+        </p:commandButton>
+        <p:commandButton id="policyPropertyNoOp" style="visibility:hidden" value="NoOp"/>
+        <p:defaultCommand target="policyPropertyNoOp"/>
+    </div>
+
+    <p:dataTable id="policyPropertyListDataTable"                              
+                 var="policyPropertyObject" 
+                 value="#{policyPropertyController.listDataModel}" 
+                 filteredValue="#{policyPropertyController.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="#{policyPropertyController.rows}"
+                 binding="#{policyPropertyController.listDataTable}"
+                 widgetVar="policyPropertyListWidget" 
+                 emptyMessage="No policy properties found." >
+
+
+        <p:column sortBy="#{policyPropertyObject.id}" headerText="Id" >
+            <h:outputText value="#{policyPropertyObject.id}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.name}" headerText="Property Name" 
+                  filterBy="#{policyPropertyObject.name}" filterMatchMode="contains" >
+            <h:outputText value="#{policyPropertyObject.name}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.defaultValue}" headerText="Default Value" 
+                  filterBy="#{policyPropertyObject.defaultValue}" filterMatchMode="contains" >
+            <h:outputText value="#{policyPropertyObject.defaultValue}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.units}" headerText="Units" 
+                  filterBy="#{policyPropertyObject.units}" filterMatchMode="contains" >
+            <h:outputText value="#{policyPropertyObject.units}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.lowerLimit}" headerText="Lower Limit" 
+                  filterBy="#{policyPropertyObject.lowerLimit}" filterMatchMode="contains" >
+            <h:outputText value="#{policyPropertyObject.lowerLimit}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.upperLimit}" headerText="Upper Limit" 
+                  filterBy="#{policyPropertyObject.upperLimit}" filterMatchMode="contains" >
+            <h:outputText value="#{policyPropertyObject.upperLimit}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyPropertyObject.description}" headerText="Description" 
+                  filterBy="#{policyPropertyObject.description}" filterMatchMode="contains">
+            <h:outputText value="#{policyPropertyObject.description}"/>
+        </p:column>
+
+        <p:column headerText="Actions" >
+            <div class="actionLink">
+                <p:commandLink action="#{policyPropertyController.prepareView(policyPropertyObject)}" actionListener="#{allowedPolicyValueController.setPolicyProperty(policyPropertyObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
+                <p:commandLink action="#{policyPropertyController.prepareEdit(policyPropertyObject)}" actionListener="#{allowedPolicyValueController.setPolicyProperty(policyPropertyObject)}" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+                <p:commandLink oncomplete="PF('policyPropertyDestroyDialogWidget').show()" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                    <f:setPropertyActionListener value="#{policyPropertyObject}" target="#{policyPropertyController.current}"/>
+                </p:commandLink>
+            </div>
+        </p:column>
+    </p:dataTable>
+                <ui:include src="policyPropertyDestroyDialog.xhtml"/>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/policyProperty/policyPropertyViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/policyPropertyViewPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="policyPropertyObject" value="#{policyPropertyController.current}"/>
+
+    <p:panelGrid columns="2" styleClass="editEntityDetails"> 
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{policyPropertyObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="units" value="Units" styleClass="entityDataLabel"/>
+        <h:outputText id="units" value="#{policyPropertyObject.units}" title="Units" styleClass="entityDataText"/>
+
+        <h:outputLabel for="defaultValue" value="Default Value" styleClass="entityDataLabel"/>
+        <h:outputText id="defaultValue" value="#{policyPropertyObject.defaultValue}" title="Default Value" styleClass="entityDataText"/>
+
+        <h:outputLabel for="lowerLimit" value="Lower Limit" styleClass="entityDataLabel"/>
+        <h:outputText id="lowerLimit" value="#{policyPropertyObject.lowerLimit}" title="Lower Limit" styleClass="entityDataText"/>
+
+        <h:outputLabel for="upperLimit" value="Upper Limit" styleClass="entityDataLabel"/>
+        <h:outputText id="upperLimit" value="#{policyPropertyObject.upperLimit}" title="Upper Limit" styleClass="entityDataText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:outputText id="description" value="#{policyPropertyObject.description}" title="Description" styleClass="entityDataText"/>     
+        
+    </p:panelGrid>
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyProperty/view.xhtml
+++ b/src/java/DmWebPortal/web/views/policyProperty/view.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+        <ui:define name="middleCenter">
+            <h:form id="viewPolicyPropertyForm">
+
+                <div class="middleCenterLeftContent">
+                    <div class="pageTitle">
+                        <h1>Policy Type: #{policyTypeController.current.name} <br/>
+                           Policy Property: #{policyPropertyController.current.name}</h1>
+                    </div>
+
+                    <ui:param name="policyPropertyObject" value="#{policyPropertyController.selected}"/>
+                    <p:accordionPanel multiple="true" activeIndex="0,1" >
+                        <p:tab title="Policy Property Description">
+                            <div class="middleCenterLeftContent">
+                                <ui:include src="policyPropertyViewPanelGrid.xhtml"/>
+                            </div>
+                        </p:tab>
+
+                        <p:tab title="Allowed Policy Values">                
+                            <ui:include src="/views/allowedPolicyValue/allowedPolicyValueListDataTable.xhtml"/>
+                        </p:tab>
+                    </p:accordionPanel>
+
+                    <p/>
+
+                    <div class="actionButton">
+                        <p:commandButton action="#{policyPropertyController.prepareEdit(policyPropertyObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                        <p:commandButton action="#{policyPropertyController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                    </div>          
+                </div>
+            </h:form>
+
+        </ui:define>
+    </ui:composition>
+
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/policyType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/edit.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+    
+    <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">
+        <ui:define name="middleCenter">
+            <h:form id="editPolicyTypeForm">
+
+                <div class="middleCenterLeftContent">
+                    <div class="pageTitle">
+                        <h1>Edit #{policyTypeController.current.name} Policy Type</h1>
+                    </div>
+
+
+                    <ui:param name="policyTypeObject" value="#{policyTypeController.selected}"/>
+                    <p:accordionPanel multiple="true" activeIndex="0,1" >
+                        <p:tab title="Policy Type Description">
+                            <div class="middleCenterLeftContent">
+                                <ui:include src="policyTypeEditPanelGrid.xhtml"/>
+                            </div>
+                        </p:tab>
+
+                        <p:tab title="Properties">                
+                             <ui:include src="/views/policyProperty/policyPropertyListEditDataTable.xhtml"/>
+                        </p:tab>
+                    </p:accordionPanel>
+
+                    <p/>
+
+                    <div class="actionButton">
+                        <p:commandButton action="#{policyTypeController.update()}" actionListener="#{policyPropertyController.clear()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                        <p:commandButton action="#{policyTypeController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                    </div>
+                </div>
+
+            </h:form>
+
+        </ui:define>
+    </ui:composition>
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/list.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <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>Policy Types</h1>
+        </div>
+
+        <h:form id="viewEntityTypeListForm">
+            <ui:param name="entityController" value="#{policyTypeController}"/>
+
+            <div class="actionButton">
+                <p:commandButton id="#{entityTypeName}ResetFiltersButton" action="#{entityController.resetList()}" alt="Clear Filters" icon="ui-icon-refresh" styleClass="actionButtonRight">
+                    <p:tooltip for="#{entityTypeName}ResetFiltersButton" value="Reset list filters."/>
+                </p:commandButton>
+                <p:commandButton id="#{entityTypeName}NoOp" style="visibility:hidden" value="NoOp"/>
+                <p:defaultCommand target="#{entityTypeName}NoOp"/>
+            </div>
+
+            <h:panelGroup>  
+                <ui:include src="policyTypeListDataTable.xhtml"/>
+            </h:panelGroup>
+
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyType/policyTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/policyTypeEditPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="policyTypeObject" value="#{policyTypeController.current}"/>
+
+    <p:panelGrid columns="2" styleClass="editEntityDetails"> 
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{policyTypeObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{policyTypeObject.description}" title="Description" styleClass="entityDataText"/>     
+        
+    </p:panelGrid>
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyType/policyTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/policyTypeListDataTable.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <p:dataTable id="policyTypeListDataTable"                              
+                 var="policyTypeObject" 
+                 value="#{policyTypeController.listDataModel}" 
+                 filteredValue="#{policyTypeController.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="25"
+                 binding="#{policyTypeController.listDataTable}"
+                 widgetVar="policyTypeListWidget" 
+                 emptyMessage="No role types found." >
+
+
+        <p:column sortBy="#{policyTypeObject.id}" headerText="Id" >
+            <h:outputText value="#{policyTypeObject.id}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyTypeObject.name}" headerText="Policy Type" 
+                  filterBy="#{policyTypeObject.name}" filterMatchMode="contains" >
+            <h:outputText value="#{policyTypeObject.name}"/>
+        </p:column>
+
+        <p:column sortBy="#{policyTypeObject.description}" headerText="Description" 
+                  filterBy="#{policyTypeObject.description}" filterMatchMode="contains">
+            <h:outputText value="#{policyTypeObject.description}"/>
+        </p:column>
+
+        <p:column headerText="Actions" >
+            <div class="actionLink">
+                <p:commandLink action="#{policyTypeController.prepareView(policyTypeObject)}" actionListener="#{policyPropertyController.setPolicyType(policyTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
+                <p:commandLink action="#{policyTypeController.prepareEdit(policyTypeObject)}" actionListener="#{policyPropertyController.setPolicyType(policyTypeObject)}" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+            </div>
+        </p:column>
+    </p:dataTable>
+
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyType/policyTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/policyTypeViewPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="policyTypeObject" value="#{policyTypeController.current}"/>
+
+    <p:panelGrid columns="2" styleClass="viewEntityDetails">
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{policyTypeObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:outputText id="description" value="#{policyTypeObject.description}" title="Description" styleClass="entityDataText"/>
+        
+    </p:panelGrid>
+
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/policyType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/policyType/view.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+        <ui:define name="middleCenter">
+            <h:form id="viewPolicyTypeForm">
+
+                <div class="middleCenterLeftContent">
+                    <div class="pageTitle">
+                        <h1>Policy Type: #{policyTypeController.current.name}</h1>
+                    </div>
+
+                    <ui:param name="policyTypeObject" value="#{policyTypeController.selected}"/>
+                    <p:accordionPanel multiple="true" activeIndex="0,1" >
+                        <p:tab title="Policy Type Description">
+                            <div class="middleCenterLeftContent">
+                                <ui:include src="policyTypeViewPanelGrid.xhtml"/>
+                            </div>
+                        </p:tab>
+
+                        <p:tab title="Properties">                
+                            <ui:include src="../policyProperty/policyPropertyListDataTable.xhtml"/>
+                        </p:tab>
+                    </p:accordionPanel>
+
+                    <p/>
+
+                    <div class="actionButton">
+                        <p:commandButton action="#{policyTypeController.prepareEdit(policyTypeObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                        <p:commandButton action="#{policyTypeController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                    </div>          
+                </div>
+            </h:form>
+
+        </ui:define>
+    </ui:composition>
+
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/roleType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/edit.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+    
+    <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">
+    <ui:define name="middleCenter">
+        <h:form id="editRoleTypeForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Edit Role Type</h1>
+                </div>
+
+                <ui:include src="roleTypeEditPanelGrid.xhtml"/>
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton action="#{roleTypeController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                    <p:commandButton action="#{roleTypeController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+            </div>
+
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/roleType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/list.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <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>Role Types</h1>
+        </div>
+
+        <h:form id="viewRoleTypeListForm">
+            <ui:param name="entityController" value="#{roleTypeController}"/>
+
+            <div class="actionButton">
+                <p:commandButton id="#{entityTypeName}ResetFiltersButton" action="#{entityController.resetList()}" alt="Clear Filters" icon="ui-icon-refresh" styleClass="actionButtonRight">
+                    <p:tooltip for="#{entityTypeName}ResetFiltersButton" value="Reset list filters."/>
+                </p:commandButton>
+                <p:commandButton id="#{entityTypeName}NoOp" style="visibility:hidden" value="NoOp"/>
+                <p:defaultCommand target="#{entityTypeName}NoOp"/>
+            </div>
+
+            <h:panelGroup>  
+                <ui:include src="roleTypeListDataTable.xhtml"/>
+            </h:panelGroup>
+
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
+
+    <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" styleClass="entityDataEmphasizedText"/> 
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>       
+        
+    </p:panelGrid>
+
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="editEntityDetails"> 
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{roleTypeObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>     
+        
+    </p:panelGrid>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeListDataTable.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <p:dataTable id="roleTypeListDataTable"                              
+                 var="roleTypeObject" 
+                 value="#{roleTypeController.listDataModel}" 
+                 filteredValue="#{roleTypeController.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="#{roleTypeController.rows}"
+                 binding="#{roleTypeController.listDataTable}"
+                 widgetVar="roleTypeListWidget" 
+                 emptyMessage="No role types found." >
+
+
+        <p:column sortBy="#{roleTypeObject.id}" headerText="Id" >
+            <h:outputText value="#{roleTypeObject.id}"/>
+        </p:column>
+
+        <p:column sortBy="#{roleTypeObject.name}" headerText="Role Type" 
+                  filterBy="#{roleTypeObject.name}" filterMatchMode="contains" >
+            <h:outputText value="#{roleTypeObject.name}"/>
+        </p:column>
+
+        <p:column sortBy="#{roleTypeObject.description}" headerText="Description" 
+                  filterBy="#{roleTypeObject.description}" filterMatchMode="contains">
+            <h:outputText value="#{roleTypeObject.description}"/>
+        </p:column>
+
+        <p:column headerText="Actions" >
+            <div class="actionLink">
+                <p:commandLink action="#{roleTypeController.prepareView(roleTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
+                <p:commandLink action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+                <p:commandLink action="#{userSystemRoleController.prepareSystemRoleView()}" rendered="#{roleTypeController.isRoleSystemType(roleTypeObject)}"  styleClass="ui-icon ui-icon-person" title="List All" >
+                    <f:setPropertyActionListener value="#{roleTypeObject}" target="#{userSystemRoleController.systemRole}"/>
+                </p:commandLink>
+            </div>
+        </p:column>
+    </p:dataTable>
+
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="viewEntityDetails">
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{roleTypeObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:outputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
+        
+    </p:panelGrid>
+
+</ui:composition>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/views/roleType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/view.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+    <ui:define name="middleCenter">
+        <h:form id="viewRoleTypeForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Role Type Details</h1>
+                </div>
+
+                <ui:include src="roleTypeViewPanelGrid.xhtml"/>
+                
+                <p/>
+                <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
+                <div class="actionButton">
+                    <p:commandButton action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                    <p:commandButton action="#{roleTypeController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>          
+            </div>
+
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/userInfo/create.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/create.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+    
+    <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">
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Add User</h1>
+        </div>
+
+        <h:form id="addUserInfoForm">
+
+            <ui:include src="userInfoCreatePanelGrid.xhtml"/>
+
+            <p/>
+            <div class="actionButton">
+                <p:commandButton action="#{userInfoController.create()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                <p:commandButton action="#{userInfoController.prepareList()}" immediate="true" value="Cancel" alt="Cancel" icon="ui-icon-cancel"/>
+            </div>
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+    
+    <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">
+    <ui:define name="middleCenter">
+        <h:form id="editUserInfoForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Edit User #{userInfoController.current.username}</h1>
+                </div>
+
+                <ui:include src="userInfoEditPanelGrid.xhtml"/>
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton action="#{userInfoController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                    <p:commandButton action="#{userInfoController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+            </div>
+            <div class="middleCenterRightContent">
+
+            </div>
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                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">
+
+    <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>Registered Users</h1>
+        </div>
+
+        <h:form id="viewUserInfoListForm">
+            <ui:param name="entityController" value="#{userInfoController}"/>
+            <ui:include src="../common/commonListActionButtons.xhtml"/>
+
+            <h:panelGroup>  
+                <ui:include src="userInfoListDataTable.xhtml"/>
+            </h:panelGroup>
+
+            <ui:include src="userInfoDestroyDialog.xhtml"/>
+
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/userInfo/userExperimentsListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userExperimentsListDataTable.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <div>
+        <p:commandButton id="ResetFiltersButton" action="#{userInfoController.userExperimentsListTable.resetList()}" alt="Clear Filters" icon="ui-icon-refresh" styleClass="actionButtonRight" oncomplete="PF('userExperimentsListWidget').clearFilters()" update="userExperimentsListDataTable">
+            <p:tooltip for="ResetFiltersButton" value="Reset filters."/>
+        </p:commandButton>
+        <p:commandButton id="#{entityTypeName}NoOp" style="visibility:hidden" value="NoOp"/>
+        <p:defaultCommand target="#{entityTypeName}NoOp"/>
+    </div>
+
+    <p:dataTable id="userExperimentsListDataTable"                              
+                 var="userExperimentObject" 
+                 value="#{userInfoController.userExperimentsListTable.listDataModel}" 
+                 filteredValue="#{userInfoController.userExperimentsListTable.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="#{userInfoController.rows}"
+                 binding="#{userInfoController.userExperimentsListTable.listDataTable}"
+                 widgetVar="userExperimentsListWidget" 
+                 emptyMessage="No experiments found.">
+
+        <p:column sortBy="#{userExperimentObject.experimentName}" headerText="Experiment Name"
+                  filterBy="#{userExperimentObject.experimentName}" filterMatchMode="contains" >
+            <h:outputText value="#{userExperimentObject.experimentName}"/>
+        </p:column>
+
+        <p:column sortBy="#{userExperimentObject.description}" headerText="Description" 
+                  filterBy="#{userExperimentObject.description}" filterMatchMode="contains" >
+            <h:outputText value="#{userExperimentObject.description}"/>
+        </p:column>                  
+
+
+        <p:column sortBy="#{!userExperimentObject.isManager}" headerText="Manager">
+            <h:outputText value="" styleClass="ui-icon ui-icon-check" rendered="#{userExperimentObject.isManager}" /> 
+        </p:column>
+
+        <p:column sortBy="#{!userExperimentObject.isPI}" headerText="Principal Investigator">
+            <h:outputText value="" styleClass="ui-icon ui-icon-check" rendered="#{userExperimentObject.isPI}" />  
+        </p:column>
+
+        <p:column sortBy="#{!userExperimentObject.isUser}" headerText="User">
+            <h:outputText value="" styleClass="ui-icon ui-icon-check" rendered="#{userExperimentObject.isUser}" />   
+        </p:column>
+
+
+    </p:dataTable>
+
+</ui:composition>
No results found