Changeset 1816

Timestamp:

Jan 31, 2013, 1:06:21 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #424: Select RNA items for library preparation

Added support for setting comments per well.

Location:

extensions/net.sf.basedb.reggie/branches/ticket-422

Files:

• resources/images/comment.png (added)
• resources/libprep/plate.js (modified) (1 diff)
• resources/libprep/select_rna.jsp (modified) (11 diffs)
• src/net/sf/basedb/reggie/servlet/MRnaServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/plate.js

@@ -322 +322 @@
   cp.well = this;
   cp.name = this.extract ? this.extract.name : null;
+  cp.comment = this.extract ? this.extract.comment : null;
   this.clipboard = true;
   this.copyText = cp.name;

extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/select_rna.jsp

@@ -213 +213 @@
         well.setError('RNA not found');
       }
+      if (rna.comment)
+      {
+        text += '<div class="comment">'+Main.encodeTags(rna.comment)+'</div>';
+      }
     }
     else if (well.copyText)
@@ -436 +440 @@
       }
       well.extract.qc = newQc;
+      well.extract.comment = 'Toggle QC';
       count++;
     }
@@ -576 +581 @@
     {
       rna = Rna.createByName(cp.name);
+      rna.comment = cp.comment;
     }
     else
@@ -618 +624 @@
   wells[0].setExtract(rna1);
   wells[1].setExtract(rna0);
+  Plate.paint(wells);
+}
+
+// Set a comment on the selected wells
+function commentSelected(comment)
+{
+  var wells = Plate.getSelected();
+  
+  if (comment == undefined)
+  {
+    if (wells.length == 0)
+    {
+      alert('No wells have been selected');
+      return;
+    }
+    
+    var count = 0;
+    for (var i = 0; i < wells.length; i++)
+    {
+      var well = wells[i];
+      if (well.extract) 
+      {
+        count++;
+        if (well.extract.comment) comment = well.extract.comment;
+      }
+    }
+    
+    if (count == 0)
+    {
+      alert('None of the selected wells contain any RNA');
+      return;
+    }
+
+    comment = prompt('Comment', comment || '');
+    if (comment == null) return;
+  }
+  
+  if (comment == '') comment = null;
+  for (var i = 0; i < wells.length; i++)
+  {
+    var well = wells[i];
+    if (well.extract) well.extract.comment = comment;
+  }
   Plate.paint(wells);
 }
@@ -1082 +1131 @@
   {
     var well = wells[i];
+    var rna = well.extract;
     if (well.hasWarning())
     {
@@ -1092 +1142 @@
     else
     {
-      if (well.extract && well.extract.id)
+      if (rna && rna.id)
       {
         var tmp = {};
@@ -1098 +1148 @@
         tmp.column = well.column;
         tmp.rna = {};
-        tmp.rna.id = well.extract.id;
-        tmp.rna.usedQuantity = well.extract.qc ? QUANTITY_QC : QUANTITY_REGULAR;
+        tmp.rna.id = rna.id;
+        tmp.rna.usedQuantity = rna.qc ? QUANTITY_QC : QUANTITY_REGULAR;
+        tmp.rna.comment = rna.comment;
         plateInfo.wells[plateInfo.wells.length] = tmp;
         numRna++;
-        if (well.extract.stratagene) numStratagene++;
-        if (well.extract.external) numExternal++;
+        if (rna.stratagene) numStratagene++;
+        if (rna.external) numExternal++;
       }
     }
@@ -1253 +1304 @@
   display: none;
 }
-
 .volume
 {
@@ -1261 +1311 @@
 {
   color: #0000C8;
+}
+.comment
+{
+  font-style: italic;
 }
 #iconSpecialSelect
@@ -1356 +1410 @@
     style="display: none; font-weight: normal; text-align: left;">
     <m:menuitem 
+      title="Comments&hellip;" 
+      icon="<%=home+"/images/comment.png"%>" 
+      onclick="commentSelected()"
+      tooltip="Add a comment to the selected wells"
+    />
+    <m:menuseparator />
+    <m:menuitem 
       title="Cut&hellip;" 
       icon="<%=home+"/images/cut.png"%>" 
@@ -1487 +1548 @@
           onclick="toggleQc()" 
           tooltip="Select/deselect RNA for QC" 
+        />
+        <tbl:button 
+          title="Comments&hellip;" 
+          image="<%=home+"/images/comment.png"%>" 
+          onclick="commentSelected()" 
+          tooltip="Add a comment to the selected wells" 
         />
         <tbl:button 

extensions/net.sf.basedb.reggie/branches/ticket-422/src/net/sf/basedb/reggie/servlet/MRnaServlet.java

@@ -251 +251 @@
           
           r.setAnnotation("rna", rna.asJSONObject());
+          r.setAnnotation("comment", r.getItem().getDescription());
           jsonMRna.add(r.asJSONObject());
           
@@ -366 +367 @@
           Extract mRna = Extract.getNew(dc, destPlate);
           mRna.setItemSubtype(mRnaType);
+          mRna.setDescription((String)jsonRna.get("comment"));
           
           int childNum;