Mercurial > hg > ismi-richfaces
diff src/main/webapp/merge/importMerge.xhtml @ 97:13b313ae1af8
new import-merge works now.
author | casties |
---|---|
date | Fri, 28 Oct 2016 18:21:07 +0200 |
parents | 895bf7494d17 |
children | 9b02c9af49b0 |
line wrap: on
line diff
--- a/src/main/webapp/merge/importMerge.xhtml Thu Oct 27 20:19:57 2016 +0200 +++ b/src/main/webapp/merge/importMerge.xhtml Fri Oct 28 18:21:07 2016 +0200 @@ -17,7 +17,7 @@ </div> <h:panelGrid rendered="#{Session.user != null}" - styleClass="mainPanel" columns="1"> + styleClass="mainPanel" id="mainPanel" columns="1"> @@ -31,7 +31,7 @@ <a4j:commandButton value="Load" actionListener="#{Session.importMerge.loadImportFile}" - render="loadListPanel,loadingPanel" /> + render="mainPanel,loadListPanel,loadingPanel,mergingPanel" /> <h:outputText value="#{Session.importMerge.importFileMsg}" @@ -42,7 +42,7 @@ <h:panelGrid columns="2" styleClass="createPanel" columnClasses="createPanelFirstColumn" id="loadingPanel" - rendered="#{Session.importMerge.importNodeListLength > 0}"> + rendered="#{Session.importMerge.getImportNodeListLength() > 0}"> <h:outputText value="Import Nodes" /> @@ -78,10 +78,23 @@ rendered="#{Session.importMerge.entitiesLoaded}" styleClass="titlePanel"/> - <h:panelGrid columns="2" styleClass="createPanel" + <h:panelGrid columns="3" styleClass="createPanel" columnClasses="createPanelFirstColumn,createPanelColumn02,createPanelColumn02" rendered="#{Session.importMerge.entitiesLoaded}"> + <h:outputText value="ID" /> + <h:outputText value="#{Session.importMerge.firstEntity.getId()}" /> + <h:outputText value="#{Session.importMerge.secondEntity.getId()}" /> + + <h:outputText value="Class" /> + <h:outputText value="#{Session.importMerge.firstEntity.getObjectClass()}" /> + <h:outputText value="#{Session.importMerge.secondEntity.getObjectClass()}" /> + + </h:panelGrid> + + <h:panelGrid columns="2" styleClass="createPanel" + columnClasses="createPanelFirstColumn,createPanelColumn02,createPanelColumn02" + rendered="#{Session.importMerge.entitiesLoaded}"> <h:outputText value="Attributes" /> <rich:dataTable var="attName" @@ -284,12 +297,18 @@ <h:outputText value="Entity Preview" - rendered="#{!empty Session.importMerge.entResult}" + rendered="#{Session.importMerge.entResult != null}" styleClass="titlePanel"/> + <h:panelGrid columns="2" styleClass="createPanel" columnClasses="createPanelFirstColumn" - rendered="#{!empty Session.importMerge.entResult}"> + rendered="#{Session.importMerge.entResult != null}"> + <h:outputText value="ID"/> + <h:outputText value="#{Session.importMerge.entResult.getId()}" styleClass="textBack"/> + + <h:outputText value="Class"/> + <h:outputText value="#{Session.importMerge.entResult.getObjectClass()}" styleClass="textBack"/> <h:outputText value="Attributes" /> <rich:dataTable