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

Timestamp:

Oct 23, 2013, 1:17:15 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #521: Add DNA and FlowThrough? information to Case summary page

File:

• extensions/net.sf.basedb.reggie/trunk/resources/reports/case_summary.jsp (modified) (2 diffs)

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

@@ -560 +560 @@
   }
 
+  var dna = consentOk ? response.dna : null;
+  if (dna && dna.length > 0)
+  {
+    var truncateAt = TRUNCATE_SIZE[Math.min(dna.length-1, TRUNCATE_SIZE.length)];
+    for (var i = 0; i < dna.length; i++)
+    {
+      var d = dna[i];
+      addColumn('dna.name', makeLink('EXTRACT', d));
+      addColumn('dna.registrationDate', formatDate(d.registrationDate));
+      addColumn('dna.storageBox', asBioPlateLocation(d.bioWell));
+      addColumn('dna.extractionDate', formatDate(d.extractionDate));
+      addColumn('dna.extractionProtocol', makeLink('PROTOCOL', d.extractionProtocol, truncateAt));
+      addColumn('dna.remainingQuantity', formatQuantity(d.remainingQuantity, null, ' µg'));
+      addColumn('dna.originalQuantity', formatQuantity(d.originalQuantity, null, ' µg'));
+      addColumn('dna.ndConc', formatQuantity(d.ndConc, null, ' ng/µl'));
+      addColumn('dna.comment', truncate(d.comment, truncateAt));
+    }
+  }
+  else
+  {
+    if (consentOk)
+    {
+      addColumn('dna.name', asNoInfo('No DNA information has been registered'));
+      Main.hide('dna-details');
+    }
+    else
+    {
+      Main.hide('dna-info');
+    }
+  }
+
+  var ft = consentOk ? response.flowThrough : null;
+  if (ft && ft.length > 0)
+  {
+    var truncateAt = TRUNCATE_SIZE[Math.min(ft.length-1, TRUNCATE_SIZE.length)];
+    for (var i = 0; i < ft.length; i++)
+    {
+      var f = ft[i];
+      addColumn('ft.name', makeLink('EXTRACT', f));
+      addColumn('ft.registrationDate', formatDate(f.registrationDate));
+      addColumn('ft.storageBox', asBioPlateLocation(f.bioWell));
+      addColumn('ft.extractionDate', formatDate(f.extractionDate));
+      addColumn('ft.extractionProtocol', makeLink('PROTOCOL', f.extractionProtocol, truncateAt));
+      addColumn('ft.remainingQuantity', formatQuantity(f.remainingQuantity, null, ' µg'));
+      addColumn('ft.originalQuantity', formatQuantity(f.originalQuantity, null, ' µg'));
+      addColumn('ft.comment', truncate(f.comment, truncateAt));
+    }
+  }
+  else
+  {
+    if (consentOk)
+    {
+      addColumn('ft.name', asNoInfo('No FlowThrough information has been registered'));
+      Main.hide('ft-details');
+    }
+    else
+    {
+      Main.hide('ft-info');
+    }
+  }
+
   
   var mrna = consentOk ? response.mrna : null;
@@ -1126 +1187 @@
           </div>
         </div>
+
+        <div class="info-section" id="dna-info">
+          <div>
+          <table class="info-table dynamic-columns">
+          <thead>
+            <tr id="dna.name">
+              <th>DNA</th>
+            </tr>
+          </thead>
+          <tbody id="dna-details">
+            <tr id="dna.registrationDate">
+              <th>Registration date</th>
+            </tr>
+            <tr id="dna.storageBox">
+              <th>Storage box</th>
+            </tr>
+            <tr id="dna.extractionDate">
+              <th>Extraction date</th>
+            </tr>
+            <tr id="dna.extractionProtocol">
+              <th>Protocol</th>
+            </tr>
+            <tr id="dna.remainingQuantity">
+              <th>Remaining quantity</th>
+            </tr>
+            <tr id="dna.originalQuantity">
+              <th>Original quantity</th>
+            </tr>
+            <tr id="dna.ndConc">
+              <th>ND Conc.</th>
+            </tr>
+            <tr id="dna.comment" class="comment dynamic-column">
+              <th>Comment</th>
+            </tr>
+          </tbody>
+          </table>
+          </div>
+        </div>
+
+        <div class="info-section" id="ft-info">
+          <div>
+          <table class="info-table dynamic-columns">
+          <thead>
+            <tr id="ft.name">
+              <th>FlowThrough</th>
+            </tr>
+          </thead>
+          <tbody id="ft-details">
+            <tr id="ft.registrationDate">
+              <th>Registration date</th>
+            </tr>
+            <tr id="ft.storageBox">
+              <th>Storage box</th>
+            </tr>
+            <tr id="ft.extractionDate">
+              <th>Extraction date</th>
+            </tr>
+            <tr id="ft.extractionProtocol">
+              <th>Protocol</th>
+            </tr>
+            <tr id="ft.remainingQuantity">
+              <th>Remaining quantity</th>
+            </tr>
+            <tr id="ft.originalQuantity">
+              <th>Original quantity</th>
+            </tr>
+            <tr id="ft.comment" class="comment dynamic-column">
+              <th>Comment</th>
+            </tr>
+          </tbody>
+          </table>
+          </div>
+        </div>
         
         <div class="info-section" id="mrna-info">