new format of prc controles and flying team data

appointment-import/src/main/java/smash/appointment/parse/PrcControlParser.java

@@ -11,7 +11,7 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseScreeningNumber(Row row) {
-		String number = getString(row.getCell(16));
+		String number = getString(row.getCell(13));
 		if (number.trim().isEmpty()) {
 			return "";
 		} else {
@@ -36,7 +36,7 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseNdNumber(Row row) {
-		return getString(row.getCell(14));
+		return getString(row.getCell(12));
 	}
 
 	@Override
@@ -51,7 +51,7 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseBirthDate(Row row) {
-		return "";
+		return parseDateOfBirth(row.getCell(11));
 	}
 
 	@Override
@@ -61,7 +61,7 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseAddDate(Row row) {
-		return getDate(row.getCell(8), Calendar.getInstance());
+		return getDate(row.getCell(9), Calendar.getInstance());
 	}
 
 	@Override
@@ -76,60 +76,37 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseMail(Row row) {
-		return getString(row.getCell(5));
+		return getString(row.getCell(8));
 	}
 
 	@Override
 	protected String parsePhone3(Row row) {
-		String phones[] = getPhones(row);
-		if (phones.length > 2) {
-			return phones[2].trim();
-		}
 		return "";
 	}
 
-	private String[] getPhones(Row row) {
-		return getString(row.getCell(4)).split("/");
-	}
-
 	@Override
 	protected String parsePhone2(Row row) {
-		String phones[] = getPhones(row);
-		if (phones.length > 1) {
-			return phones[1].trim();
-		}
-		return "";
+		return getString(row.getCell(7));
 	}
 
 	@Override
 	protected String parsePhone1(Row row) {
-		String phones[] = getPhones(row);
-		return phones[0].trim();
+		return getString(row.getCell(6));
 	}
 
 	@Override
 	protected String parseCity(Row row) {
-		String string = getString(row.getCell(3));
-		int spaceIndex = string.indexOf(" ");
-		if (spaceIndex > 0) {
-			return string.substring(spaceIndex).trim();
-		}
-		return string;
+		return getString(row.getCell(4));
 	}
 
 	@Override
 	protected String parseCountry(Row row) {
-		return "";
+		return getString(row.getCell(5));
 	}
 
 	@Override
 	protected String parseZipCode(Row row) {
-		String string = getString(row.getCell(3));
-		int spaceIndex = string.indexOf(" ");
-		if (spaceIndex > 0) {
-			return string.substring(0,spaceIndex);
-		}
-		return "";
+		return getString(row.getCell(3));
 	}
 
 	@Override
@@ -139,7 +116,7 @@ public class PrcControlParser extends SubjectParser {
 
 	@Override
 	protected String parseRemarks(Row row) {
-		String remark1 = getString(row.getCell(9));
+		String remark1 = getString(row.getCell(10));
 		String remark2 = "";
 
 		String result = "";
@@ -180,5 +157,4 @@ public class PrcControlParser extends SubjectParser {
 	protected boolean parseResigned(Row row) {
 		return false;
 	}
-
 }

appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java

@@ -11,7 +11,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseScreeningNumber(Row row) {
-		String number = getString(row.getCell(25));
+		String number = getString(row.getCell(21));
 		if (number.trim().isEmpty()) {
 			return "";
 		} else {
@@ -20,13 +20,13 @@ public class PrcFlyingParser extends SubjectParser {
 			} else if (number.length() == 2) {
 				number = "0" + number;
 			}
-			return "P-" + number;
+			return "F-" + number;
 		}
 	}
 
 	@Override
 	protected String parseName(Row row) {
-		return "";
+		return getString(row.getCell(1));
 	}
 
 	@Override
@@ -36,7 +36,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseNdNumber(Row row) {
-		return getString(row.getCell(23));
+		return getString(row.getCell(20));
 	}
 
 	@Override
@@ -51,7 +51,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseBirthDate(Row row) {
-		return parseDateOfBirth(row.getCell(27));
+		return parseDateOfBirth(row.getCell(22));
 	}
 
 	@Override
@@ -61,75 +61,62 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseAddDate(Row row) {
-		return getDate(row.getCell(11),Calendar.getInstance());
+		return getDate(row.getCell(12),Calendar.getInstance());
 	}
 
 	@Override
 	protected String parseReferal(Row row) {
-		return getString(row.getCell(10));
+		return getString(row.getCell(11));
 	}
 
 	@Override
 	protected String parseDiagnosisYear(Row row) {
-		return getString(row.getCell(8));
+		return "";
 	}
 
 	@Override
 	protected String parseMail(Row row) {
-		return getString(row.getCell(6));
+		return getString(row.getCell(8));
 	}
 
 	@Override
 	protected String parsePhone3(Row row) {
-		String phones[] = getPhones(row);
-		if (phones.length > 2) {
-			return phones[2].trim();
-		}
 		return "";
 	}
 
-	private String[] getPhones(Row row) {
-		return getString(row.getCell(5)).split("/");
-	}
-
 	@Override
 	protected String parsePhone2(Row row) {
-		String phones[] = getPhones(row);
-		if (phones.length > 1) {
-			return phones[1].trim();
-		}
-		return "";
+		return getString(row.getCell(7));
 	}
 
 	@Override
 	protected String parsePhone1(Row row) {
-		String phones[] = getPhones(row);
-		return phones[0].trim();
+		return getString(row.getCell(6));
 	}
 
 	@Override
 	protected String parseCity(Row row) {
-		return getString(row.getCell(3));
+		return getString(row.getCell(4));
 	}
 
 	@Override
 	protected String parseCountry(Row row) {
-		return getString(row.getCell(4));
+		return getString(row.getCell(5));
 	}
 
 	@Override
 	protected String parseZipCode(Row row) {
-		return getString(row.getCell(2));
+		return getString(row.getCell(3));
 	}
 
 	@Override
 	protected String parseAddress(Row row) {
-		return getString(row.getCell(1));
+		return getString(row.getCell(2));
 	}
 
 	@Override
 	protected String parseRemarks(Row row) {
-		String remark1 = getString(row.getCell(7));
+		String remark1 = getString(row.getCell(9));
 		String remark2 = getString(row.getCell(18));
 
 		String result = "";
@@ -144,7 +131,7 @@ public class PrcFlyingParser extends SubjectParser {
 
 	@Override
 	protected String parseDiagnosis(Row row) {
-		return getString(row.getCell(9));
+		return getString(row.getCell(10));
 	}
 
 	@Override

appointment-import/src/test/java/smash/appointment/parse/PrcControlParserTest.java

@@ -42,17 +42,17 @@ public class PrcControlParserTest extends TestBase {
 		assertEquals("DDD", subject.getAddress());
 		assertEquals("L-2423", subject.getZipCode());
 		assertEquals("Luxembourg", subject.getCity());
-		assertEquals("", subject.getCountry());
+		assertEquals("Luxembourg", subject.getCountry());
 		assertEquals("123", subject.getPhone1());
 		assertEquals("456", subject.getPhone2());
-		assertEquals("789", subject.getPhone3());
+		assertEquals("", subject.getPhone3());
 		assertEquals("mail@mail.lu", subject.getMail());
 		assertEquals("", subject.getDiagnosisYear());
 		assertEquals("", subject.getDiagnosis());
 		assertEquals("", subject.getReferal());
 		assertEquals("2016-03-29", subject.getAddDate());
 		assertEquals("ND3333", subject.getNdNumber());
-		assertEquals("", subject.getBirthDate());
+		assertEquals("1999-09-10", subject.getBirthDate());
 	}
 
 

appointment-import/src/test/java/smash/appointment/parse/PrcFlyingParserTest.java

@@ -35,9 +35,9 @@ public class PrcFlyingParserTest extends TestBase {
 		assertTrue(entries.size() > 0);
 
 		Subject subject = entries.get(0);
-		assertEquals("P-222", subject.getScreeningNumber());
-		assertEquals("DOE John", subject.getSurname());
-		assertEquals("", subject.getName());
+		assertEquals("F-222", subject.getScreeningNumber());
+		assertEquals("DOE", subject.getSurname());
+		assertEquals("John", subject.getName());
 		assertTrue(subject.getRemarks().contains("notes"));
 		assertEquals("8, rue des Nowhere", subject.getAddress());
 		assertEquals("F-57100", subject.getZipCode());
@@ -45,9 +45,9 @@ public class PrcFlyingParserTest extends TestBase {
 		assertEquals("France", subject.getCountry());
 		assertEquals("001234325435", subject.getPhone1());
 		assertEquals("666", subject.getPhone2());
-		assertEquals("777", subject.getPhone3());
+		assertEquals("", subject.getPhone3());
 		assertEquals("mail@address.lu", subject.getMail());
-		assertEquals("1998", subject.getDiagnosisYear());
+		assertEquals("", subject.getDiagnosisYear());
 		assertEquals("BLA", subject.getDiagnosis());
 		assertEquals("DR", subject.getReferal());
 		assertEquals("2016-07-06", subject.getAddDate());