Changeset 1735

Timestamp:

Nov 16, 2012, 1:28:30 PM (9 years ago)

Author:

olle

Message:

Refs #428. Refs #420. Refs #426. Sample count report and consent count report updated to show sites in alphabetical order of site names.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/samplereportgenerator.jsp (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/SampleReportServlet.java (modified) (5 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/samplereportgenerator.jsp

@@ -617 +617 @@
     unknownCreation = statistics.noDate;
     unknownSite = statistics.unknownSite;
-    for (namePrefix in sites)
-    {
+    var siteOrderList = report.siteOrderListKey;
+    for (var siteOrderIndex in siteOrderList)
+    {
+      var namePrefix = siteOrderList[siteOrderIndex];   
       if (!sites.hasOwnProperty(namePrefix)) continue;        
       var site = sites[namePrefix];
@@ -885 +887 @@
     unknownCreation = statistics.noDate;
     unknownSite = statistics.unknownSite;
-    for (namePrefix in sites)
-    {
-      if (!sites.hasOwnProperty(namePrefix)) continue;        
+    var siteOrderList = report.siteOrderListKey;
+    for (var siteOrderIndex in siteOrderList)
+    {
+      var namePrefix = siteOrderList[siteOrderIndex];   
+      if (!sites.hasOwnProperty(namePrefix)) continue;
       var site = sites[namePrefix];
-      var siteName = site.name;       
+      var siteName = site.name;   
       var year = site.startDate.substr(0,4);
       var month = site.startDate.substr(5,2);

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/SampleReportServlet.java

@@ -11 +11 @@
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.servlet.ServletException;
@@ -53 +54 @@
   private static final int quarterViewLimit= 3;
   
+  private static final String alphabeticalOrder = "ALPHABETICAL_ORDER";
+  private static final String namePrefixOrder = "NAME_PREFIX_ORDER";
+  private static final String startDateOrder = "START_DATE_ORDER";
+  private static final String nameLengthOrder = "NAME_LENGTH_ORDER";
+
   public SampleReportServlet()
   {}
@@ -165 +171 @@
     String latestDateStr = (String) jsonStatistics.get("latestDateKey");
     jsonReport.put("latestDate", latestDateStr);
+    String siteOrder = alphabeticalOrder;
+    JSONObject jsonSiteOrderList = createJSONSiteOrderList(siteOrder);
+    jsonReport.put("siteOrderListKey", jsonSiteOrderList);
     json.put("report", jsonReport);
     return json;
@@ -356 +365 @@
     //
     jsonReport.put("statistics", jsonStatistics);       
+    String siteOrder = alphabeticalOrder;
+    JSONObject jsonSiteOrderList = createJSONSiteOrderList(siteOrder);
+    jsonReport.put("siteOrderListKey", jsonSiteOrderList);
     json.put("report", jsonReport);
     return json;
@@ -646 +658 @@
   }
 
+  /**
+   *  Creates a JSONObject with order index as key and site prefix as value.
+   *
+   *  @param order String A string indicating desired order (null => alphabetical order)
+   *  @return String A JSONObject with sort index as key and site prefix as value. 
+   */
+  private JSONObject createJSONSiteOrderList(String order)
+  {
+    JSONObject jsonSiteOrderList = new JSONObject();
+    List<String> siteOrderedList = createSiteOrderedList(order);
+    for (int i=0; i < siteOrderedList.size(); i++)
+    {
+      String namePrefix = siteOrderedList.get(i);
+      jsonSiteOrderList.put(i, namePrefix);
+    }
+    return jsonSiteOrderList;
+  }
+
+  /**
+   *  Creates a list of site name prefixes sorted after specified order.
+   *
+   *  @param order String A string indicating desired order (null => alphabetical order)
+   *  @return List<String> list of site name prefixes sorted after specified order.
+   */
+  private List<String> createSiteOrderedList(String order)
+  {
+    if (order == null || order.equals(""))
+    {
+      order = alphabeticalOrder;
+    }
+    TreeMap<Comparable, String> treeMap = new TreeMap<Comparable, String>();
+    for (Site site: Site.getAllSites())
+    {
+      Comparable comparableObject = null;
+      if (order.equals(alphabeticalOrder))
+      {
+        comparableObject = site.getName();
+      }
+      else if (order.equals(namePrefixOrder))
+      {
+        comparableObject = site.getPrefix();
+      }
+      else if (order.equals(startDateOrder))
+      {
+        comparableObject = site.getStartDate();
+      }
+      else if (order.equals(nameLengthOrder))
+      {
+        comparableObject = site.getName().length();
+      }
+      treeMap.put(comparableObject, site.getPrefix());
+    }
+    List<String> list = new ArrayList<String>();
+    for (Comparable key: treeMap.keySet())
+    {
+      list.add(treeMap.get(key));
+    } 
+    return list;
+  }
+
   private String getCurrentPeriod(Date currentDate, String viewType) 
   {