Mercurial > hg > ismi-richfaces

diff src/main/webapp/merge/referenceMerge.xhtml @ 87:545e47659e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging references works now.
author casties
date Thu, 06 Oct 2016 18:01:59 +0200
parents fd7beb701724
children 8d93f3a0108f
line wrap: on
line diff
--- a/src/main/webapp/merge/referenceMerge.xhtml	Wed Oct 05 15:36:46 2016 +0200
+++ b/src/main/webapp/merge/referenceMerge.xhtml	Thu Oct 06 18:01:59 2016 +0200
@@ -13,7 +13,7 @@
 		<ui:define name="privateContent">
 			
 			<div id="pageTitle">
-				<h:outputText value="Join References" />
+				<h:outputText value="Join References (source overwrites target)" />
 			</div>
 
             <!-- TODO: fix this! -->
@@ -27,7 +27,7 @@
 				<h:panelGrid columns="2" styleClass="createPanel"
 					columnClasses="createPanelFirstColumn" id="loadingPanel">
 
-					<h:outputText value="Load Entities" />
+					<h:outputText value="Load References" />
 
 					<h:panelGrid columns="4">
 
@@ -81,7 +81,7 @@
 
 				<h:panelGrid columns="1" id="mergingPanel">
 
-					<h:outputText value="Merge Mapping"
+					<h:outputText value="Preview changed references"
 						rendered="#{Session.referenceMerge.entitiesLoaded}"
 						styleClass="titlePanel"/>
 
@@ -90,191 +90,58 @@
 						rendered="#{Session.referenceMerge.entitiesLoaded}">
 
 
-						<h:outputText value="Attributes" />
-						<rich:dataTable var="attName"
-							value="#{Session.referenceMerge.attLabels}"
-							rendered="#{!empty Session.referenceMerge.attLabels}">
+						<h:outputText value="References" />
+						<rich:dataTable var="result"
+							value="#{Session.referenceMerge.previewResults}"
+							rendered="#{!empty Session.referenceMerge.previewResults}">
 							<h:column>
 								<f:facet name="header">
-									<h:outputText value="Attribute Name" />
+									<h:outputText value="ID" />
 								</f:facet>
-								<h:outputText value="#{attName}" />
+								<h:outputText value="#{result['id']}" />
 							</h:column>
 							<h:column>
 								<f:facet name="header">
-									<h:outputText value="Value First Entity" />
+									<h:outputText value="Old biblio ID" />
 								</f:facet>
 								<h:outputText
-									value="#{Session.referenceMerge.firstAttMap[attName]}" />
+									value="#{result['old-bib-id']}" />
 							</h:column>
 							<h:column>
 								<f:facet name="header">
-									<h:outputText value="Value Second Entity" />
+									<h:outputText value="New biblio ID" />
 								</f:facet>
 								<h:outputText
-									value="#{Session.referenceMerge.secondAttMap[attName]}" />
+									value="#{result['new-bib-id']}" />
 							</h:column>
-							<h:column style="width:300px;">
-								<f:facet name="header">
-									<h:outputText value="Select Value" />
-								</f:facet>
-								<h:selectOneRadio
-									value="#{Session.referenceMerge.selectedAtts[attName]}">
-									<f:selectItems value="#{Session.referenceMerge.attSelectItems}" />
-								</h:selectOneRadio>
-							</h:column>
+                            <h:column>
+                                <f:facet name="header">
+                                    <h:outputText value="New biblio label" />
+                                </f:facet>
+                                <h:outputText
+                                    value="#{result['new-endnote-content']}" />
+                            </h:column>
+                            <h:column>
+                                <f:facet name="header">
+                                    <h:outputText value="Additional information" />
+                                </f:facet>
+                                <h:outputText
+                                    value="#{result['additional-information']}" />
+                            </h:column>
+                            <h:column>
+                                <f:facet name="header">
+                                    <h:outputText value="Relations" />
+                                </f:facet>
+                                <h:outputText
+                                    value="#{result['related-entities']}" />
+                            </h:column>
 						</rich:dataTable>
