added select to make original order

Author: Nitish1814

common/client/src/main/java/zingg/common/client/util/DSUtil.java

@@ -272,12 +272,16 @@ public ZFrame<D,R,C> postProcessLabel(ZFrame<D,R,C> updatedLabelledRecords, ZFra
 		List<C> cols = new ArrayList<C>();
 		cols.add(updatedLabelledRecords.col(ColName.ID_COL));
 
+		String[] unmarkedRecordColumns = unmarkedRecords.columns();
+
 		//drop isMatch column from unMarked records
 		//and replace with updated isMatch column
 		cols.add(updatedLabelledRecords.col(ColName.MATCH_FLAG_COL));
 		ZFrame<D,R,C> zFieldsFromUpdatedLabelledRecords = updatedLabelledRecords.select(cols);
 		unmarkedRecords = unmarkedRecords.drop(ColName.MATCH_FLAG_COL);
-		return unmarkedRecords.joinOnCol(zFieldsFromUpdatedLabelledRecords, ColName.ID_COL);
+
+		//we are selecting columns to bring back to original shape
+		return unmarkedRecords.joinOnCol(zFieldsFromUpdatedLabelledRecords, ColName.ID_COL).select(unmarkedRecordColumns);
 	}
 
 

common/client/src/main/java/zingg/common/client/util/vertical/VerticalDisplayUtility.java

@@ -42,8 +42,8 @@ public ZFrame<D, R, C> convertVertical(ZFrame<D, R, C> zFrame) throws ZinggClien
             //and create model list
             List<VerticalDisplayModel> samples = new ArrayList<>();
             for (String column : columns) {
-                samples.add(new VerticalDisplayTwoRowModel(column, getString(zFrame.getAsString(row1, column)),
-                        getString(zFrame2.getAsString(row2, column))));
+                samples.add(new VerticalDisplayTwoRowModel(column, getString(zFrame.get(row1, column)),
+                        getString(zFrame2.get(row2, column))));
             }
             return dfObjectUtil.getDFFromObjectList(samples, VerticalDisplayTwoRowModel.class);
         } catch (Exception exception) {