fixed bug in swap logic

Author: Jeffrey-Young

releases/ShiftOverflow_v0.4.2.jar

@@ -246,7 +246,7 @@ private void setupForDrop() {
 		scheduleListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
 			_dropSchedule = _ui.getScheduleByName(newValue);
 			javafx.collections.ObservableList<String> days = FXCollections
-					.observableArrayList(_ui.getDaysList());
+					.observableArrayList(_ui.getDaysList(_dropSchedule));
 			dayListView.setItems(days);
 			//dayListView.prefHeightProperty().bind(Bindings.size(days).multiply(24));
 			_employeeToAddOrDrop = null;
@@ -259,7 +259,7 @@ private void setupForDrop() {
 		dayListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
 			_dropDay = Week.dayInt(newValue);
 			javafx.collections.ObservableList<String> hours = FXCollections
-					.observableArrayList(_ui.getHoursList(newValue));
+					.observableArrayList(_ui.getHoursList(_dropSchedule, newValue));
 			hourListView.setItems(hours);
 			//hourListView.prefHeightProperty().bind(Bindings.size(hours).multiply(24));
 			_employeeToAddOrDrop = null;
@@ -327,7 +327,7 @@ private void setupForAdd() {
 		scheduleListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
 			_addSchedule = _ui.getScheduleByName(newValue);
 			javafx.collections.ObservableList<String> days = FXCollections
-					.observableArrayList(_ui.getDaysList());
+					.observableArrayList(_ui.getDaysList(_addSchedule));
 			dayListView.setItems(days);
 			dayListView.prefHeightProperty().bind(Bindings.size(days).multiply(24));
 			_employeeToAddOrDrop = null;
@@ -340,7 +340,7 @@ private void setupForAdd() {
 		dayListView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
 			_addDay = Week.dayInt(newValue);
 			javafx.collections.ObservableList<String> hours = FXCollections
-					.observableArrayList(_ui.getHoursList(newValue));
+					.observableArrayList(_ui.getHoursList(_addSchedule, newValue));
 			hourListView.setItems(hours);
 			hourListView.prefHeightProperty().bind(Bindings.size(hours).multiply(24));
 			_employeeToAddOrDrop = null;