- ADD: Added trial stats endpoint for anonymised trial duration data.

- ADD: Added treatment field to cells.
-

Author: sebastian-raubach

.idea/workspace.xml

@@ -17,6 +17,7 @@ public class Cell
 	private String                         barcode;
 	private String                         friendlyName;
 	private String                         pedigree;
+	private String                         treatment;
 	private String                         rep;
 	private Boolean                        isMarked;
 	private Geography                      geography;
@@ -31,6 +32,7 @@ public Cell(Cell input)
 		this.barcode = input.getBarcode();
 		this.friendlyName = input.getFriendlyName();
 		this.pedigree = input.getPedigree();
+		this.treatment = input.getTreatment();
 		this.rep = input.getRep();
 		this.isMarked = input.getIsMarked();
 		this.geography = input.getGeography();

src/main/java/jhi/gridscore/server/pojo/Cell.java

@@ -0,0 +1,16 @@
+package jhi.gridscore.server.pojo;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@NoArgsConstructor
+@ToString
+public class TrialStats
+{
+	private String createdOn;
+	private String updatedOn;
+	private Integer duration;
+}

src/main/java/jhi/gridscore/server/pojo/TrialStats.java

@@ -13,4 +13,5 @@ public class PlotDetailContent extends PlotContent
 	private String pedigree;
 	private String friendlyName;
 	private String barcode;
+	private String treatment;
 }

src/main/java/jhi/gridscore/server/pojo/transaction/PlotDetailContent.java

@@ -12,6 +12,7 @@
 import net.logicsquad.nanocaptcha.image.backgrounds.FlatColorBackgroundProducer;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jooq.*;
+import org.jooq.impl.*;
 import org.jooq.tools.StringUtils;
 
 import javax.imageio.ImageIO;
@@ -453,4 +454,29 @@ public Response getRenewCaptcha(@PathParam("shareCode") String shareCode)
 						   .build();
 		}
 	}
+
+	@GET
+	@Path("/stats")
+	@Consumes(MediaType.APPLICATION_JSON)
+	@Produces(MediaType.APPLICATION_JSON)
+	public Response getTrialOverviewstats()
+			throws SQLException
+	{
+		try (Connection conn = Database.getConnection())
+		{
+			DSLContext context = Database.getContext(conn);
+
+			Field<Integer> duration = DSL.dateDiff(DSL.cast(TRIALS.UPDATED_ON, SQLDataType.DATE), DSL.cast(TRIALS.CREATED_ON, SQLDataType.DATE)).as("duration");
+
+			return Response.ok(context.select(
+											  DSL.cast(TRIALS.CREATED_ON, SQLDataType.DATE).as("created_on"),
+											  DSL.cast(TRIALS.UPDATED_ON, SQLDataType.DATE).as("updated_on"),
+											  duration
+									  ).from(TRIALS)
+									  .having(duration.ge(10))
+									  .orderBy(TRIALS.UPDATED_ON.desc(), duration.desc())
+									  .fetchInto(TrialStats.class)
+			).build();
+		}
+	}
 }

src/main/java/jhi/gridscore/server/resource/TrialResource.java

@@ -246,7 +246,8 @@ else if (Objects.equals(shareCode, wrapper.getEditorCode()))
 							{
 								cell.setBarcode(plotChanges.getBarcode())
 									.setFriendlyName(plotChanges.getFriendlyName())
-									.setPedigree(plotChanges.getPedigree());
+									.setPedigree(plotChanges.getPedigree())
+									.setTreatment(plotChanges.getTreatment());
 							}
 						}
 

src/main/java/jhi/gridscore/server/resource/TrialTransactionResource.java

@@ -306,6 +306,14 @@ private void exportIndividually(XSSFSheet data, XSSFSheet dates)
 				dc.setCellValue(columnLabel);
 				pc.setCellValue(columnLabel);
 
+				// Write the treatment (if available)
+				dc = getCell(d, 5);
+				pc = getCell(p, 5);
+				if (!StringUtils.isEmpty(cell.getTreatment())) {
+					dc.setCellValue(cell.getTreatment());
+					pc.setCellValue(cell.getTreatment());
+				}
+
 				// Write the location
 				if (cell.getGeography() != null)
 				{
@@ -514,6 +522,14 @@ private void exportAggregatedPerDay(XSSFSheet data, XSSFSheet dates)
 					 dc.setCellValue(columnLabel);
 					 pc.setCellValue(columnLabel);
 
+					 // Write the treatment (if available)
+					 dc = getCell(d, 5);
+					 pc = getCell(p, 5);
+					 if (!StringUtils.isEmpty(c.getTreatment())) {
+						 dc.setCellValue(c.getTreatment());
+						 pc.setCellValue(c.getTreatment());
+					 }
+
 					 // Write the location
 					 if (c.getGeography() != null)
 					 {