Appointments dev

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

@@ -62,9 +62,9 @@ public class AppointmentDao {
 				String date1 = o1.getDay().substring(0, 10);
 				String date2 = o2.getDay().substring(0, 10);
 				if (date1.compareTo(date2) == 0) {
-					if (o1.getTypes().contains(AppointmentType.LEVEL_A) || o1.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
+					if (o1.getTypes().contains(AppointmentType.LEVEL_AQUEST) || o1.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
 						return -1;
-					} else if (o2.getTypes().contains(AppointmentType.LEVEL_A) || o2.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
+					} else if (o2.getTypes().contains(AppointmentType.LEVEL_AQUEST) || o2.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
 						return 1;
 					} else {
 						return 0;
@@ -79,8 +79,11 @@ public class AppointmentDao {
 		List<Visit> result = new ArrayList<>();
 		Visit currentVisit = new Visit(subject);
 		for (AppointmentEntry appointmentEntry : list) {
-			if (appointmentEntry.getTypes().contains(AppointmentType.LEVEL_A) || appointmentEntry.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
+			if (appointmentEntry.getTypes().contains(AppointmentType.LEVEL_AQUEST) || appointmentEntry.getTypes().contains(AppointmentType.LEVEL_A_TQ)) {
 				if (currentVisit.getAppointments().size() > 0) {
+					if (shouldBeFinished(currentVisit.getEndDate())) {
+						currentVisit.setFinished(true);
+					}
 					result.add(currentVisit);
 				}
 
@@ -101,7 +104,10 @@ public class AppointmentDao {
 			result.add(currentVisit);
 		}
 		if (shouldBeFinished(currentVisit.getEndDate())) {
-			result.add(createNextVisit(currentVisit));
+			currentVisit.setFinished(true);
+			if (!subject.isDead() && !subject.isResigned()) {
+				result.add(createNextVisit(currentVisit));
+			}
 		}
 		return result;
 	}
@@ -109,7 +115,7 @@ public class AppointmentDao {
 	protected Visit createNextVisit(Visit currentVisit) throws ParseException {
 		Visit visit = new Visit(currentVisit.getSubject());
 		Calendar date = Calendar.getInstance();
-		String dateStr =currentVisit.getStartDate(); 
+		String dateStr = currentVisit.getStartDate();
 		date.setTime(DATE_FORMATTER.parse(dateStr));
 		if (currentVisit.getSubject().getType().equals(SubjectType.CONTROL)) {
 			date.add(Calendar.YEAR, 4);