Changeset 1426


Ignore:
Timestamp:
Oct 28, 2011, 2:44:33 PM (10 years ago)
Author:
Martin Svensson
Message:

References #330 Refactor of 'OtherPartitionComment?' to 'OperatorPartitionComment?.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk/resources/partitionform.jsp

    r1425 r1426  
    488488    if (frm.elements['coloured'+i].checked == true) partitionComment += partitionComment.length>0 ? ':COLOURED' : 'COLOURED';
    489489   
    490     specimenTube.otherPartitionComment = partitionComment.length > 0 ? partitionComment : null;
     490    specimenTube.operatorPartitionComment = partitionComment.length > 0 ? partitionComment : null;
    491491   
    492492    specimens[i] = specimenTube;   
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/Reggie.java

    r1409 r1426  
    170170    for samples(Specimen tube). It s a String annotation type.   
    171171  */
    172   public static final String ANNOTATION_OTHER_PARTITION_COMMENT = "OtherPartitionComment";
     172  public static final String ANNOTATION_OPERATOR_PARTITION_COMMENT = "OperatorPartitionComment";
    173173 
    174174  /**
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1409 r1426  
    142142        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_NOF_PIECES, Item.SAMPLE, Type.INT, 1,
    143143            null, effectiveOptions, createIfMissing));
    144         jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_OTHER_PARTITION_COMMENT, Item.SAMPLE, Type.STRING, 1,
     144        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_OPERATOR_PARTITION_COMMENT, Item.SAMPLE, Type.STRING, 1,
    145145            null, effectiveOptions, createIfMissing));       
    146146        jsonChecks.add(checkAnnotationType(dc, Reggie.ANNOTATION_PARTITION_DATE, new Item[]{Item.SAMPLE, Item.EXTRACT}, Type.DATE, 1,
  • extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java

    r1425 r1426  
    118118       
    119119        AnnotationType partitionDateType = Reggie.findAnnotationType(dc, new Item[]{Item.EXTRACT, Item.SAMPLE}, Reggie.ANNOTATION_PARTITION_DATE, true);
    120         AnnotationType partitionCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OTHER_PARTITION_COMMENT, true);
     120        AnnotationType partitionCommentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_OPERATOR_PARTITION_COMMENT, true);
    121121        AnnotationType nofPiecesType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_NOF_PIECES, true);
    122122       
     
    142142            Float hisWeight = Values.getFloat((String)jsonSpecimen.get("hisWeight"), null);           
    143143            Integer nofPieces = Values.getInteger((String)jsonSpecimen.get("nofPieces"), null);
    144             String otherPartitionComment = Values.getStringOrNull((String)jsonSpecimen.get("otherPartitionComment"));
     144            String operatorPartitionComment = Values.getStringOrNull((String)jsonSpecimen.get("operatorPartitionComment"));
    145145           
    146146            if (spWeight != null) spWeight = spWeight *1000;
     
    149149                       
    150150            if (nofPieces != null) Reggie.setAnnotationValue(specimen, nofPiecesType, nofPieces);           
    151             if (otherPartitionComment != null) Reggie.setAnnotationValue(specimen, partitionCommentType, otherPartitionComment);           
     151            if (operatorPartitionComment != null) Reggie.setAnnotationValue(specimen, partitionCommentType, operatorPartitionComment);           
    152152            if (spWeight != null) originalQuantity = originalQuantity + spWeight;
    153153           
Note: See TracChangeset for help on using the changeset viewer.