Merge pull request '#29: SetAll instead of AddAll to avoid Duplication' (#30) from bug/treatments-are-shown-duplicate into main
Reviewed-on: #30 Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>
This commit is contained in:
commit
4b13bf6fe3
1 changed files with 3 additions and 4 deletions
|
@ -77,11 +77,10 @@ public class AllTreatmentController {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void readAllAndShowInTableView() {
|
public void readAllAndShowInTableView() {
|
||||||
this.treatments.clear();
|
|
||||||
comboBoxPatientSelection.getSelectionModel().select(0);
|
comboBoxPatientSelection.getSelectionModel().select(0);
|
||||||
this.dao = DaoFactory.getDaoFactory().createTreatmentDao();
|
this.dao = DaoFactory.getDaoFactory().createTreatmentDao();
|
||||||
try {
|
try {
|
||||||
this.treatments.addAll(dao.readAll());
|
this.treatments.setAll(dao.readAll());
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
@ -109,7 +108,7 @@ public class AllTreatmentController {
|
||||||
|
|
||||||
if (selectedPatient.equals("alle")) {
|
if (selectedPatient.equals("alle")) {
|
||||||
try {
|
try {
|
||||||
this.treatments.addAll(this.dao.readAll());
|
this.treatments.setAll(this.dao.readAll());
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
@ -118,7 +117,7 @@ public class AllTreatmentController {
|
||||||
Patient patient = searchInList(selectedPatient);
|
Patient patient = searchInList(selectedPatient);
|
||||||
if (patient != null) {
|
if (patient != null) {
|
||||||
try {
|
try {
|
||||||
this.treatments.addAll(this.dao.readTreatmentsByPid(patient.getId()));
|
this.treatments.setAll(this.dao.readTreatmentsByPid(patient.getId()));
|
||||||
} catch (SQLException exception) {
|
} catch (SQLException exception) {
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue