Changeset 2065


Ignore:
Timestamp:
Oct 15, 2013, 8:02:38 AM (9 years ago)
Author:
olle
Message:

Refs #471. Library preparation information in 'Case Summary' updated regarding "extraction date" for mRNA, cDNA, Library, and PooledLibrary items:

  • The dates currently denoted as "Extraction date" for the different items, are exchanged for the following dates:
Item Date name Definition
mRNA Cleanup date BioPlate annotation CleanupDate
cDNA Synthesis date BioPlate annotation SynthesisDate
Library Cleanup date BioPlate annotation CleanupDate
PooledLibrary Pool date ´Date of the creation event of the real extract that represents the pooled library (current definition)
  1. Class/file CaseSummaryServlet.java in reggie/src/net/sf/basedb/reggie/servlet/ updated in private methods
    void loadMRnaInfo(DbControl dc, MRna mrna),
    void loadCDnaInfo(DbControl dc, CDna cdna), and
    void loadLibraryInfo(DbControl dc, Library lib)
  2. JSP script case_summary.jsp in reggie/resources/reports/ updated in the header titles in the HTML section.
Location:
extensions/net.sf.basedb.reggie/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/reports/case_summary.jsp

    r2054 r2065  
    11221122            </tr>
    11231123            <tr id="mrna.extractionDate">
    1124               <th>Extraction date</th>
     1124              <th>Cleanup date</th>
    11251125            </tr>
    11261126            <tr id="mrna.usedQuantity">
     
    11481148            </tr>
    11491149            <tr id="cdna.extractionDate">
    1150               <th>Extraction date</th>
     1150              <th>Synthesis date</th>
    11511151            </tr>
    11521152          </tbody>
     
    11711171            </tr>
    11721172            <tr id="lib.extractionDate">
    1173               <th>Extraction date</th>
     1173              <th>Cleanup date</th>
    11741174            </tr>
    11751175            <tr id="lib.remainingQuantity">
     
    12091209            </tr>
    12101210            <tr id="pooledlib.extractionDate">
    1211               <th>Extraction date</th>
     1211              <th>Pool date</th>
    12121212            </tr>
    12131213            <tr id="pooledlib.remainingQuantity">
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java

    r2052 r2065  
    516516    mrna.setAnnotation("editable", e.hasPermission(Permission.WRITE)); 
    517517    mrna.setAnnotation("usedQuantity", created.getUsedQuantity((Extract)e.getParent()));
    518     mrna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(created.getEventDate()));
     518    // Get BioPlate CleanupDate annotation
     519    BioPlate plate = mrna.getItem().getBioWell().getPlate();
     520    Date cleanupDate = (Date) Annotationtype.CLEANUP_DATE.getAnnotationValue(dc, plate);
     521    mrna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(cleanupDate));
    519522  }
    520523
     
    522525  {
    523526    Extract e = cdna.getExtract();
    524     BioMaterialEvent created = e.getCreationEvent();
    525527   
    526528    cdna.loadBioPlateLocation();
    527529    cdna.setAnnotation("registrationDate", Reggie.CONVERTER_DATE_TO_STRING.convert(e.getEntryDate()));
    528530    cdna.setAnnotation("editable", e.hasPermission(Permission.WRITE)); 
    529     cdna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(created.getEventDate()));
     531    // Get BioPlate SynthesisDate annotation
     532    BioPlate plate = cdna.getItem().getBioWell().getPlate();
     533    Date synthesisDate = (Date) Annotationtype.SYNTHESIS_DATE.getAnnotationValue(dc, plate);
     534    cdna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(synthesisDate));
    530535  }
    531536
     
    533538  {
    534539    Extract e = lib.getExtract();
    535     BioMaterialEvent created = e.getCreationEvent();
    536540   
    537541    lib.loadBioPlateLocation();
    538542    lib.setAnnotation("registrationDate", Reggie.CONVERTER_DATE_TO_STRING.convert(e.getEntryDate()));
    539543    lib.setAnnotation("editable", e.hasPermission(Permission.WRITE));
    540     lib.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(created.getEventDate()));
     544    // Get BioPlate CleanupDate annotation
     545    BioPlate plate = lib.getItem().getBioWell().getPlate();
     546    Date cleanupDate = (Date) Annotationtype.CLEANUP_DATE.getAnnotationValue(dc, plate);
     547    lib.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(cleanupDate));
    541548    lib.setAnnotation("originalQuantity", e.getOriginalQuantity());
    542549    lib.setAnnotation("remainingQuantity", e.getRemainingQuantity());
Note: See TracChangeset for help on using the changeset viewer.