META-241: Display xml for the assessed items

api-common/src/main/resources/messages.properties

@@ -52,6 +52,7 @@ metadatasharing.cancel=Cancel
 metadatasharing.choose=Choose
 metadatasharing.choose.trustLevel=Choose trust level
 metadatasharing.next=Next
+metadatasharing.compare=Compare in Detail
 metadatasharing.proceed=Proceed
 metadatasharing.back=Back
 metadatasharing.packageContent=Package content

omod/src/main/java/org/openmrs/module/metadatasharing/web/controller/ImportController.java

@@ -56,10 +56,22 @@
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.servlet.ModelAndView;
+import org.xml.sax.InputSource;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -566,8 +578,40 @@ public void assessItem(@ModelAttribute(ITEMS)
 		assessItemForm.setIndex(index);
 		assessItemForm.setImportType(importedItem.getImportType());
 		model.addAttribute(assessItemForm);
+
+		XStream xstream= new XStream(new StaxDriver());
+		String xml1=xstream.toXML(importedItem.getIncoming());
+		String xml2=xstream.toXML(importedItem.getExisting());
+
+		String xmlIncomingString=formatXml(xml1);
+		String xmlExistingString=formatXml(xml2);
+
+		model.addAttribute("xmlExistingString",xmlExistingString);		
+		model.addAttribute("xmlIncomingString", xmlIncomingString);
+
 	}
 
+	 public static String formatXml(String xml) {
+
+	      try {
+	         Transformer serializer = SAXTransformerFactory.newInstance().newTransformer();
+
+	         serializer.setOutputProperty(OutputKeys.INDENT, "yes");
+	         serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+
+	         Source xmlSource = new SAXSource(new InputSource(
+	            new ByteArrayInputStream(xml.getBytes())));
+	         StreamResult res =  new StreamResult(new ByteArrayOutputStream());            
+
+	         serializer.transform(xmlSource, res);
+
+	         return new String(((ByteArrayOutputStream)res.getOutputStream()).toByteArray());
+
+	      } catch(Exception e) {
+	         return xml;
+	      }
+	   }
+
 	@RequestMapping(value = ITEM_PATH, method = RequestMethod.GET, params = "uuid")
 	public void assessItem(@ModelAttribute(ITEMS)
 	List<ImportedItem> items, Integer index, String uuid, Model model) {

omod/src/main/webapp/import/assessItem.jsp

@@ -10,13 +10,16 @@
 <%@ include file="../template/jqueryPage.jsp"%>
 <openmrs:htmlInclude
 	file="${pageContext.request.contextPath}/moduleResources/metadatasharing/css/metadatasharing.css" />
+
 
-<script type="text/javascript">
+<script type="text/javascript" >
 	var $j = jQuery.noConflict();
 	var chooseExistingTable;
 	var chooseExistingDialog;
+	var tableForItems;	
 
 	$j(document).ready(function() {
+				
 		chooseExistingTable = $j("#chooseExistingTable")
 				.dataTable(
 						{
@@ -85,7 +88,20 @@
 
 		$j('#chooseExistingButton').click(showChooseExistingDialog);
 
-		$j('#nextButton').focus();
+		$j('#nextButton').focus();				
+		
+		tableForItems = $j('#tableForItems').dialog(
+				{ autoOpen: false, modal: true, width: '95%', height: $j(window).height()-100,
+					resizable: false, draggable: false,
+					title: '<spring:message code="metadatasharing.compare" />'
+					 });
+		
+		$j('#compare').click(function() {		
+				tableForItems.dialog("open");	
+		});
+		
+		
+
 	});
 
 	function highlightDifferences() {
@@ -125,6 +141,7 @@
 		onclick="window.location='load.form'" />
 </p>
 
+
 <springform:form commandName="assessItemForm">
 		<spring:message code="metadatasharing.assessingItem" />
 		${assessItemForm.index + 1} <input
@@ -237,6 +254,9 @@
 				</fieldset>
 			</td>
 		</tr>
+
+	<tr>		<td><input type="button" id="compare" value="<spring:message code="metadatasharing.compare" />" /></td><td></td>
+	</tr>
 		<tr>
 			<td><springform:radiobutton path="importType" value="CREATE"
 					id="createButton" disabled="${!empty incomingInvalid}" />
@@ -274,6 +294,14 @@
 	</p>
 </springform:form>
 
+<div id="tableForItems">
+		<table><tr><th>Incoming Item</th><th>Existing Item</th></tr>
+		<tr><td><div id="str1"><pre> <c:out value="${xmlIncomingString}"/> </pre></div>
+		</td><td><div id="str2"><pre><c:out value="${xmlExistingString}"/></pre></div>
+		</td></tr>
+		</table>		
+</div>
+
 <div id="chooseExistingDialog">
 	<table id="chooseExistingTable" style="width: 100%">
 		<thead>