Changeset 2083

Timestamp:

Oct 18, 2013, 7:45:22 AM (9 years ago)

Author:

olle

Message:

Refs #471. Library preparation information in 'Case Summary' updated in mRNA, cDNA, and Library sections by adding a "Plate result" row with result text and error icon below the plate name, if plate Annotationtype.PLATE_PROCESS_RESULT string annotation differs from "Successful":

1. Class/file CaseSummaryServlet.java in reggie/src/net/sf/basedb/reggie/servlet/ updated to store the result values as annotation result for the different data access objects. Updates of 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:
   a. New dynamic columns with id values "mrna.result", "cdna.result", and "lib.result" added to HTML section. They belong to class "dynamic-column", which ensures that when data are added with function addColumn(id, value), it will only be shown if value differs from null.
   b. Function init() updated in mRNA, cDNA, and Library sections to call function addColumn(id, value) with id set to corresponding "*.result" string (e.g. "mrna.result" for mRNA) and value to asFailInfo(r.result, 'error.png'), if r.result differs from null and "Successful".
   c. New function asFailInfo(message, icon) added. It returns an HTML span tag with the message text followed by the icon image.

Note: JSP script case_summary.jsp function asFailInfo(message, icon) is identical in functionality to function asFlagInfo(message, icon), but differs in the class of the returned HTML span tag, which allows the messages to be configured differently.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/reports/case_summary.jsp (modified) (7 diffs)
• src/net/sf/basedb/reggie/servlet/CaseSummaryServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/reports/case_summary.jsp

@@ -105 +105 @@
 }
 
+// Style the message as a 'fail information' message
+function asFailInfo(message, icon)
+{
+  message = '<span class="fail-info">' + message + '&nbsp;' + '<img src="../images/'+icon+'"></span>';
+  return message;
+}
+
 function asConsent(consent, consentDate)
 {
@@ -564 +571 @@
       addColumn('mrna.registrationDate', formatDate(r.registrationDate));
       addColumn('mrna.storageBox', asBioPlateLocation(r.bioWell)+asFileLink(r.platePdf, 'pdffile.png'));
+      addColumn('mrna.result', (r.result && r.result != 'Successful') ? asFailInfo(r.result, 'error.png') : null);
       addColumn('mrna.extractionDate', formatDate(r.extractionDate));
       addColumn('mrna.usedQuantity', formatQuantity(r.usedQuantity, null, ' µg'));
@@ -592 +600 @@
       addColumn('cdna.registrationDate', formatDate(r.registrationDate));
       addColumn('cdna.storageBox', asBioPlateLocation(r.bioWell));
+      addColumn('cdna.result', (r.result && r.result != 'Successful') ? asFailInfo(r.result, 'error.png') : null);
       addColumn('cdna.extractionDate', formatDate(r.extractionDate));
     }
@@ -619 +628 @@
       addColumn('lib.registrationDate', formatDate(r.registrationDate));
       addColumn('lib.storageBox', asBioPlateLocation(r.bioWell));
+      addColumn('lib.result', (r.result && r.result != 'Successful') ? asFailInfo(r.result, 'error.png') : null);
       addColumn('lib.extractionDate', formatDate(r.extractionDate));
       addColumn('lib.remainingQuantity', formatQuantity(r.remainingQuantity, 0.001, ' ng'));
@@ -1132 +1142 @@
               <th>Work plate</th>
             </tr>
+            <tr id="mrna.result" class="dynamic-column">
+              <th>Plate result</th>
+            </tr>
             <tr id="mrna.extractionDate">
               <th>Cleanup date</th>
@@ -1158 +1171 @@
               <th>Work plate</th>
             </tr>
+            <tr id="cdna.result" class="dynamic-column">
+              <th>Plate result</th>
+            </tr>
             <tr id="cdna.extractionDate">
               <th>Synthesis date</th>
@@ -1181 +1197 @@
               <th>Library plate</th>
             </tr>
+            <tr id="lib.result" class="dynamic-column">
+              <th>Plate result</th>
+            </tr>
             <tr id="lib.extractionDate">
               <th>Cleanup date</th>

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

@@ -521 +521 @@
     Date cleanupDate = (Date) Annotationtype.CLEANUP_DATE.getAnnotationValue(dc, plate);
     mrna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(cleanupDate));
+    // Get BioPlate PlateProcessResult annotation
+    String result = (String) Annotationtype.PLATE_PROCESS_RESULT.getAnnotationValue(dc, plate);
+    mrna.setAnnotation("result", result);
   }
 
@@ -534 +537 @@
     Date synthesisDate = (Date) Annotationtype.SYNTHESIS_DATE.getAnnotationValue(dc, plate);
     cdna.setAnnotation("extractionDate", Reggie.CONVERTER_DATE_TO_STRING.convert(synthesisDate));
+    // Get BioPlate PlateProcessResult annotation
+    String result = (String) Annotationtype.PLATE_PROCESS_RESULT.getAnnotationValue(dc, plate);
+    cdna.setAnnotation("result", result);
   }
 
@@ -552 +558 @@
     lib.loadAnnotations(dc, "ca_molarity", Annotationtype.CA_MOLARITY, null);
     lib.loadAnnotations(dc, "qubitconc", Annotationtype.QUBIT_CONC, null);
+    // Get BioPlate PlateProcessResult annotation
+    String result = (String) Annotationtype.PLATE_PROCESS_RESULT.getAnnotationValue(dc, plate);
+    lib.setAnnotation("result", result);
   }