Changeset 2505

Timestamp:

Jun 13, 2014, 8:52:12 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #604: New wizard "RNA dilution registration"

Added the new RNA dilution registration wizard.

Location:

extensions/net.sf.basedb.reggie/branches/2.15-stable

Files:

• resources/libprep/rna_dilution_registration.jsp (added)
• src/net/sf/basedb/reggie/servlet/MRnaServlet.java (modified) (2 diffs)

extensions/net.sf.basedb.reggie/branches/2.15-stable/src/net/sf/basedb/reggie/servlet/MRnaServlet.java

@@ -173 +173 @@
           query.restrict(Restrictions.neq(Hql.alias("dd"), null));
         }
+        else if (req.getParameter("onlyUndiluted") != null)
+        {
+          // Must NOT have a DILUTION_DATE annotation
+          query.join(Annotations.leftJoin(null, Annotationtype.DILUTION_DATE.load(dc), "dd"));
+          query.restrict(Restrictions.eq(Hql.alias("dd"), null));
+        }
         
         query.order(Orders.desc(Hql.property("id")));
@@ -610 +616 @@
         
         jsonMessages.add("Created " + mRnaPlate.getName() + " with " + jsonWells.size() + " mRNA child items");
+      }
+      else if ("RegisterRNADilution".equals(cmd))
+      {
+        dc = sc.newDbControl();
+
+        ReggieRole.checkPermission(dc, "'" + cmd + "' wizard", ReggieRole.LIBRARY_PREP, ReggieRole.ADMINISTRATOR);
+
+        JSONObject jsonReq = (JSONObject)new JSONParser().parse(req.getReader());
+        
+        Number bioPlateId = (Number)jsonReq.get("bioplate");
+
+        // Load mRNA plate and the creation event
+        ReactionPlate mrnaReactionPlate = ReactionPlate.getById(dc, bioPlateId.intValue(), BioplateType.MRNA);
+        BioPlate mrnaPlate = mrnaReactionPlate.getBioPlate();
+        
+        // Dates and operators 
+        Annotationtype.DILUTION_DATE.setAnnotationValue(dc, mrnaPlate, Reggie.CONVERTER_STRING_TO_DATE.convert((String)jsonReq.get("dilutionDate")));
+        Annotationtype.DILUTION_OPERATOR.setAnnotationValue(dc, mrnaPlate, Values.getStringOrNull((String)jsonReq.get("dilutionOperator")));
+    
+        // Comment about the plate
+        mrnaPlate.setDescription((String)jsonReq.get("comments"));
+
+        jsonMessages.add("RNA dilution for mRNA plate '" + mrnaPlate.getName() + "' registered successfully.");
+        
+        dc.commit();
       }