#178: add heimat settings in settings layout. add heimat settings to database. started external mapping db-table (wip)

Author: Death111

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import de.doubleslash.keeptime.model.settings.HeimatSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -41,16 +42,18 @@ public class Controller {
    private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
 
    private final long AUTO_SAVE_INTERVAL_SECONDS = 60;
+   private final HeimatSettings heimatSettings;
    private Interval autoSaveInterval;
 
    private final Model model;
    private final Settings settings;
 
    private final DateProvider dateProvider;
 
-   public Controller(final Model model, Settings settings, final DateProvider dateProvider) {
+   public Controller(final Model model, Settings settings, HeimatSettings heimatSettings, final DateProvider dateProvider) {
       this.model = model;
       this.settings = settings;
+      this.heimatSettings = heimatSettings;
       this.dateProvider = dateProvider;
    }
 
@@ -119,8 +122,14 @@ public void addNewProject(final Project project) {
       model.getProjectRepository().saveAll(changedProjects);
    }
 
+   public void updateHeimatSettings(final boolean active, String url, String pat){
+      heimatSettings.setHeimatActive(active);
+      heimatSettings.setHeimatUrl(url);
+      heimatSettings.setHeimatPat(pat);
+      heimatSettings.save();
+   }
+   
    public void updateSettings(final Settings newValuedSettings) {
-
       settings.setTaskBarColor(newValuedSettings.getTaskBarColor());
       settings.setDefaultBackgroundColor(newValuedSettings.getDefaultBackgroundColor());
       settings.setDefaultFontColor(newValuedSettings.getDefaultFontColor());

src/main/java/de/doubleslash/keeptime/model/ExternalProjectMapping.java

@@ -0,0 +1,64 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package de.doubleslash.keeptime.model;
+
+import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
+import jakarta.persistence.*;
+import javafx.scene.paint.Color;
+
+@Entity
+@Table(name = "ExternalProjectMapping")
+public class ExternalProjectMapping {
+
+   @Id
+   @GeneratedValue(strategy = GenerationType.IDENTITY)
+   @Column(name = "id", updatable = false, nullable = false)
+   private long id;
+
+   // TODO maybe add a externalSystem Identifier
+
+   @Lob
+   private String externalProjectData;
+
+   @ManyToOne
+   private Project project;
+
+   public ExternalProjectMapping() {
+      // Needed for jpa
+   }
+
+   public ExternalProjectMapping(final String externalProjectData, final Project project) {
+      this.externalProjectData = externalProjectData;
+      this.project = project;
+   }
+
+   public String getExternalProjectData() {
+      return externalProjectData;
+   }
+
+   public void setExternalProjectData(final String externalProjectData) {
+      this.externalProjectData = externalProjectData;
+   }
+
+   public Project getProject() {
+      return project;
+   }
+
+   public void setProject(final Project project) {
+      this.project = project;
+   }
+}

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -19,6 +19,7 @@
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
 import de.doubleslash.keeptime.model.repos.SettingsRepository;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
+import de.doubleslash.keeptime.model.settings.HeimatSettings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
@@ -35,14 +36,19 @@
 public class Model {
    private ProjectRepository projectRepository;
    private WorkRepository workRepository;
-   private SettingsRepository settingsRepository;
+
+   public HeimatSettings getHeimatSettings() {
+      return heimatSettings;
+   }
+
+   private HeimatSettings heimatSettings;
    @Autowired
    public Model(final ProjectRepository projectRepository, final WorkRepository workRepository,
-         final SettingsRepository settingsRepository) {
+         final HeimatSettings heimatSettings) {
       super();
       this.projectRepository = projectRepository;
       this.workRepository = workRepository;
-      this.settingsRepository = settingsRepository;
+      this.heimatSettings = heimatSettings;
    }
 
    public static final Color ORIGINAL_HOVER_BACKGROUND_COLOR = new Color(54 / 255., 143 / 255., 179 / 255., .7);
@@ -96,10 +102,6 @@ public void setProjectRepository(final ProjectRepository projectRepository) {
       this.projectRepository = projectRepository;
    }
 
-   public void setSettingsRepository(final SettingsRepository settingsRepository) {
-      this.settingsRepository = settingsRepository;
-   }
-
    public void setIdleProject(final Project idleProject) {
       this.idleProject = idleProject;
    }
@@ -120,10 +122,6 @@ public ProjectRepository getProjectRepository() {
       return projectRepository;
    }
 
-   public SettingsRepository getSettingsRepository() {
-      return settingsRepository;
-   }
-
    public ObservableList<Work> getPastWorkItems() {
       return pastWorkItems;
    }

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -36,16 +36,18 @@ public Settings(SettingsRepository settingsRepository) {
       this.settingsRepository = settingsRepository;
    }
 
+   // TODO add default values
+
    public boolean isRemindIfNotesAreEmptyOnlyForWorkEntry() {
-      return getBoolean("remind_if_notes_are_empty_only_for_work_entry");
+      return getBoolean("remind_if_notes_are_empty_only_for_work_entry", false);
    }
 
    public void setRemindIfNotesAreEmptyOnlyForWorkEntry(boolean emptyNoteReminderCheckBoxIsWork) {
       setBoolean( "remind_if_notes_are_empty_only_for_work_entry", emptyNoteReminderCheckBoxIsWork);
    }
 
    public boolean isConfirmClose() {
-      return getBoolean("confirm_close");
+      return getBoolean("confirm_close", false);
    }
 
    public void setConfirmClose(boolean confirmClose) {
@@ -93,23 +95,23 @@ public void setTaskBarColor(final Color taskBarColor) {
    }
 
    public boolean isUseHotkey() {
-      return getBoolean("use_hotkey");
+      return getBoolean("use_hotkey", false);
    }
 
    public void setUseHotkey(final boolean useHotkey) {
       setBoolean("use_hotkey", useHotkey);
    }
 
    public boolean isDisplayProjectsRight() {
-      return getBoolean("display_projects_right");
+      return getBoolean("display_projects_right", true);
    }
 
    public void setDisplayProjectsRight(final boolean displayProjectsRight) {
       setBoolean("display_projects_right", displayProjectsRight);
    }
 
    public boolean isHideProjectsOnMouseExit() {
-      return getBoolean("hide_projects_on_mouse_exit");
+      return getBoolean("hide_projects_on_mouse_exit", true);
    }
 
    public void setHideProjectsOnMouseExit(final boolean hideProjectsOnMouseExit) {
@@ -141,27 +143,32 @@ public void setScreenHash(final int screenHash) {
    }
 
    public boolean isSaveWindowPosition() {
-      return getBoolean("save_window_position");
+      return getBoolean("save_window_position", false);
    }
 
    public void setSaveWindowPosition(final boolean saveWindowPosition) {
       setBoolean("save_window_position", saveWindowPosition);
    }
 
    public boolean isRemindIfNotesAreEmpty() {
-      return getBoolean("remind_if_notes_are_empty");
+      return getBoolean("remind_if_notes_are_empty", false);
    }
 
    public void setRemindIfNotesAreEmpty(final boolean emptyNoteReminder) {
       setBoolean("remind_if_notes_are_empty", emptyNoteReminder);
    }
 
-   private boolean getBoolean(String key) {
-      return Boolean.getBoolean(settingsRepository.findBySetting(key).getSettingValue());
+   private boolean getBoolean(String key, boolean orDefault) {
+      final Setting bySetting = settingsRepository.findBySetting(key);
+      if (bySetting == null)
+         return orDefault;
+      return Boolean.parseBoolean(bySetting.getSettingValue());
    }
 
    public void setBoolean(String key, boolean value) {
-      final Setting setting = settingsRepository.findBySetting(key);
+      Setting setting = settingsRepository.findBySetting(key);
+      if (setting == null)
+         setting = new Setting(key, "");
       setting.setSettingValue(String.valueOf(value));
       settingsRepository.save(setting);
    }

src/main/java/de/doubleslash/keeptime/model/repos/ExternalProjectsMappingsRepository.java

@@ -0,0 +1,28 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+package de.doubleslash.keeptime.model.repos;
+
+import de.doubleslash.keeptime.model.ExternalProjectMapping;
+import de.doubleslash.keeptime.model.Project;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExternalProjectsMappingsRepository extends JpaRepository<ExternalProjectMapping, Long> {
+
+}

src/main/java/de/doubleslash/keeptime/model/settings/HeimatSettings.java

@@ -0,0 +1,59 @@
+// Copyright 2019 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package de.doubleslash.keeptime.model.settings;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+@Service
+public class HeimatSettings {
+
+   private final SettingsBase settingsBase;
+
+   public HeimatSettings(SettingsBase settingsBase) {
+      this.settingsBase = settingsBase;
+   }
+
+   public boolean isHeimatActive() {
+      return settingsBase.getBoolean("heimat_active", false);
+   }
+
+   public void setHeimatActive(boolean heimatActive) {
+      settingsBase.setBoolean("heimat_active", heimatActive);
+   }
+
+   public String getHeimatUrl() {
+      return settingsBase.getString("heimat_url", "");
+   }
+
+   public void setHeimatUrl(String heimatUrl) {
+      settingsBase.setString("heimat_url", heimatUrl);
+   }
+
+   public String getHeimatPat() {
+      return settingsBase.getString("heimat_pat", "");
+   }
+
+   public void setHeimatPat(String heimatPat) {
+      settingsBase.setString("heimat_pat", heimatPat);
+   }
+
+   public void save() {
+      settingsBase.save(Arrays.asList("heimat_active", "heimat_url", "heimat_pat"));
+   }
+}