Changeset 1641

Timestamp:

May 9, 2012, 3:38:22 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #391: The 'Sample report' wizard should use the new Site information

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/samplereportgenerator.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/Site.java (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/SampleReportServlet.java (modified) (10 diffs)

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

@@ -462 +462 @@
       var site = sites[namePrefix];
       var siteName = site.name;       
-      var year = site.startdate.substr(0,4);
-      var month = site.startdate.substr(5,2);
-      var date = site.startdate.substr(8,2);      
+      var year = site.startDate.substr(0,4);
+      var month = site.startDate.substr(5,2);
+      var date = site.startDate.substr(8,2);      
       var siteStartDate = new Date(year, month-1, date);
       

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Site.java

@@ -1 +1 @@
 package net.sf.basedb.reggie;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -25 +27 @@
   
   public static final Site UNKNOWN      = new Site(null, "Unknown", null, false);
+  
+  /**
+    Get all registered sites.
+  */
+  public static final Collection<Site> getAllSites()
+  {
+    return Collections.unmodifiableCollection(sites.values());
+  }
   
   /**

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

@@ -25 +25 @@
 import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.reggie.Reggie;
+import net.sf.basedb.reggie.Site;
 import net.sf.basedb.reggie.converter.DateToStringConverter;
-import net.sf.basedb.reggie.converter.StringToDateConverter;
 import net.sf.basedb.reggie.dao.Subtype;
 import net.sf.basedb.util.Values;
@@ -64 +64 @@
     
     JSONObject jsonReport = new JSONObject();
-    JSONObject sites = getJSONSites();    
-    jsonReport.put("sites", sites);
+    jsonReport.put("sites", getJSONSites());
     
     final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
@@ -78 +77 @@
         String startDateParameter = Values.getString(req.getParameter("fdate"), null);
         String endDateParameter = Values.getString(req.getParameter("tdate"), null);
-        StringToDateConverter string2DateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd"));
-        Date startDate = string2DateConverter.convert(startDateParameter);
-        Date endDate = string2DateConverter.convert(endDateParameter);
+
+        Date startDate = Reggie.CONVERTER_STRING_TO_DATE.convert(startDateParameter);
+        Date endDate = Reggie.CONVERTER_STRING_TO_DATE.convert(endDateParameter);
         
         //List<Restriction> restrictions = new ArrayList<Restriction>();
         ItemQuery<Sample> sampleQuery = Sample.getQuery();
-        sampleQuery.joinPermanent(Hql.innerJoin("creationEvent", "ce"));
+        sampleQuery.joinPermanent(Hql.innerJoin(null, "creationEvent", "ce", true));
         Subtype.SPECIMEN.addFilter(dc, sampleQuery);
         
@@ -102 +101 @@
         {
           // Get the when the first site started
-          for (Object obj : sites.keySet())
+          for (Site s : Site.getAllSites())
           {
-            JSONObject site = (JSONObject)sites.get(obj);
-            Date siteDate = string2DateConverter.convert(((String)site.get("startdate")).replaceAll("-", ""));
-            if (siteDate != null && (startDate == null || startDate.after(siteDate))) startDate = siteDate;           
+            Date siteDate = Reggie.CONVERTER_STRING_TO_DATE.convert(s.getStartDate().replaceAll("-", ""));
+            if (siteDate != null && (startDate == null || startDate.after(siteDate))) 
+            {
+              startDate = siteDate;           
+            }
           }
         }
@@ -118 +119 @@
         DateToStringConverter date2StringConverter = Reggie.CONVERTER_DATE_TO_STRING;
         Date latestDate = null;
-        Date firstDate = null;
         JSONObject jsonSitesCombined = new JSONObject();
         String viewType = null;
@@ -127 +127 @@
           BioMaterialEvent creationEvent = s.getCreationEvent();
           Date creationDate = creationEvent.getEventDate();
-          String currentSitePrefix = s.getName().substring(0,2); 
-          if (sites.get(currentSitePrefix) == null)
+          
+          Site site = Site.findByCaseName(s.getName());         
+          if (site == Site.UNKNOWN)
           {
             String key = "unknownSite";
@@ -141 +142 @@
                         
             // Get site info            
-            JSONObject jsonSite = (JSONObject)jsonStatistics.get(currentSitePrefix);
-            if (jsonSite == null)jsonSite = new JSONObject();
+            JSONObject jsonSite = (JSONObject)jsonStatistics.get(site.getPrefix());
+            if (jsonSite == null)
+            {
+              jsonSite = new JSONObject();
+              jsonStatistics.put(site.getPrefix(), jsonSite);
+            }
             
             // Increase the counter for current period on the site
@@ -155 +160 @@
             jsonSitesCombined.put(currentPeriod, combinedCounter);
             
-            // Put current site info back into the report info.
-            jsonStatistics.put(currentSitePrefix, jsonSite);
-            
             // Find out if current creation-date is the latest so far.
             if (latestDate == null || latestDate.before(creationDate)) 
@@ -163 +165 @@
               latestDate = creationDate;
             }
-            /* Find out if current creation-date is the oldest so far. 
-             * Update variable if creation date isn't before start date of current site.              
-             */
-            if (firstDate == null || firstDate.after(creationDate))
-            {
-              JSONObject site = (JSONObject)sites.get(currentSitePrefix);
-              if (site!= null)
-              {
-                String siteStart = (String)site.get("startdate");
-                Date siteStartDate = string2DateConverter.convert(siteStart.replaceAll("-", ""));
-                if (!siteStartDate.after(creationDate))
-                {
-                  firstDate = creationDate;
-                }
-              }
-            }           
           }
           else
@@ -311 +297 @@
   {
     JSONObject sites = new JSONObject();
-    JSONObject malmoSite = new JSONObject();
-    malmoSite.put("name", "Malmö");
-    malmoSite.put("startdate", "2010-08-30");
-    
-    
-    JSONObject lundSite = new JSONObject();
-    lundSite.put("name", "Lund");
-    lundSite.put("startdate", "2010-11-10");    
-    
-    JSONObject halmstadSite = new JSONObject();
-    halmstadSite.put("name", "Halmstad");
-    halmstadSite.put("startdate", "2010-10-01");    
-    
-    JSONObject helsingborgSite = new JSONObject();
-    helsingborgSite.put("name", "Helsingborg");
-    helsingborgSite.put("startdate", "2010-11-01");   
-    
-    JSONObject kristianstadSite = new JSONObject();
-    kristianstadSite.put("name", "Kristianstad");
-    kristianstadSite.put("startdate", "2010-09-15");
-        
-    JSONObject karlskronaSite = new JSONObject();
-    karlskronaSite.put("name", "Karlskrona");
-    karlskronaSite.put("startdate", "2010-10-04");    
-    
-    JSONObject vaxsjoSite = new JSONObject();
-    vaxsjoSite.put("name", "Växjö");
-    vaxsjoSite.put("startdate", "2010-10-01");    
-        
-    sites.put("11", lundSite);
-    sites.put("22", helsingborgSite);
-    sites.put("33", halmstadSite);
-    sites.put("44", kristianstadSite);
-    sites.put("55", karlskronaSite);
-    sites.put("66", vaxsjoSite);
-    sites.put("77", malmoSite);
+    for (Site s : Site.getAllSites())
+    {
+      sites.put(s.getPrefix(), s.asJSONObject());
+    }
     return sites;
   }