diff --git a/appointment-import/src/main/java/smash/appointment/parse/PrcSubjectsParser.java b/appointment-import/src/main/java/smash/appointment/parse/PrcSubjectsParser.java index e05389d3a5158a63388f6fa63e2582fc8882b70e..a7feec67c53656a6398e747b0dac5aa4df543d39 100644 --- a/appointment-import/src/main/java/smash/appointment/parse/PrcSubjectsParser.java +++ b/appointment-import/src/main/java/smash/appointment/parse/PrcSubjectsParser.java @@ -155,10 +155,21 @@ public class PrcSubjectsParser extends SubjectParser { @Override protected boolean parseResigned(Row row) { try { - IndexedColors color = IndexedColors.fromInt(row.getSheet().getWorkbook().getFontAt(row.getCell(0).getCellStyle().getFontIndex()).getColor()); + int colorId = row.getSheet().getWorkbook().getFontAt(row.getCell(0).getCellStyle().getFontIndex()).getColor(); + //special case for black + if (colorId == 32767) { + return false; + } + IndexedColors color = IndexedColors.fromInt(colorId); switch (color) { case RED: return true; + case SEA_GREEN: + return false; + case PINK: + return false; + case PLUM: + return false; case BLUE: return false; case BLACK: diff --git a/appointment-import/src/main/resources/log4j.properties b/appointment-import/src/main/resources/log4j.properties index c3a78a9276a81dd3ed72637dae8f44705769a156..e108a78cf8570a6f5bfc3e00dfaee3c45a1e829e 100644 --- a/appointment-import/src/main/resources/log4j.properties +++ b/appointment-import/src/main/resources/log4j.properties @@ -1,5 +1,5 @@ #Set root logger 's level and its appender to an appender called CONSOLE which is defined below. -log4j.rootLogger=fatal, CONSOLE +log4j.rootLogger=debug, CONSOLE #Set the behavior of the CONSOLE appender log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender diff --git a/appointment-import/src/test/java/smash/appointment/parse/AllTests.java b/appointment-import/src/test/java/smash/appointment/parse/AllTests.java index df5a093dc578b7660de0cdb9a6c9dff8d76aae5b..5d18d8096f02dd342ce2227684342276b60de532 100644 --- a/appointment-import/src/test/java/smash/appointment/parse/AllTests.java +++ b/appointment-import/src/test/java/smash/appointment/parse/AllTests.java @@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses; CellParserTest.class, // LihControlMappingParserTest.class, // LihControlParserTest.class, // + PrcControlParserTest.class, // PrcFlyingParserTest.class, // PrcSubjectsParserTest.class, // RedcapParserTest.class, // diff --git a/appointment-import/testFiles/prcSubjectsExample.xlsx b/appointment-import/testFiles/prcSubjectsExample.xlsx index 73487722d2c39870fd5751852650f2868f000a4d..b728be7a0083e5574a6fc513934de0535fb19065 100644 Binary files a/appointment-import/testFiles/prcSubjectsExample.xlsx and b/appointment-import/testFiles/prcSubjectsExample.xlsx differ