Changeset 2066

Timestamp:

Oct 15, 2013, 8:40:23 AM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #512: Updates to the register pooled libraries wizard

Added 'PoolDate?' annotation and clarified that the date is the pool date in registration wizard.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

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

extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_registration.jsp

@@ -479 +479 @@
       <table>
       <tr valign="top">
-        <td class="prompt">Date</td>
+        <td class="prompt">Pool date</td>
         <td class="input">
           <input type="text" class="required" name="poolDate" value="" size="12" maxlength="10"

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

@@ -539 +539 @@
   
   /**
+    The "PoolDate" annotation, used for extracts (PooledLibrary).
+    The date the pool was created.
+    @since 2.13
+  */
+  public static final Annotationtype POOL_DATE =
+    new Annotationtype("PoolDate", Type.DATE, Item.EXTRACT);
+
+  
+  /**
     The "PoolMixingStrategy" annotation, used for extracts (PooledLibrary).
     Store the admin-defined setting for the strategy to use when mixing the pool.

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

@@ -270 +270 @@
             new ValueOptions(PooledLibrary.MIXING_STRATEGY_FIXED, PooledLibrary.MIXING_STRATEGY_DYNAMIC),
             effectiveOptions, createIfMissing));
+        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_DATE, 1, null, effectiveOptions, createIfMissing));
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.OPERATOR, 1, null, effectiveOptions, createIfMissing));
         jsonChecks.add(checkAnnotationType(dc, Annotationtype.DILUTION_DATE, 1, null, effectiveOptions, createIfMissing));
@@ -365 +366 @@
         jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.POOLED_LIBRARY, createIfMissing,
             Annotationtype.POOL_MOLARITY, Annotationtype.POOL_CONC, Annotationtype.POOL_TARGET_VOLUME_PER_LIB,
-            Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.OPERATOR));
+            Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.POOL_DATE, Annotationtype.OPERATOR));
 
         jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.FLOW_CELL, createIfMissing, 

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

@@ -551 +551 @@
           poolExtract.setDescription(Values.getStringOrNull((String)jsonPool.get("comments")));
           Annotationtype.OPERATOR.setAnnotationValue(dc, poolExtract, operator);
+          Annotationtype.POOL_DATE.setAnnotationValue(dc, poolExtract, poolDate);
           
           // Check if there are any .dil items