Changeset 2250

Timestamp:

Feb 25, 2014, 12:39:41 PM (9 years ago)

Author:

olle

Message:

Refs #581. Monthly operation list export updated to only include patients for sites belonging to "RCC syd" (Regionalt Cancercentrum syd) in the list:

1. JSP script export_monthly_oplist.jsp in reggie/resources/personal/ updated to display a note, that only patients for sites belonging to "RCC syd" will be included in the generated list.
2. Class/file Site.java in reggie/src/net/sf/basedb/reggie/ updated with a new boolean flag attribute partOfRCC_syd, indicating whether the site is part of "RCC syd", or not.
3. Java servlet ExportServlet.java in reggie/src/net/sf/basedb/reggie/servlet/ updated to only include sites, for which the new flag attribute partOfRCC_syd has value true.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/personal/export_monthly_oplist.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/Site.java (modified) (4 diffs)
• src/net/sf/basedb/reggie/servlet/ExportServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/personal/export_monthly_oplist.jsp

@@ -245 +245 @@
           </select>
         </td>
-        <td class="help"><span id="time.message" class="message" style="display: none;"></span></td>
+        <td class="help">Only patients belonging to "RCC syd" will be included.<span id="time.message" class="message" style="display: none;"></span></td>
       </tr>
       

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

@@ -18 +18 @@
   private static final Map<String, Site> sites = new HashMap<String, Site>();
 
-  public static final Site LUND         = new Site("11", "Lund", "2010-11-10", true);
-  public static final Site HELSINGBORG  = new Site("22", "Helsingborg", "2010-11-01", true);
-  public static final Site HALMSTAD     = new Site("33", "Halmstad", "2010-10-01", true);
-  public static final Site KRISTIANSTAD = new Site("44", "Kristianstad", "2010-09-15", true);
-  public static final Site KARLSKRONA   = new Site("55", "Karlskrona", "2010-10-04", true);
-  public static final Site VÄXJÖ        = new Site("66", "Växjö", "2010-10-01", true);
-  public static final Site MALMÖ        = new Site("77", "Malmö", "2010-08-30", true);
-  public static final Site UPPSALA      = new Site("88", "Uppsala", "2013-10-01", true);
+  public static final Site LUND         = new Site("11", "Lund", "2010-11-10", true, true);
+  public static final Site HELSINGBORG  = new Site("22", "Helsingborg", "2010-11-01", true, true);
+  public static final Site HALMSTAD     = new Site("33", "Halmstad", "2010-10-01", true, true);
+  public static final Site KRISTIANSTAD = new Site("44", "Kristianstad", "2010-09-15", true, true);
+  public static final Site KARLSKRONA   = new Site("55", "Karlskrona", "2010-10-04", true, true);
+  public static final Site VÄXJÖ        = new Site("66", "Växjö", "2010-10-01", true, true);
+  public static final Site MALMÖ        = new Site("77", "Malmö", "2010-08-30", true, true);
+  public static final Site UPPSALA      = new Site("88", "Uppsala", "2013-10-01", true, false);
   
-  public static final Site UNKNOWN      = new Site(null, "Unknown", null, false);
+  public static final Site UNKNOWN      = new Site(null, "Unknown", null, false, false);
   
   /**
@@ -53 +53 @@
   private final String startDate;
   private final boolean useCaseSuffix;
+  private final boolean partOfRCC_syd;
   private JSONObject json;
   
-  private Site(String prefix, String name, String startDate, boolean useCaseSuffix)
+  private Site(String prefix, String name, String startDate, boolean useCaseSuffix, boolean partOfRCC_syd)
   {
     this.prefix = prefix;
@@ -61 +62 @@
     this.startDate = startDate;
     this.useCaseSuffix = useCaseSuffix;
+    this.partOfRCC_syd = partOfRCC_syd;
     if (prefix != null) sites.put(prefix, this);
   }
@@ -98 +100 @@
     return useCaseSuffix;
   }
+
+  /**
+      Get flag indicating whether site belongs to "RCC syd" (Regionalt Cancercentrum syd)
+   */
+  public boolean isPartOfRCC_syd()
+  {
+    return partOfRCC_syd;
+  }
   
   /**

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

@@ -171 +171 @@
                     // Finally, we now have the information that should be exported
                     Site site = Site.findByCaseName(s.getName());
-                    String laterality = (String)Annotationtype.LATERALITY.getAnnotationValue(dc, manager, theCase);
-                    String consent = (String)Annotationtype.CONSENT.getAnnotationValue(dc, manager, theCase);
-                    String opDate = dateFormat.format(s.getCreationEvent().getEventDate());
-                    String subtype = exportSubtype ? s.getItemSubtype().getName() : null;
-                    String patientId = exportPatientId ? patient.getName() : null;
-                    String caseName = caseNamePattern.matcher(s.getName()).replaceFirst("");
-                    opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName, consent, patientId));
+                    // Only include sites belonging to "RCC syd" (Regionalt Cancercentrum syd)
+                    if (site.isPartOfRCC_syd())
+                    {
+                      String laterality = (String)Annotationtype.LATERALITY.getAnnotationValue(dc, manager, theCase);
+                      String consent = (String)Annotationtype.CONSENT.getAnnotationValue(dc, manager, theCase);
+                      String opDate = dateFormat.format(s.getCreationEvent().getEventDate());
+                      String subtype = exportSubtype ? s.getItemSubtype().getName() : null;
+                      String patientId = exportPatientId ? patient.getName() : null;
+                      String caseName = caseNamePattern.matcher(s.getName()).replaceFirst("");
+                      opDates.add(new PersonalOpDate(pnr, opDate, site, laterality, subtype, caseName, consent, patientId));
+                    }
                   }
                 }