- CHG: Updated dependencies.

- FIX: Fixed small bug with trials data import.
germinateplatform · Jun 14, 2022 · 33f1506 · 33f1506
1 parent b2f343d
commit 33f1506
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 36 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     compile fileTree(dir: 'lib', include: ['*.jar'])
 
     implementation 'cisd:jhdf5:19.04.0'
-    implementation 'org.jooq:jooq:3.11.10'
+    implementation 'org.jooq:jooq:3.16.6'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'mysql:mysql-connector-java:8.0.28'
     implementation 'org.dhatim:fastexcel-reader:0.12.14'

diff --git a/lib/germinate-codegen-4.3.0.jar b/lib/germinate-codegen-4.3.0.jar
diff --git a/lib/germinate-core-4.3.0.jar b/lib/germinate-core-4.3.0.jar
diff --git a/src/main/java/jhi/germinate/server/util/importer/DatasheetImporter.java b/src/main/java/jhi/germinate/server/util/importer/DatasheetImporter.java
@@ -314,6 +314,10 @@ protected void checkMetadataLabels(Sheet s)
 				if (StringUtils.isEmpty(name))
 					addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, index, "Title");
 			}
+			else
+			{
+				addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, -1, "Missing 'Title' on 'METADATA' sheet.");
+			}
 
 			index = metadataLabelToRowIndex.get("Description");
 			if (index != null)
@@ -322,6 +326,10 @@ protected void checkMetadataLabels(Sheet s)
 				if (StringUtils.isEmpty(description))
 					addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, index, "Description");
 			}
+			else
+			{
+				addImportResult(ImportStatus.GENERIC_MISSING_REQUIRED_VALUE, -1, "Missing 'Description' on 'METADATA' sheet.");
+			}
 		}
 		catch (IOException e)
 		{

diff --git a/src/main/java/jhi/germinate/server/util/importer/McpdImporter.java b/src/main/java/jhi/germinate/server/util/importer/McpdImporter.java
@@ -10,6 +10,7 @@
 import org.jooq.*;
 
 import java.io.*;
+import java.io.File;
 import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.*;

diff --git a/src/main/java/jhi/germinate/server/util/importer/PedigreeImporter.java b/src/main/java/jhi/germinate/server/util/importer/PedigreeImporter.java
@@ -10,6 +10,7 @@
 import org.jooq.*;
 
 import java.io.*;
+import java.io.File;
 import java.sql.*;
 import java.util.*;