Changeset 1526

Timestamp:

Jan 25, 2012, 11:30:27 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #353: The No and Not asked biosources should have their own Types

Location:

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

Files:

• dao/Subtype.java (modified) (1 diff)
• servlet/ConsentFormServlet.java (modified) (1 diff)
• servlet/InstallServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Subtype.java

@@ -25 +25 @@
   */
   public static final Subtype PATIENT = new Subtype("Patient", Item.BIOSOURCE);
-  
+
+  /**
+    The definition of the "No" subtype (for virtual patient with consent=No).
+    @since 2.2
+  */
+  public static final Subtype NO = new Subtype("No", Item.BIOSOURCE);
+
+  /**
+    The definition of the "Not asked" subtype (for virtual patient with consent=Not asked).
+    @since 2.2
+  */
+  public static final Subtype NOT_ASKED = new Subtype("Not asked", Item.BIOSOURCE);
+
   /**
     The definition of the "Case" subtype.

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

@@ -223 +223 @@
             // Create virtual patient
             BioSource vPat = BioSource.getNew(dc);
-            vPat.setItemSubtype(Subtype.PATIENT.load(dc));
+            Subtype virtualSubtype = "No".equals(consent) ? Subtype.NO : Subtype.NOT_ASKED;
+            vPat.setItemSubtype(virtualSubtype.load(dc));
             vPat.setName(Patient.generateNextName(dc, consent));
             theCase.getCreationEvent().setSource(vPat);

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

@@ -99 +99 @@
         // Subtype checks
         jsonChecks.add(checkSubtype(dc, Subtype.PATIENT, createIfMissing));
+        jsonChecks.add(checkSubtype(dc, Subtype.NO, createIfMissing));
+        jsonChecks.add(checkSubtype(dc, Subtype.NOT_ASKED, createIfMissing));
         jsonChecks.add(checkSubtype(dc, Subtype.CASE, createIfMissing, Subtype.PATIENT));
         jsonChecks.add(checkSubtype(dc, Subtype.BLOOD, createIfMissing, Subtype.PATIENT));