Changeset 2066


Ignore:
Timestamp:
Oct 15, 2013, 8:40:23 AM (9 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:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_registration.jsp

    r2044 r2066  
    479479      <table>
    480480      <tr valign="top">
    481         <td class="prompt">Date</td>
     481        <td class="prompt">Pool date</td>
    482482        <td class="input">
    483483          <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

    r2060 r2066  
    539539 
    540540  /**
     541    The "PoolDate" annotation, used for extracts (PooledLibrary).
     542    The date the pool was created.
     543    @since 2.13
     544  */
     545  public static final Annotationtype POOL_DATE =
     546    new Annotationtype("PoolDate", Type.DATE, Item.EXTRACT);
     547
     548 
     549  /**
    541550    The "PoolMixingStrategy" annotation, used for extracts (PooledLibrary).
    542551    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

    r2060 r2066  
    270270            new ValueOptions(PooledLibrary.MIXING_STRATEGY_FIXED, PooledLibrary.MIXING_STRATEGY_DYNAMIC),
    271271            effectiveOptions, createIfMissing));
     272        jsonChecks.add(checkAnnotationType(dc, Annotationtype.POOL_DATE, 1, null, effectiveOptions, createIfMissing));
    272273        jsonChecks.add(checkAnnotationType(dc, Annotationtype.OPERATOR, 1, null, effectiveOptions, createIfMissing));
    273274        jsonChecks.add(checkAnnotationType(dc, Annotationtype.DILUTION_DATE, 1, null, effectiveOptions, createIfMissing));
     
    365366        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.POOLED_LIBRARY, createIfMissing,
    366367            Annotationtype.POOL_MOLARITY, Annotationtype.POOL_CONC, Annotationtype.POOL_TARGET_VOLUME_PER_LIB,
    367             Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.OPERATOR));
     368            Annotationtype.POOL_MIXING_STRATEGY, Annotationtype.POOL_DATE, Annotationtype.OPERATOR));
    368369
    369370        jsonChecks.add(checkAnnotationTypeCategory(dc, Subtype.FLOW_CELL, createIfMissing,
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PoolServlet.java

    r2044 r2066  
    551551          poolExtract.setDescription(Values.getStringOrNull((String)jsonPool.get("comments")));
    552552          Annotationtype.OPERATOR.setAnnotationValue(dc, poolExtract, operator);
     553          Annotationtype.POOL_DATE.setAnnotationValue(dc, poolExtract, poolDate);
    553554         
    554555          // Check if there are any .dil items
Note: See TracChangeset for help on using the changeset viewer.