Changeset 4983


Ignore:
Timestamp:
Sep 27, 2018, 8:22:15 AM (3 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:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/libprep/select_rna.js

    r4650 r4983  
    17831783          warningMsg[warningMsg.length] = info.AutoProcessing;
    17841784        }
     1785        if (info.DO_NOT_USE)
     1786        {
     1787          warningMsg[warningMsg.length] = 'DoNotUse-'+Strings.encodeTags(info.DO_NOT_USE);
     1788        }
    17851789       
    17861790      }
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/ReggieItem.java

    r4905 r4983  
    230230 
    231231  /**
     232    Helper method for loading the DO_NOT_USE and DO_NOT_USE_COMMENT annotations
     233    on items that support it.
     234    @since 4.20
     235  */
     236  public void loadDoNotUseAnnotations(DbControl dc, SnapshotManager manager)
     237  {
     238    loadAnnotations(dc, manager, "DO_NOT_USE", Annotationtype.DO_NOT_USE, null);
     239    loadAnnotations(dc, manager, "DO_NOT_USE_COMMENT", Annotationtype.DO_NOT_USE_COMMENT, null);
     240  }
     241 
     242  /**
    232243    Utility method for finding parent biomaterial of the specified subtypes
    233244    by following the chain of parent items up to biosource.
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Rna.java

    r4905 r4983  
    342342          r.setAnnotation("preNormalized", true);
    343343          r.setAnnotation("remainingQuantity", e.getRemainingQuantity());
     344          r.loadDoNotUseAnnotations(dc, manager);
    344345          r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
    345346          r.loadAnnotations(dc, manager, "DilutionDate", Annotationtype.DILUTION_DATE, Reggie.CONVERTER_DATE_TO_STRING);
     
    512513          r.setAnnotation("preNormalized", false);
    513514          r.setAnnotation("remainingQuantity", remainingQuantity);
     515          r.loadDoNotUseAnnotations(dc, manager);
    514516          r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
    515517          r.loadAnnotations(dc, manager, "QiacubeDate", Annotationtype.QIACUBE_DATE, Reggie.CONVERTER_DATE_TO_STRING);
     
    566568        r.setAnnotation("remainingQuantity", e.getRemainingQuantity());
    567569        r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
     570        r.loadDoNotUseAnnotations(dc, manager);
    568571       
    569572        r.loadRnaQc(dc, manager);
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/MRnaServlet.java

    r4897 r4983  
    366366          r.setAnnotation("preNormalized", preNormalized);
    367367          r.setAnnotation("remainingQuantity", r.getExtract().getRemainingQuantity());
     368          r.loadDoNotUseAnnotations(dc, manager);
    368369          r.loadAnnotations(dc, manager, "NDConc", Annotationtype.ND_CONC, null);
    369370          r.loadAnnotations(dc, manager, "AutoProcessing", Annotationtype.AUTO_PROCESSING, null);
Note: See TracChangeset for help on using the changeset viewer.