Merge pull request #179 from doubleSlashde/feature/#178_heimatIntegration

Feature/#178 heimat integration

Author: Death111

README.md

@@ -35,7 +35,7 @@ Create projects and choose if they are counted as 'work time'. Select the projec
 
 ## Install
 
-* Download keeptime-<version>.zip (see [releases](https://github.com/doubleSlashde/KeepTime/releases))
+* Download keeptime-\<version\>.zip (see [releases](https://github.com/doubleSlashde/KeepTime/releases))
 * Extract the downloaded .zip
 * Try starting the application by executing the *keeptime.bat* file. The start may take up to one minute.
 
@@ -45,27 +45,34 @@ It is recommended to run the application at computer start, so you do not forget
 
 You should put the .jar in an extra folder as a *logs* and a *db* folder will be created next to it.\
 
-### Migrate from older version than v1.2.0
+## Update KeepTime
+1. Start your current version of KeepTime
+1. Open `Settings` -> `Import/Export` -> `Export` to export your data to an .sql file (Backup data)
+1. Stop KeepTime
+1. Download new version of KeepTime and extract it
+1. Start new version of KeepTime
+1. If your projects are available you are already done. But most likely your projects are missing. In this case follow the [Migrate](#Migrate) chapter
+     - Missing data is expected behavior with most updates as updates often include database version update which require an import of data
+
+### Migrate data
+1. Notice that your old data is not available after an update 
+1. Open the new version of KeepTime
+1. Open `Settings` -> `Import/Export` -> `Import` and import the previously exported .sql file 
+1. After the import KeepTime closes automatically
+1. Start KeepTime
+1. Your data is restored in the new version now
+
+### Migrate from version older than v1.2.0
 
 1. Download new version and replace the .jar file.
 2. Start new version of KeepTime. Notice that your old data is not available.
 3. Stop KeepTime
 4. Copy the files (not directories) of directory `db` (next to the .jar file) into `db/1.4.197/` (path now includes the database version).
 5. Start KeepTime again. Notice that your data is available again.
 
-### Migrate from KeepTime v1.2.0
-
-1. Start your current version of KeepTime (v1.2.0)
-2. Go to the settings and export your KeepTime data 
-3. Download new version and replace the .jar file. 
-4. Start new version of KeepTime. Notice that your old data is not available. 
-5. Open the new version and import the exported sql script 
-6. After the import KeepTime closes automatically
-7. To see the changes just start the new KeepTime again
-
 ## Requirements
 * Operating System
   * Windows 7, 10, 11
   * Linux (tested on Ubuntu 18.04)
   * Mac (tested on MacBook M2 Pro (ARM based CPU))
-* Java 17
+* Java >= 17

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.10</version>
+    <version>3.4.4</version>
     <relativePath />
     <!-- lookup parent from repository -->
   </parent>
@@ -39,7 +39,7 @@
     <java.version>17</java.version>
     <javafx.version>22</javafx.version>
 
-    <maven-dependency-check.version>9.1.0</maven-dependency-check.version>
+    <maven-dependency-check.version>12.0.1</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
     <maven-dependency-check.format>ALL</maven-dependency-check.format>
     <maven-dependency-check.failOnError>true</maven-dependency-check.failOnError>
@@ -51,12 +51,12 @@
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct</artifactId>
-      <version>1.5.5.Final</version>
+      <version>1.6.3</version>
     </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>
-      <version>1.5.5.Final</version>
+      <version>1.6.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -103,17 +103,15 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
-      <version>3.1.3</version>
     </dependency>
 
 
@@ -162,6 +160,14 @@
       <artifactId>hamcrest-library</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- for HeimatTime LocalDate (de)serializiation -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>2.18.2</version>
+    </dependency>
+
   </dependencies>
   <build>
     <finalName>keeptime-${project.version}</finalName>

src/main/java/de/doubleslash/keeptime/App.java

@@ -24,6 +24,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javafx.stage.Window;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -78,6 +79,7 @@ public class App extends Application {
    private ViewController viewController;
 
    private GlobalScreenListener globalScreenListener;
+   private Settings settings;
 
    @Override
    public void init() throws Exception {
@@ -95,6 +97,7 @@ public void init() throws Exception {
 
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
+      settings = springContext.getBean(Settings.class);
       controller.enableAutoSave();
       model.setSpringContext(springContext);
    }
@@ -108,36 +111,43 @@ public void start(final Stage primaryStage) {
       } catch (final Exception e) {
          LOG.error("There was an error while initialising the UI", e);
 
-         final Alert alert = new Alert(AlertType.ERROR);
-         alert.setTitle("Error");
-         alert.setHeaderText("Could not start application");
-         alert.setContentText("Please send the error with your logs folder to a developer");
+         showErrorDialogAndWait("Error", "Could not start application",
+               "Please send the error with your logs folder to a developer", e, null);
+         System.exit(1);
+      }
+   }
 
-         final StringWriter sw = new StringWriter();
-         final PrintWriter pw = new PrintWriter(sw);
-         e.printStackTrace(pw);
-         final String exceptionText = sw.toString();
+   public static void showErrorDialogAndWait(String title, String header, String content, final Exception e, Window window) {
+      final Alert alert = new Alert(AlertType.ERROR);
+      alert.setTitle(title);
+      alert.setHeaderText(header);
+      alert.setContentText(content);
+      if(window != null) {
+         alert.initOwner(window);
+      }
+      final StringWriter sw = new StringWriter();
+      final PrintWriter pw = new PrintWriter(sw);
+      e.printStackTrace(pw);
+      final String exceptionText = sw.toString();
 
-         final Label label = new Label("The exception stacktrace was:");
+      final Label label = new Label("The exception stacktrace was:");
 
-         final TextArea textArea = new TextArea(exceptionText);
-         textArea.setEditable(false);
-         textArea.setWrapText(true);
+      final TextArea textArea = new TextArea(exceptionText);
+      textArea.setEditable(false);
+      textArea.setWrapText(true);
 
-         textArea.setMaxWidth(Double.MAX_VALUE);
-         textArea.setMaxHeight(Double.MAX_VALUE);
-         GridPane.setVgrow(textArea, Priority.ALWAYS);
-         GridPane.setHgrow(textArea, Priority.ALWAYS);
+      textArea.setMaxWidth(Double.MAX_VALUE);
+      textArea.setMaxHeight(Double.MAX_VALUE);
+      GridPane.setVgrow(textArea, Priority.ALWAYS);
+      GridPane.setHgrow(textArea, Priority.ALWAYS);
 
-         final GridPane expContent = new GridPane();
-         expContent.setMaxWidth(Double.MAX_VALUE);
-         expContent.add(label, 0, 0);
-         expContent.add(textArea, 0, 1);
+      final GridPane expContent = new GridPane();
+      expContent.setMaxWidth(Double.MAX_VALUE);
+      expContent.add(label, 0, 0);
+      expContent.add(textArea, 0, 1);
 
-         alert.getDialogPane().setExpandableContent(expContent);
-         alert.showAndWait();
-         System.exit(1);
-      }
+      alert.getDialogPane().setExpandableContent(expContent);
+      alert.showAndWait();
    }
 
    private void initialiseApplication(final Stage primaryStage) throws Exception {
@@ -183,27 +193,6 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
    private void readSettings() {
       LOG.debug("Reading configuration");
 
-      final List<Settings> settingsList = model.getSettingsRepository().findAll();
-      final Settings settings;
-      if (settingsList.isEmpty()) {
-         LOG.info("Empty settings. Set default");
-         settings = new Settings();
-         settings.setTaskBarColor(model.taskBarColor.get());
-
-         settings.setDefaultBackgroundColor(Model.ORIGINAL_DEFAULT_BACKGROUND_COLOR);
-         settings.setDefaultFontColor(Model.ORIGINAL_DEFAULT_FONT_COLOR);
-
-         settings.setHoverBackgroundColor(Model.ORIGINAL_HOVER_BACKGROUND_COLOR);
-         settings.setHoverFontColor(Model.ORIGINAL_HOVER_Font_COLOR);
-         settings.setUseHotkey(false);
-         settings.setDisplayProjectsRight(false);
-         settings.setHideProjectsOnMouseExit(false);
-         model.getSettingsRepository().save(settings);
-      } else {
-         LOG.info("Got settings from database");
-         settings = settingsList.get(0);
-      }
-
       model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
       model.defaultFontColor.set(settings.getDefaultFontColor());
       model.hoverBackgroundColor.set(settings.getHoverBackgroundColor());

src/main/java/de/doubleslash/keeptime/common/ColorHelper.java

@@ -18,14 +18,21 @@
 
 import javafx.scene.paint.Color;
 
+import java.util.Random;
+
 public class ColorHelper {
 
+   private static final Random random = new Random();
+
    private ColorHelper() {
       throw new IllegalStateException("Utility class: ColorHelper");
    }
 
    public static Color randomColor() {
-      return Color.BLACK;
+      double hue = random.nextDouble() * 360;
+      double saturation = 0.7 + random.nextDouble() * 0.3; // High saturation
+      double brightness = 0.8 + random.nextDouble() * 0.2; // High brightness
+      return Color.hsb(hue, saturation, brightness);
    }
 
    public static String colorToCssRgba(final Color color) {

src/main/java/de/doubleslash/keeptime/common/Resources.java

@@ -40,6 +40,8 @@ public enum RESOURCE {
 
       FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
       FXML_MANAGE_WORK("/layouts/manage-work.fxml"),
+      FXML_EXT_PROJECT_MAPPING("/layouts/externalProjectMapping.fxml"),
+      FXML_EXT_PROJECT_SYNC("/layouts/externalProjectSync.fxml"),
 
       SVG_CALENDAR_DAYS_ICON("/svgs/calendar-days.svg"),
 
@@ -69,8 +71,20 @@ public enum RESOURCE {
 
       SVG_MULTIPLE_CLIPBOARD_ICON("/svgs/copy.svg"),
 
-      ICON_MAIN("/icons/icon.png")
+      SVG_SPINNER_SOLID("/svgs/spinner-solid.svg"),
 
+      SVG_XMARK_SOLID("/svgs/xmark-solid.svg"),
+
+      SVG_THUMBS_UP_SOLID("/svgs/thumbs-up-solid.svg"),
+
+      SVG_GLOBE_ICON("/svgs/globe-solid.svg"),
+
+      SVG_ROTATE_ICON("/svgs/rotate-solid.svg"),
+
+      ICON_MAIN("/icons/icon.png"),
+
+      /** CSS **/
+      CSS_DS_STYLE("/css/dsStyles.css")
       ;
 
       String resourceLocation;

src/main/java/de/doubleslash/keeptime/common/SvgNodeProvider.java

@@ -65,7 +65,7 @@ public static String getSvgPathWithXMl(Resources.RESOURCE resource){
       return svgPath;
    }
 
-   public static SVGPath getSvgNodeWithScale(Resources.RESOURCE resource, Double scaleX, Double scaleY) {
+   public static SVGPath getSvgNodeWithScale(Resources.RESOURCE resource, double scaleX, double scaleY) {
       SVGPath iconSvg = new SVGPath();
       iconSvg.setContent(getSvgPathWithXMl(resource));
       iconSvg.setScaleX(scaleX);