- ADD: Added support for plot-level 'friendly name', 'barcode' and 'pedigree'. These can be defined during trial creation or at a later time.

Author: sebastian-raubach

.idea/workspace.xml

@@ -1,6 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
-// Generated using typescript-generator version 3.2.1263 on 2025-01-14 11:11:37.
+// Generated using typescript-generator version 3.2.1263 on 2025-05-19 13:40:07.
 
 export interface Trial {
     name: string;
@@ -29,6 +29,7 @@ export interface Transaction {
     plotMarkedTransactions: { [index: string]: boolean };
     plotTraitDataChangeTransactions: { [index: string]: TraitMeasurement[] };
     plotGeographyChangeTransactions: { [index: string]: PlotGeographyContent };
+    plotDetailsChangeTransaction: { [index: string]: PlotDetailContent };
     trialCommentAddedTransactions: TrialCommentContent[];
     trialCommentDeletedTransactions: TrialCommentContent[];
     trialEventAddedTransactions: TrialEventContent[];
@@ -91,6 +92,9 @@ export interface Layout {
 export interface Cell {
     brapiId: string;
     germplasm: string;
+    barcode: string;
+    friendlyName: string;
+    pedigree: string;
     rep: string;
     isMarked: boolean;
     geography: Geography;
@@ -128,6 +132,12 @@ export interface PlotGeographyContent extends PlotContent {
     center: LatLng;
 }
 
+export interface PlotDetailContent extends PlotContent {
+    pedigree: string;
+    friendlyName: string;
+    barcode: string;
+}
+
 export interface TrialCommentContent {
     content: string;
     timestamp: string;

gridscore.ts

@@ -14,6 +14,9 @@ public class Cell
 {
 	private String                         brapiId;
 	private String                         germplasm;
+	private String                         barcode;
+	private String                         friendlyName;
+	private String                         pedigree;
 	private String                         rep;
 	private Boolean                        isMarked;
 	private Geography                      geography;
@@ -25,6 +28,9 @@ public Cell(Cell input)
 	{
 		this.brapiId = input.getBrapiId();
 		this.germplasm = input.getGermplasm();
+		this.barcode = input.getBarcode();
+		this.friendlyName = input.getFriendlyName();
+		this.pedigree = input.getPedigree();
 		this.rep = input.getRep();
 		this.isMarked = input.getIsMarked();
 		this.geography = input.getGeography();

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

@@ -19,6 +19,7 @@ public class Transaction
 	private Map<String, Boolean>                  plotMarkedTransactions;
 	private Map<String, List<TraitMeasurement>>   plotTraitDataChangeTransactions;
 	private Map<String, PlotGeographyContent>     plotGeographyChangeTransactions;
+	private Map<String, PlotDetailContent>        plotDetailsChangeTransaction;
 	private List<TrialCommentContent>             trialCommentAddedTransactions;
 	private List<TrialCommentContent>             trialCommentDeletedTransactions;
 	private List<TrialEventContent>               trialEventAddedTransactions;

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

@@ -0,0 +1,16 @@
+package jhi.gridscore.server.pojo.transaction;
+
+import lombok.*;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@NoArgsConstructor
+@ToString(callSuper = true)
+public class PlotDetailContent extends PlotContent
+{
+	private String pedigree;
+	private String friendlyName;
+	private String barcode;
+}

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

@@ -237,6 +237,19 @@ else if (Objects.equals(shareCode, wrapper.getEditorCode()))
 							}
 						}
 
+						// Check if plot details have changed
+						if (transaction.getPlotDetailsChangeTransaction() != null)
+						{
+							PlotDetailContent plotChanges = transaction.getPlotDetailsChangeTransaction().get(key);
+
+							if (plotChanges != null)
+							{
+								cell.setBarcode(plotChanges.getBarcode())
+									.setFriendlyName(plotChanges.getFriendlyName())
+									.setPedigree(plotChanges.getPedigree());
+							}
+						}
+
 						// Check if comments have been added
 						if (transaction.getPlotCommentAddedTransactions() != null)
 						{
@@ -313,9 +326,9 @@ else if (Objects.equals(shareCode, wrapper.getEditorCode()))
 													 {
 														 // Add new
 														 list.add(new Measurement()
-																		  .setPersonId(m.getPersonId())
-																		  .setValues(m.getValues())
-																		  .setTimestamp(m.getTimestamp()));
+																 .setPersonId(m.getPersonId())
+																 .setValues(m.getValues())
+																 .setTimestamp(m.getTimestamp()));
 													 }
 												 }
 												 else

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

@@ -12,7 +12,7 @@
 
 public abstract class ConfigTest
 {
-	protected static String             URL = "http://localhost:8180/gridscore-next-api/v3.1.1/api/trial";
+	protected static String             URL = "http://localhost:8180/gridscore-next-api/v3.3.0/api/trial";
 	protected static Client             client;
 	protected static Invocation.Builder postBuilder;
 

src/test/java/ConfigTest.java

@@ -64,7 +64,7 @@ void exportToGerminate()
 		InputStream in = response.readEntity(InputStream.class);
 
 		XSSFWorkbook workbook = new XSSFWorkbook(in);
-		Assertions.assertEquals(11, workbook.getNumberOfSheets());
+		Assertions.assertEquals(12, workbook.getNumberOfSheets());
 		// Check metadata
 		Sheet metadata = workbook.getSheet("METADATA");
 		Assertions.assertNotNull(metadata);