Test HQL: GWT

- Test HQL page rewritten to GWT
  (set unitime.legacy.hibernateQueryTest to true for the old Struts-based page)
- A few changes done to the HQL Reports page, so that the two pages share as much code as possible

Author: tomas-muller

JavaSource/org/unitime/timetable/action/HibernateQueryTestAction.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -103,6 +104,17 @@ public class HibernateQueryTestAction extends UniTimeAction<HibernateQueryTestFo
 
 	@Override
     public String execute() throws Exception {
+		if (ApplicationProperty.LegacyTestHQL.isFalse()) {
+    		String url = "hibernateQueryTest";
+    		boolean first = true;
+    		for (Enumeration<String> e = getRequest().getParameterNames(); e.hasMoreElements(); ) {
+    			String param = e.nextElement();
+    			url += (first ? "?" : "&") + param + "=" + URLEncoder.encode(getRequest().getParameter(param), "utf-8");
+    			first = false;
+    		}
+    		response.sendRedirect(url);
+			return null;
+    	}
     	sessionContext.checkPermission(Right.TestHQL);
     	if (form == null)
     		form = new HibernateQueryTestForm();
@@ -168,7 +180,7 @@ public String execute() throws Exception {
     		response.setDateHeader("Date", new Date().getTime());
     		response.setDateHeader("Expires", 0);
     		response.setHeader("Content-Disposition", "attachment; filename=\"hql-test.csv\"" );
-        	TestHqlExportToCSV.execute(sessionContext.getUser(), out, query, 0, -1);
+        	TestHqlExportToCSV.execute(sessionContext.getUser(), out, query, null, 0, -1);
         	out.close();
         	return null;
         }

JavaSource/org/unitime/timetable/defaults/ApplicationProperty.java

@@ -3863,6 +3863,11 @@ public enum ApplicationProperty {
 	@Description("Contact Us: switch the user interface back to the old (Struts-based) contact us page")
 	LegacyInquiry("unitime.legacy.inquiry"),
 
+	@Type(Boolean.class)
+	@DefaultValue("false")
+	@Description("Test HQL: switch the user interface back to the old (Struts-based) test HQL page")
+	LegacyTestHQL("unitime.legacy.hibernateQueryTest"),
+	
 	@Type(Boolean.class)
 	@DefaultValue("false")
 	@Description("Student Scheduling: provide associated (parent) course -- a student requesting both courses cannot get the course without also getting the associated course")

JavaSource/org/unitime/timetable/export/hql/SavedHqlExportToCSV.java

@@ -181,11 +181,17 @@ public void export(ExportHelper helper) throws IOException {
 
 		execute(context.getUser(), out, hql.getQuery(), params, 0, -1, hql.getParameters());
 
+		sort(out.getBuffer(), helper);
+		
+		out.close();
+	}
+	
+	public static void sort(List<String[]> lines, ExportHelper helper) {
 		String sort = helper.getParameter("sort");
 		if (sort != null && !"0".equals(sort)) {
 			final boolean asc = Integer.parseInt(sort) > 0;
 			final int col = Math.abs(Integer.parseInt(sort)) - 1;
-			Collections.sort(out.getBuffer(), new Comparator<String[]>() {
+			Collections.sort(lines, new Comparator<String[]>() {
 				int compare(String[] a, String[] b, int col) {
 					for (int i = 0; i < a.length; i++) {
 						int c = (col + i) % a.length;
@@ -205,8 +211,23 @@ public int compare(String[] a, String[] b) {
 				}
 			});
 		}
-		
-		out.close();
+	}
+	
+	public static void enumerate(Printer out, org.hibernate.query.Query<Tuple> q) throws IOException {
+		int len = -1;
+		for (Tuple o: q.list()) {
+			if (len < 0) {
+				len = length(o);
+				String[] line = new String[len];
+				header(line, o);
+				if (line.length > 0 && line[0].startsWith("__")) out.hideColumn(0);
+				out.printHeader(line);
+			}
+			String[] line = new String[len];
+			line(line, o);
+			out.printLine(line);
+			out.flush();
+		}
 	}
 
 	public static void execute(UserContext user, Printer out, String hql, List<SavedHQLInterface.IdValue> options, int fromRow, int maxRows, Collection<SavedHQLParameter> parameters) throws SavedHQLException, PageAccessException {
@@ -349,7 +370,7 @@ private static boolean skip(Attribute t) {
         }
     }
 
-    private static int length(Tuple o) {
+    protected static int length(Tuple o) {
     	if (o == null) return 1;
     	int len = 0;
     	for (TupleElement te: o.getElements()) {
@@ -377,7 +398,7 @@ private static String format(String column) {
     	return column.substring(0, 1).toUpperCase() + column.substring(1);
     }
 
-	private static void header(String[] ret, Tuple o) {
+	protected static void header(String[] ret, Tuple o) {
 		int idx = 0;
 		for (TupleElement te: o.getElements()) {
         	EntityType et = null;
@@ -409,7 +430,7 @@ private static String toString(Object o) {
 		return (o == null ? "" : o.toString());
 	}
 
-	private static void line(String[] ret, Tuple o) {
+	protected static void line(String[] ret, Tuple o) {
 		int idx = 0;
 		for (TupleElement te: o.getElements()) {
         	EntityType et = null;

JavaSource/org/unitime/timetable/export/hql/SavedHqlExportToXLS.java

@@ -21,8 +21,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -152,30 +150,7 @@ public void export(ExportHelper helper) throws IOException {
 
 		execute(context.getUser(), out, hql.getQuery(), params, 0, -1, hql.getParameters());
 
-		String sort = helper.getParameter("sort");
-		if (sort != null && !"0".equals(sort)) {
-			final boolean asc = Integer.parseInt(sort) > 0;
-			final int col = Math.abs(Integer.parseInt(sort)) - 1;
-			Collections.sort(out.getBuffer(), new Comparator<String[]>() {
-				int compare(String[] a, String[] b, int col) {
-					for (int i = 0; i < a.length; i++) {
-						int c = (col + i) % a.length;
-						try {
-							int cmp = Double.valueOf(a[c] == null ? "0" : a[c]).compareTo(Double.valueOf(b[c] == null ? "0" : b[c]));
-							if (cmp != 0) return cmp;
-						} catch (NumberFormatException e) {
-							int cmp = (a[c] == null ? "" : a[c]).compareTo(b[c] == null ? "" : b[c]);
-							if (cmp != 0) return cmp;
-						}
-					}
-					return 0;
-				}	
-				@Override
-				public int compare(String[] a, String[] b) {
-					return asc ? compare(a, b, col) : compare(b, a, col);
-				}
-			});
-		}
+		sort(out.getBuffer(), helper);
 
 		out.close();
 	}