Merge branch 'appointments-dev' of...

Merge branch 'appointments-dev' of https://git-r3lab.uni.lu/piotr.atyjaszyk/scheduling-system into appointments-dev

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

@@ -165,7 +165,7 @@ public class LihControlParser extends SubjectParser {
 		return result;
 	}
 
-	private String getMappedLanguage(String abbreviation) {
+	protected String getMappedLanguage(String abbreviation) {
 		switch (abbreviation.toUpperCase()) {
 			case ("F"):
 				return "French";
@@ -179,6 +179,8 @@ public class LihControlParser extends SubjectParser {
 				return "Portuguese";
 			case ("ENG"):
 				return "English";
+			case ("EN"):
+				return "English";
 			case ("FR"):
 				return "French";
 			case ("L"):

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

@@ -480,6 +480,7 @@ public class Subject {
 		if (subject.getToBeSeenAt().equals("F")) {
 			setToBeSeenAt(subject.getToBeSeenAt());
 		}
+		addLanguages(subject.getLanguages());
 	}
 
 	private SubjectType getMergedValue(String string, SubjectType existingValue, SubjectType newValue, String errorPrefix) {

appointment-import/src/main/resources/log4j.properties

 #Set root logger 's level and its appender to an appender called CONSOLE which is defined below.
-log4j.rootLogger=debug, CONSOLE
+log4j.rootLogger=fatal, CONSOLE
 
 #Set the behavior of the CONSOLE appender 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender

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

@@ -29,6 +29,10 @@ public class LihControlParserTest extends TestBase {
 	public void tearDown() throws Exception {
 	}
 
+	@Test
+	public void testParseLang() throws Exception {
+		assertEquals("English",processor.getMappedLanguage("EN"));
+	}
 	@Test
 	public void test() throws Exception {
 		List<Subject> entries = processor.processExcel("testFiles/lihControlExample.xlsx");