Skip to content
Snippets Groups Projects
Commit 52b83530 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

merging improved to have sources merged as well

parent 93cead7d
No related branches found
No related tags found
1 merge request!1Appointments dev
......@@ -87,6 +87,8 @@ public class AppointmentDao {
String date = currentVisit.getLastAppointmentDate();
if (date.equals(appointmentEntry.getDay().substring(0, 10))) {
currentVisit.getLastAppointment().addTypes(appointmentEntry.getTypes());
String source = appointmentEntry.getSource() + "\n"+currentVisit.getLastAppointment().getSource();
currentVisit.getLastAppointment().setSource(source);
} else {
currentVisit.addAppointment(appointmentEntry);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment