diff --git a/health_data_export/src/application/UICoordinator.java b/health_data_export/src/application/UICoordinator.java index a439185..a0ac394 100644 --- a/health_data_export/src/application/UICoordinator.java +++ b/health_data_export/src/application/UICoordinator.java @@ -1114,7 +1114,6 @@ public class UICoordinator implements ChangeListener levelOne.setItems(getOccupationList("")); levelOne.setDisable(false); levelOne.setValue(Text.NOT_SET); - occupation= new Occupation(Text.NOT_SET); levelOne.valueProperty().addListener(new ChangeListener() { @@ -1196,6 +1195,21 @@ public class UICoordinator implements ChangeListener comboContainer.getChildren().add(levelThree); comboContainer.getChildren().add(levelFour); + if(occupation==null) + { + occupation= new Occupation(Text.NOT_SET); + } + else + { + String lTwo=occupation.getLevelTwo(); + String lThree=occupation.getLevelThree(); + String lFour=occupation.getLevelFour(); + levelOne.setValue(occupation.getLevelOne()); + levelTwo.setValue(lTwo); + levelThree.setValue(lThree); + levelFour.setValue(lFour); + } + HBox jobInfo = new HBox(); jobInfo.setId("jobInfo"); jobInfo.minWidthProperty() diff --git a/health_data_export/target/.gitignore b/health_data_export/target/.gitignore index f05d761..8fb37bd 100644 --- a/health_data_export/target/.gitignore +++ b/health_data_export/target/.gitignore @@ -3,3 +3,4 @@ /HealthTool-1.0.pkg /healthtool_1.0-1_amd64.deb /HealthTool-1.0.msi +/health_data_export-7.jar diff --git a/health_data_export/target/health_data_export-7.jar b/health_data_export/target/health_data_export-7.jar deleted file mode 100644 index 911eef9..0000000 Binary files a/health_data_export/target/health_data_export-7.jar and /dev/null differ