From 6382a54a2535cfffda17fe7b6d04e81fa4ec5eb5 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 9 Mar 2017 13:46:04 +0100
Subject: [PATCH] export adapted to new model (written comm language)
---
.../main/java/smash/appointment/parse/AppointmentDao.java | 2 +-
.../java/smash/appointment/parse/SubjectSqlExporter.java | 6 ++++++
.../main/java/smash/appointment/parse/VisitSqlExporter.java | 3 ---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/appointment-import/src/main/java/smash/appointment/parse/AppointmentDao.java b/appointment-import/src/main/java/smash/appointment/parse/AppointmentDao.java
index cb965abf..fc4da7b8 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/AppointmentDao.java
+++ b/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;
diff --git a/appointment-import/src/main/java/smash/appointment/parse/SubjectSqlExporter.java b/appointment-import/src/main/java/smash/appointment/parse/SubjectSqlExporter.java
index 0e338919..ebbd5866 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/SubjectSqlExporter.java
+++ b/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");
diff --git a/appointment-import/src/main/java/smash/appointment/parse/VisitSqlExporter.java b/appointment-import/src/main/java/smash/appointment/parse/VisitSqlExporter.java
index 730b6c09..9cd7dff0 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/VisitSqlExporter.java
+++ b/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");
}
--
GitLab