Changeset 1932

Timestamp:

Apr 17, 2013, 9:43:58 AM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #456: Barcode layout wizard

Some minor improvements regarding usability.

• Show comments from the cDNA plate when selecting it
• Add comments to the Library plate that show up in the lab protocols
• Show 'Please wait...' animation when loading and saving information

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/libprep/assign_barcode.jsp (modified) (7 diffs)
• src/net/sf/basedb/reggie/servlet/LibPrepServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/assign_barcode.jsp

@@ -73 +73 @@
     bioplateIsValid = true;
     setInputStatus('bioplate', '', 'valid');
+    bioPlateOnChange();
   }
   else
@@ -111 +112 @@
 }
 
+function bioPlateOnChange()
+{
+  var frm = document.forms['reggie'];
+  var bioplate = frm.bioplate[frm.bioplate.selectedIndex].bioplate;
+  setInnerHTML('cdnacomments', formatText(bioplate.comments));
+}
+
 
 function loadBarcodes()
@@ -153 +161 @@
   frm.bioplate.disabled = true;
   
-  frm.comments.value = frm.bioplate[frm.bioplate.selectedIndex].bioplate.comments;
+  Main.addClass(document.getElementById('step.1.section'), 'disabled');
+  Main.hide('gonext');
+  Main.hide('gocancel');
+  loadCDNAInformation();
   
   currentStep = 2;
   document.getElementById('step.2.section').style.display = 'table';
-  Main.addClass(document.getElementById('step.1.section'), 'disabled');
-  Main.hide('gonext');
   Main.show('gocancel');
   Main.show('gocreate');
   
-  loadCDNAInformation();
   keepSessionAlive('<%=ID%>', debug, '../');
 }
@@ -366 +374 @@
   var url = '../LibPrep.servlet?ID=<%=ID%>';
   url += '&cmd=CreateBarcodedLibraries';
-  request.open("POST", url, false);
-  request.setRequestHeader("Content-Type", "application/json");
-  request.send(JSON.stringify(submitInfo));
+  try
+  {
+    showLoadingAnimation('Registering barcoded libraries...');
+    request.open("POST", url, false);
+    request.setRequestHeader("Content-Type", "application/json");
+    request.send(JSON.stringify(submitInfo));
+  }
+  finally
+  {
+    hideLoadingAnimation();
+  }
 
   if (debug) Main.debug(request.responseText);
@@ -553 +569 @@
     if (cdna)
     {
-      text += '<div class="name">'+cdna.name+'</div>';
+      var name = cdna.name;
+      var i = name.indexOf('.m');
+      text += '<div class="name">'+name.substring(0, i)+'.<br>&nbsp;'+name.substring(i)+'</div>';
       if (cdna.barcode)
       {
-        text += cdna.barcode.name;
+        text += '<div class="barcode">'+cdna.barcode.name+'</div>';
         if (cdna.defaultBarcode && cdna.barcode != cdna.defaultBarcode)
         {
@@ -663 +681 @@
         <td class="input"><select class="required" style="width:90%" 
             name="bioplate" id="bioplate"></select>
+          <div id="cdnacomments" style="font-style: italic; background: #E8E8E8; padding: 2px 5px 2px 5px;"></div>
         </td>
         <td class="status" id="bioplate.status"></td>
         <td class="help"><span id="bioplate.message" class="message" style="display: none;"></span>
           Select an existing cDNA bioplate. The list contain all cDNA bioplates that
-          has not yet been assigned barcodes (determined by the absence of child 'library' 
-          items).
+          has not yet been assigned barcodes (determined by the absence of 'BarcodeVariant' 
+          annotation).
         </td>
       </tr>
@@ -704 +723 @@
           <textarea rows="2" style="width: 90%;" name="comments" value=""></textarea>
         </td>
-        <td class="help">Comments about the cDNA plate.</td>
+        <td class="help">Comments for the library preparation.</td>
       </tr>
       </table>

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

@@ -367 +367 @@
         Number cdnaPlateId = (Number)jsonPlate.get("id");
         BioPlate cDnaPlate = BioPlate.getById(dc, cdnaPlateId.intValue());
-        cDnaPlate.setDescription((String)jsonPlate.get("comments"));
         Annotationtype.POOL_SCHEMA.setAnnotationValue(dc, cDnaPlate, jsonPlate.get("poolSchema"));
         Annotationtype.BARCODE_VARIANT.setAnnotationValue(dc, cDnaPlate, jsonPlate.get("barcodeVariant"));
@@ -375 +374 @@
         BioPlate libPlate = BioPlate.getNew(dc, BioplateType.LIBRARY.getPlateGeometry(dc), BioplateType.LIBRARY.load(dc));
         libPlate.setName(libPlateName);
+        libPlate.setDescription((String)jsonPlate.get("comments"));
         Annotationtype.POOL_SCHEMA.setAnnotationValue(dc, libPlate, jsonPlate.get("poolSchema"));
         Annotationtype.BARCODE_VARIANT.setAnnotationValue(dc, libPlate, jsonPlate.get("barcodeVariant"));