Changeset 3484

Timestamp:

Sep 14, 2015, 2:33:48 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #808: Import wizard for frozen tissue dates

Added FrozenTissueDate to installation wizard and a link on the index page under the 'Export/import information...' section.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/index.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/dao/Annotationtype.java (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/InstallServlet.java (modified) (2 diffs)

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

@@ -340 +340 @@
             <li><span class="require-permission" data-role="PatientCurator" data-link="personal/export_missing_consent_data_sample_list.jsp?ID=<%=ID%>"
               >Export missing consent data sample list</span>
+              
+            <li><span class="require-permission" data-role="PrepCurator" data-link="batch/frozen-tissue-date.jsp?ID=<%=ID%>"
+              >Import frozen tissue date</span> 
             </ul>
           </dd>

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

@@ -170 +170 @@
     new Annotationtype("ConsentDate", Type.DATE, false, Item.SAMPLE);
 
+  /**
+    The "FrozenTissueDate" annotation type, used
+    for samples (Case). It is a date annotation.
+    @since 3.6
+  */
+  public static final Annotationtype FROZEN_TISSUE_DATE = 
+    new Annotationtype("FrozenTissueDate", Type.DATE, false, Item.SAMPLE);
+
+  
   /**
     The "BloodSamplingDateTime" annotation, used
@@ -1442 +1451 @@
 
   /**
+    Check if the item already has an annotation value for this
+    annotation type.
+    @since 3.6
+  */
+  public boolean hasAnnotation(DbControl dc, Annotatable item)
+  {
+    if (item == null) return false;
+    AnnotationType at = load(dc);
+    if (!item.isAnnotated()) return false;
+    AnnotationSet as = item.getAnnotationSet();
+    return as.hasAnnotation(at);
+  }
+  
+  /**
     Get the annotation value (single) for this annotation type from the
     annotatable item.

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

@@ -327 +327 @@
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.CONSENT, 1, new ValueOptions("Yes", "No", "Not asked"), effectivePermissionsUse, createIfMissing));
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.CONSENT_DATE, 1, null, effectivePermissionsUse, createIfMissing));
+        jsonChecks.add(checkAnnotationType(dc, Annotationtype.FROZEN_TISSUE_DATE, 1, null, effectivePermissionsUse, createIfMissing));
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.ARRIVAL_DATE, 1, null, effectivePermissionsUse, createIfMissing));
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.NOF_DELIVERED_TUBES, 1, null, effectivePermissionsUse, createIfMissing));
@@ -531 +532 @@
         
         jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.CASE, createIfMissing, 
-            Annotationtype.CONSENT, Annotationtype.CONSENT_DATE, 
+            Annotationtype.CONSENT, Annotationtype.CONSENT_DATE, Annotationtype.FROZEN_TISSUE_DATE,
             Annotationtype.LATERALITY));