Skip to content

Commit d8934af

Browse files
ddamkeddamke
authored andcommitted
add automatic Database refresh after Import
1 parent 2842752 commit d8934af

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
import java.nio.charset.Charset;
2323
import java.nio.file.Paths;
2424
import java.sql.SQLException;
25+
import java.time.LocalDate;
26+
import java.util.List;
27+
import java.util.stream.Collectors;
2528

29+
import de.doubleslash.keeptime.Main;
30+
import de.doubleslash.keeptime.model.Project;
31+
import de.doubleslash.keeptime.model.Work;
2632
import javafx.application.Platform;
2733
import javafx.scene.control.*;
2834
import org.h2.tools.RunScript;
@@ -270,6 +276,10 @@ private void initImportButton(){
270276
final String url = applicationProperties.getSpringDataSourceUrl();
271277
final String username = applicationProperties.getSpringDataSourceUserName();
272278
final String password = applicationProperties.getSpringDataSourcePassword();
279+
280+
model.getAllProjects().clear();
281+
model.getAvailableProjects().clear();
282+
273283
RunScript.execute(url, username, password, file.toString(), Charset.defaultCharset(), true);
274284

275285
Alert informationDialog = new Alert(AlertType.INFORMATION);
@@ -278,7 +288,12 @@ private void initImportButton(){
278288
informationDialog.setContentText("KeepTime will now be CLOSED! You have to RESTART it again to see the changes");
279289
informationDialog.showAndWait();
280290

281-
Platform.exit();
291+
final List<Project> projects = model.getProjectRepository().findAll();
292+
LOG.debug("Found '{}' projects", projects.size());
293+
model.getAllProjects().addAll(projects);
294+
model.getAvailableProjects()
295+
.addAll(model.getAllProjects().stream().filter(Project::isEnabled).collect(Collectors.toList()));
296+
282297
} catch (SQLException e) {
283298
LOG.error("Could not import script file to db.", e);
284299

0 commit comments

Comments
 (0)