-						<h:outputText />
-
-						<h:outputText value="Source Relations" />
-
-						<h:panelGrid columns="1">
-							<rich:dataTable var="srcRelation"
-								rendered="#{!empty Session.referenceMerge.firstEntity.sourceRelations}"
-								value="#{Session.referenceMerge.firstEntity.sourceRelations}">
-
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="Relation Name" />
-									</f:facet>
-									<h:outputText value="#{srcRelation.ownValue}" />
-								</h:column>
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="linked to this" />
-									</f:facet>
-									<h:outputText
-										value="#{srcRelation.target.ownValue} [#{srcRelation.target.objectClass}-#{srcRelation.targetId}]" />
-								</h:column>
-
-								<h:column>
-									<h:selectOneRadio
-										value="#{Session.referenceMerge.selectedFirstSrcRelations[srcRelation.id]}">
-										<f:selectItems value="#{Session.referenceMerge.relSelectItems}" />
-									</h:selectOneRadio>
-								</h:column>
-
-							</rich:dataTable>
-
-							<h:outputText
-								value="the first entity does not have source relations"
-								rendered="#{empty Session.referenceMerge.firstEntity.sourceRelations}" />
-						</h:panelGrid>
-
-						<h:panelGrid columns="1">
 
-							<rich:dataTable var="srcRelation"
-								rendered="#{!empty Session.referenceMerge.secondEntity.sourceRelations}"
-								value="#{Session.referenceMerge.secondEntity.sourceRelations}">
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="Relation Name" />
-									</f:facet>
-									<h:outputText value="#{srcRelation.ownValue}" />
-								</h:column>
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="linked to this" />
-									</f:facet>
-									<h:outputText
-										value="#{srcRelation.target.ownValue} [#{srcRelation.target.objectClass}-#{srcRelation.targetId}]" />
-								</h:column>
-								<h:column>
-									<h:selectOneRadio
-										value="#{Session.referenceMerge.selectedSecondSrcRelations[srcRelation.id]}">
-										<f:selectItems value="#{Session.referenceMerge.relSelectItems}" />
-									</h:selectOneRadio>
-								</h:column>
-							</rich:dataTable>
-							
-							<h:outputText
-								value="The second entity does not have source relations"
-								rendered="#{empty Session.referenceMerge.secondEntity.sourceRelations}" />
-
-						</h:panelGrid>
-
-
-						<h:outputText value="Target Relations" />
-
-						<h:panelGrid columns="1">
-							<rich:dataTable var="tarRelation"
-								rendered="#{!empty Session.referenceMerge.firstEntity.targetRelations}"
-								value="#{Session.referenceMerge.firstEntity.targetRelations}"
-								style="width:60%;">
-
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="linked from this" />
-									</f:facet>
-									<h:outputText
-										value="#{tarRelation.source.ownValue} [#{tarRelation.source.objectClass}-#{tarRelation.sourceId}]" />
-								</h:column>
-
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="Relation Name" />
-									</f:facet>
-									<h:outputText value="#{tarRelation.ownValue}" />
-								</h:column>
-
-								<h:column>
-									<h:selectOneRadio
-										value="#{Session.referenceMerge.selectedFirstTarRelations[tarRelation.id]}">
-										<f:selectItems value="#{Session.referenceMerge.relSelectItems}" />
-									</h:selectOneRadio>
-								</h:column>
-							</rich:dataTable>
-							<h:outputText
-								value="the first entity does not have target relations."
-								rendered="#{empty Session.referenceMerge.firstEntity.targetRelations}" />
-						</h:panelGrid>
-
-						<h:panelGrid columns="1">
-
-							<rich:dataTable var="tarRelation"
-								rendered="#{!empty Session.referenceMerge.secondEntity.targetRelations}"
-								value="#{Session.referenceMerge.secondEntity.targetRelations}"
-								style="width:60%;">
-
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="linked from this" />
-									</f:facet>
-									<h:outputText
-										value="#{tarRelation.source.ownValue} [#{tarRelation.source.objectClass}-#{tarRelation.sourceId}]" />
-								</h:column>
-
-								<h:column>
-									<f:facet name="header">
-										<h:outputText value="Relation Name" />
-									</f:facet>
-									<h:outputText value="#{tarRelation.ownValue}" />
-								</h:column>
-
-								<h:column>
-									<h:selectOneRadio
-										value="#{Session.referenceMerge.selectedSecondTarRelations[tarRelation.id]}">
-										<f:selectItems value="#{Session.referenceMerge.relSelectItems}" />
-									</h:selectOneRadio>
-								</h:column>
-
-							</rich:dataTable>
-
-							<h:outputText
-								value="The second entity does not have target relations"
-								rendered="#{empty Session.referenceMerge.secondEntity.targetRelations}" />
-
-						</h:panelGrid>
 					</h:panelGrid>
 
 					<h:panelGrid columns="2" styleClass="controlPanel"
 						rendered="#{Session.referenceMerge.entitiesLoaded}">
 
