Changeset 4983

Timestamp:

Sep 27, 2018, 8:22:15 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #1054: Even more functionality in the Flagged alignment wizard

The "Create mRNA plate wizard" has been updated to display a warning when selecting a RNA marked with DoNotUse.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/libprep/select_rna.js (modified) (1 diff)
• src/net/sf/basedb/reggie/dao/ReggieItem.java (modified) (1 diff)
• src/net/sf/basedb/reggie/dao/Rna.java (modified) (3 diffs)
• src/net/sf/basedb/reggie/servlet/MRnaServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/select_rna.js

@@ -1783 +1783 @@
           warningMsg[warningMsg.length] = info.AutoProcessing;
         }
+        if (info.DO_NOT_USE)
+        {
+          warningMsg[warningMsg.length] = 'DoNotUse-'+Strings.encodeTags(info.DO_NOT_USE);
+        }
         
       }

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/ReggieItem.java

@@ -230 +230 @@
   
   /**
+    Helper method for loading the DO_NOT_USE and DO_NOT_USE_COMMENT annotations
+    on items that support it.
+    @since 4.20
+  */
+  public void loadDoNotUseAnnotations(DbControl dc, SnapshotManager manager)
+  {
+    loadAnnotations(dc, manager, "DO_NOT_USE", Annotationtype.DO_NOT_USE, null);
+    loadAnnotations(dc, manager, "DO_NOT_USE_COMMENT", Annotationtype.DO_NOT_USE_COMMENT, null);
+  }
+  
+  /**
     Utility method for finding parent biomaterial of the specified subtypes
     by following the chain of parent items up to biosource.

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Rna.java

@@ -342 +342 @@
           r.setAnnotation("preNormalized", true);
           r.setAnnotation("remainingQuantity", e.getRemainingQuantity());
+          r.loadDoNotUseAnnotations(dc, manager);
           r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
           r.loadAnnotations(dc, manager, "DilutionDate", Annotationtype.DILUTION_DATE, Reggie.CONVERTER_DATE_TO_STRING);
@@ -512 +513 @@
           r.setAnnotation("preNormalized", false);
           r.setAnnotation("remainingQuantity", remainingQuantity);
+          r.loadDoNotUseAnnotations(dc, manager);
           r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
           r.loadAnnotations(dc, manager, "QiacubeDate", Annotationtype.QIACUBE_DATE, Reggie.CONVERTER_DATE_TO_STRING);
@@ -566 +568 @@
         r.setAnnotation("remainingQuantity", e.getRemainingQuantity());
         r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
+        r.loadDoNotUseAnnotations(dc, manager);
         
         r.loadRnaQc(dc, manager);

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

@@ -366 +366 @@
           r.setAnnotation("preNormalized", preNormalized);
           r.setAnnotation("remainingQuantity", r.getExtract().getRemainingQuantity());
+          r.loadDoNotUseAnnotations(dc, manager);
           r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
           r.loadAnnotations(dc, manager, "AutoProcessing", Annotationtype.AUTO_PROCESSING, null);