Occupation will now also be saved for return

2021-05-25 08:40:21 +02:00
parent 30869278a7
commit 3290349d86
3 changed files with 16 additions and 1 deletions
@@ -1114,7 +1114,6 @@ public class UICoordinator implements ChangeListener<Boolean>
 		levelOne.setItems(getOccupationList(""));
 		levelOne.setDisable(false);
 		levelOne.setValue(Text.NOT_SET); 
-		occupation= new Occupation(Text.NOT_SET);
 		
 		levelOne.valueProperty().addListener(new ChangeListener<String>()
 		{
@@ -1196,6 +1195,21 @@ public class UICoordinator implements ChangeListener<Boolean>
 		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()
@@ -3,3 +3,4 @@
 /HealthTool-1.0.pkg
 /healthtool_1.0-1_amd64.deb
 /HealthTool-1.0.msi
+/health_data_export-7.jar