-						<a4j:commandButton value="Preview"
-							actionListener="#{Session.referenceMerge.preview}"
-							rendered="#{Session.referenceMerge.entitiesLoaded}"
-							render="mergingPanel" />
-
 						<a4j:commandButton value="Execute Merge"
 							actionListener="#{Session.referenceMerge.listenerExecuteMerge }"
 							rendered="#{Session.referenceMerge.entitiesLoaded}"
@@ -284,90 +151,6 @@
 					</h:panelGrid>
 
 
-					<h:outputText value="Entity Preview"
-						rendered="#{!empty Session.referenceMerge.entResult}"
-						styleClass="titlePanel"/>
-					<h:panelGrid columns="2" styleClass="createPanel"
-						columnClasses="createPanelFirstColumn"
-						rendered="#{!empty Session.referenceMerge.entResult}">
-
-
-						<h:outputText value="Attributes" />
-						<rich:dataTable
-							value="#{Session.referenceMerge.entResult.attributes}"
-							var="attribute" border="1">
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="Name" />
-								</f:facet>
-								<h:outputText value="#{attribute.objectClass}" />
-							</h:column>
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="Value" />
-								</f:facet>
-								<h:outputText value="#{attribute.ownValue}" />
-							</h:column>
-						</rich:dataTable>
-
-
-						<h:outputText value="Source Relations" />
-						<rich:dataTable
-							value="#{Session.referenceMerge.entResult.sourceRelations}"
-							var="srcRelation" border="1">
-
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="linked from this" />
-								</f:facet>
-								<h:outputText value="#{'x'}" />
-							</h:column>
-
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="Relation Name" />
-								</f:facet>
-								<h:outputText value="#{srcRelation.ownValue}" />
-							</h:column>
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="linked to this" />
-								</f:facet>
-								<h:outputText
-									value="#{srcRelation.target.ownValue} [#{srcRelation.target.objectClass}]" />
-							</h:column>
-						</rich:dataTable>
-
-						<h:outputText value="Target Relations" />
-						<rich:dataTable
-							value="#{Session.referenceMerge.entResult.targetRelations}"
-							var="tarRelation" border="1">
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="linked from this" />
-								</f:facet>
-								<h:outputText
-									value="#{tarRelation.source.ownValue} [#{tarRelation.source.objectClass}]" />
-							</h:column>
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="Relation Name" />
-								</f:facet>
-								<h:outputText value="#{tarRelation.ownValue}" />
-							</h:column>
-							<h:column>
-								<f:facet name="header">
-									<h:outputText value="linked to this" />
-								</f:facet>
-								<h:outputText value="#{'x'}" />
-							</h:column>
-						</rich:dataTable>
-
-
-					</h:panelGrid>
-
-
-
 				</h:panelGrid>