Changeset 1354


Ignore:
Timestamp:
Apr 28, 2011, 10:47:12 AM (10 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #307: Consent form registration

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/META-INF/servlets.xml

    r1335 r1354  
    1313    <servlet-class>net.sf.basedb.reggie.servlet.ReferralFormServlet</servlet-class>
    1414  </servlet>
     15  <servlet>
     16    <servlet-name>ConsentForm</servlet-name>
     17    <servlet-class>net.sf.basedb.reggie.servlet.ConsentFormServlet</servlet-class>
     18  </servlet>
    1519
    1620</servlets>
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

    r1341 r1354  
    113113 
    114114  /**
     115    The name of the "ConsentDate" annotation type, used
     116    for samples (Case). It is a date annotation.
     117  */
     118  public static final String ANNOTATION_CONSENT_DATE = "ConsentDate";
     119
     120 
     121  /**
    115122    The name of the "PatientCurator" group. Members of this group
    116123    are allowed to use the personal information registration wizard.
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1341 r1354  
    100100        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_ALL_FIRST_NAMES, Item.BIOSOURCE, Type.STRING, 1,
    101101            null, sharedToPatientCurator, createIfMissing));
    102         jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_CONSENT, Item.SAMPLE, Type.STRING, 1,
    103             new EnumerationOptions("Yes", "No", "Not asked"), sharedToPatientCurator, createIfMissing));
    104102       
    105103        // -- the second batch need only be shared to the active project or to the PatientCurator group
     
    122120            null, effectiveOptions, createIfMissing));
    123121        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_RNALATER_DATETIME, Item.SAMPLE, Type.TIMESTAMP, 1,
     122            null, effectiveOptions, createIfMissing));
     123        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_CONSENT, Item.SAMPLE, Type.STRING, 1,
     124            new EnumerationOptions("Yes", "No", "Not asked"), effectiveOptions, createIfMissing));
     125        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_CONSENT_DATE, Item.SAMPLE, Type.DATE, 1,
    124126            null, effectiveOptions, createIfMissing));
    125127       
Note: See TracChangeset for help on using the changeset viewer.