export adapted to new model (written comm language)

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

@@ -100,7 +100,7 @@ public class AppointmentDao {
 		if (currentVisit.getAppointments().size() > 0) {
 			result.add(currentVisit);
 		}
-		if (shouldBeFinished(currentVisit.getEndDate())) {
+		if (shouldBeFinished(currentVisit.getEndDate()) && !subject.isDead() && !subject.isResigned()) {
 			result.add(createNextVisit(currentVisit));
 		}
 		return result;

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

@@ -28,6 +28,7 @@ public class SubjectSqlExporter extends SqlExporter {
 		result.append("default_location_id,");
 		result.append("type,");
 		result.append("dead,");
+		result.append("default_written_communication_language_id,");
 		result.append("resigned,");
 		result.append("date_born) ");
 
@@ -67,6 +68,11 @@ public class SubjectSqlExporter extends SqlExporter {
 
 		result.append(getStringVal(subject.getType().toString().substring(0, 1)) + ",");
 		result.append(subject.isDead() + ",");
+		if (subject.getLanguages().size()>0) {
+			result.append("(select id from web_language where name=" + getStringVal(subject.getLanguages().get(0)) + "),");
+		} else {
+			result.append("null,");
+		}
 		result.append(subject.isResigned() + ",");
 		result.append(getDateVal(subject.getBirthDate()));
 		result.append(");\n");

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

@@ -21,9 +21,6 @@ public class VisitSqlExporter extends SqlExporter {
 		result.append(isFinished);
 		result.append(");\n");
 		for (AppointmentEntry entry: visit.getAppointments()) {
-			boolean entryFinished= isFinished;
-			if (isBefore(entry, Calendar.getInstance()))
-				entryFinished=true;
 			result.append(appointmentSqlExporter.toSql(entry)+"\n");
 		}