diff --git a/health_data_export/dependency-reduced-pom.xml b/health_data_export/dependency-reduced-pom.xml index 47375bc..4c3a813 100644 --- a/health_data_export/dependency-reduced-pom.xml +++ b/health_data_export/dependency-reduced-pom.xml @@ -19,7 +19,7 @@ org.eclipse.cbi.maven.plugins eclipse-dmg-packager - 1.1.3 + 1.3.0 @@ -32,6 +32,11 @@ 8 + + org.eclipse.cbi.maven.plugins + eclipse-dmg-packager + 1.3.0 + org.openjfx javafx-maven-plugin @@ -69,6 +74,18 @@ + + + eclipse cbi + https://repo.eclipse.org/content/repositories/cbi-releases + + + + + eclipse cbi + https://repo.eclipse.org/content/repositories/cbi-releases + + org.openjfx diff --git a/health_data_export/src/application/UICoordinator.java b/health_data_export/src/application/UICoordinator.java index 9df058d..d14fe65 100644 --- a/health_data_export/src/application/UICoordinator.java +++ b/health_data_export/src/application/UICoordinator.java @@ -615,6 +615,7 @@ public class UICoordinator implements ChangeListener privAgree = new CheckBox(); privAgree.setText(Text.PRIVACY_STATEMENT_ACCEPTED); privAgree.setWrapText(true); + privAgree.setStyle("-fx-font-family: \"Arial\""); privAgree.selectedProperty().addListener(new ChangeListener() { @Override @@ -779,7 +780,10 @@ public class UICoordinator implements ChangeListener // View for clicking and setting the path for saving the resulting data BorderPane selectSavePath = new BorderPane(); String currentUsersHomeDir = System.getProperty("user.home"); - dirForSaving= new File(currentUsersHomeDir); + if(dirForSaving==null) + { + dirForSaving= new File(currentUsersHomeDir); + } path = new Label(String.format(Text.F_LABEL_SAVE_PATH, currentUsersHomeDir)); selectSavePath.setCenter(path); @@ -1100,12 +1104,12 @@ public class UICoordinator implements ChangeListener ComboBox levelTwo = getComboBox(comboContainer); ComboBox levelThree = getComboBox(comboContainer); ComboBox levelFour = getComboBox(comboContainer); - + levelOne.setStyle("-fx-font-family :\"Arial\""); + levelOne.setItems(getOccupationList("")); levelOne.setDisable(false); levelOne.setValue(Text.NOT_SET); occupation= new Occupation(Text.NOT_SET); - levelOne.valueProperty().addListener(new ChangeListener() { diff --git a/health_data_export/target/health_data_export-7.jar b/health_data_export/target/health_data_export-7.jar index 15c0a33..0396acc 100644 Binary files a/health_data_export/target/health_data_export-7.jar and b/health_data_export/target/health_data_export-7.jar differ diff --git a/health_data_export/target/maven-archiver/pom.properties b/health_data_export/target/maven-archiver/pom.properties index 5a0e241..1bade82 100644 --- a/health_data_export/target/maven-archiver/pom.properties +++ b/health_data_export/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Apr 30 10:46:45 CEST 2021 +#Fri May 21 10:51:02 CEST 2021 groupId=health_data_export artifactId=health_data_export version=7 diff --git a/health_data_export/target/original-health_data_export-7.jar b/health_data_export/target/original-health_data_export-7.jar index 4e749ae..93c38c3 100644 Binary files a/health_data_export/target/original-health_data_export-7.jar and b/health_data_export/target/original-health_data_export-7.jar differ