Merge pull request #204 from doubleSlashde/develop

Develop to master

Author: Death111

.github/workflows/mavenCi.yml

@@ -44,12 +44,6 @@ jobs:
           name: KeepTime-${{ env.version }}
           path: /home/runner/work/KeepTime/KeepTime/target/*-bin.zip
 
-      - name: Analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -V -B sonar:sonar -Dsonar.host.url=${{ secrets.HOST_URL }} -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }} -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.java.binaries=. -Dsonar.qualitygate.wait=false
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
 

README.md

@@ -4,6 +4,8 @@ Application to track your time spent on different projects each day. Aim was to
 
 Create projects and choose if they are counted as 'work time'. Select the project you work on. Before you switch the project, write a comment on what u did. Change the project. Repeat.
 
+KeepTime can connect to [Heimat](https://heimat-software.com/) so you can import Heimat projects and sync your tracked time back to Heimat. Details: [heimat.md](readme/heimat.md).
+
 ## Usage
 
 ### Main view:
@@ -29,9 +31,25 @@ Create projects and choose if they are counted as 'work time'. Select the projec
 + Export: export database for backup and later import (import currently not yet implemented)
 
 ### Reports:
-![Report Screen](readme/images/reportDescription.png?raw=true "Report")
 
-+ the report screen gives you a summary for every day
+KeepTime’s reporting workflow works by tracking daily work and synchronizing project activities with external task management. Here’s how you use it:
+
+1. **Track Your Work**  
+   Throughout your workday, log activities and assign them to projects. Each entry includes a timeslot, duration, and optional notes.
+
+2. **Review Your Daily Report**  
+   At any time, open the report view to see an overview of your day, including all logged activities, their durations, and project associations.
+
+3. **Edit and Manage Entries**  
+   Use the controls in the report to copy, edit, or delete individual work entries as needed. You can also copy notes or summaries for external use.
+
+4. **Select the Day to View**  
+   Use the calendar widget to select which day’s report you want to review. Only days with recorded work are available.
+
+5. **Synchronize Projects with Heimat**  
+   If you want you can syncronize the current date with Heimat. See [heimat.md](readme/heimat.md)
+
+![Report Dialog](readme/images/reportDescription.png)
 
 ## Install
 
@@ -73,6 +91,6 @@ You should put the .jar in an extra folder as a *logs* and a *db* folder will be
 ## Requirements
 * Operating System
   * Windows 7, 10, 11
-  * Linux (tested on Ubuntu 18.04)
+  * Linux (tested on Ubuntu 18.04, Fedora Workstation 43)
   * Mac (tested on MacBook M2 Pro (ARM based CPU))
 * Java >= 17

keeptime.bat

@@ -1 +1,27 @@
-start "" "javaw" -Dprism.order=sw -jar keeptime.jar
+@echo off
+setlocal
+
+cd /d "%~dp0"
+
+where javaw >nul 2>&1
+if errorlevel 1 (
+    echo ERROR: Java was not found.
+    echo.
+    echo Please install Java.
+    echo See installation requirements: https://github.com/doubleSlashde/KeepTime#requirements
+    echo.
+    pause
+    exit /b 1
+)
+
+if not exist "keeptime.jar" (
+    echo ERROR: keeptime.jar was not found in this folder.
+    echo.
+    echo Please download and extract KeepTime from the releases page.
+    echo See installation instructions: https://github.com/doubleSlashde/KeepTime#install
+    echo.
+    pause
+    exit /b 1
+)
+
+start "" "javaw" -Dprism.order=sw -jar keeptime.jar

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.4</version>
+    <version>3.5.14</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>12.0.1</maven-dependency-check.version>
+    <maven-dependency-check.version>12.2.2</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>
@@ -103,7 +103,18 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>2.8.5</version>
+      <version>2.8.17</version>
+    </dependency>
+    <!-- Overwrite tomcat version due to security vulnerability. remove when possible -->
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>10.1.55</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.tomcat.embed</groupId>
+        <artifactId>tomcat-embed-websocket</artifactId>
+        <version>10.1.55</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -147,14 +158,9 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
-      <version>3.7.1</version>
+      <version>3.8.0</version>
       <type>maven-plugin</type>
     </dependency>
-    <dependency>
-      <groupId>org.sonarsource.scanner.maven</groupId>
-      <artifactId>sonar-maven-plugin</artifactId>
-      <version>3.11.0.3922</version>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
@@ -165,7 +171,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>2.18.2</version>
+      <version>2.22.0</version>
     </dependency>
 
   </dependencies>
@@ -208,7 +214,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.22.0</version>
       </plugin>
 
       <!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven (run with mvn dependency-check:check ) -->
@@ -267,21 +273,21 @@
            <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.11.0</version>
+            <version>3.15.0</version>
             <configuration>
               <annotationProcessorPaths>
                 <path>
                   <groupId>org.mapstruct</groupId>
                   <artifactId>mapstruct-processor</artifactId>
-                  <version>1.5.5.Final</version>
+                  <version>1.6.3</version>
                 </path>
               </annotationProcessorPaths>
             </configuration>
           </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.10</version>
+            <version>0.8.14</version>
             <executions>
               <execution>
                 <id>prepare-agent</id>

readme/heimat.md

@@ -0,0 +1,53 @@
+# Heimat integration
+
+[Heimat](https://heimat-software.com/) is external project and time-tracking software. KeepTime can connect to it so you can:
+
+- **Import** projects from Heimat into KeepTime, or **link** Heimat projects to projects you already have in KeepTime.
+- **Push** the time you logged in KeepTime for a given day into Heimat when you choose to sync.
+
+**Important:** KeepTime never writes to Heimat on its own. Data is sent to Heimat only when you run the sync from the report view.
+
+---
+
+## 1. Connect KeepTime to Heimat
+
+1. Open **Settings** and go to the **HEIMAT** section.
+
+   ![Settings Heimat](images/settingsHeimat.png "Settings Heimat")
+
+2. Fill in:
+
+   | Field            | What to enter                                                                                                        |
+   | ---------------- | -------------------------------------------------------------------------------------------------------------------- |
+   | **URL**          | Your Heimat instance URL (the same base URL you use in the browser), for example `https://your-company.example.com`. |
+   | **Access token** | Create or copy a token in Heimat (under your account or API settings) and paste it here.                             |
+
+   ![Heimat Website](images/heimatWebsite.png "Heimat Website")
+
+3. Click **Validate connection**. If it succeeds, the integration is ready to use.
+
+---
+
+## 2. Match Heimat projects to KeepTime
+
+After a successful connection, use **Map projects** (button in Heimat settings dialog) to either:
+
+- Map each Heimat project to an existing KeepTime project, or  
+- Import Heimat projects as new KeepTime projects.
+
+Do this once (or whenever your project lists change) so KeepTime knows where each Heimat project should go.
+
+---
+
+## 3. Sync a day’s work to Heimat
+
+When you want to upload time for the **currently selected day** in the report:
+
+1. Open the **report** view for that day.
+2. Click the **sync** button (Heimat / external sync).
+3. In the dialog, choose which projects to include and add any **note** you want stored with the sync.
+4. Click **Sync** to send that day’s tracked time to Heimat.
+
+![External Project Dialog](images/externalProjectDialog.png)
+
+Until you complete step 4, nothing is written to Heimat.

readme/images/externalProjectDialog.png

@@ -21,6 +21,7 @@
 import java.io.StringWriter;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -84,6 +85,9 @@ public class App extends Application {
    @Override
    public void init() throws Exception {
       LOG.info("Starting KeepTime.");
+
+      setLocaleToEnglish();
+
       final DefaultExceptionHandler defaultExceptionHandler = new DefaultExceptionHandler();
       defaultExceptionHandler.register();
 
@@ -102,6 +106,22 @@ public void init() throws Exception {
       model.setSpringContext(springContext);
    }
 
+   private void setLocaleToEnglish() {
+      final Locale systemDefaultLocale = Locale.getDefault();
+      final Locale wantedApplicationLocale = Locale.ENGLISH;
+
+      if (systemDefaultLocale.getLanguage().equals(wantedApplicationLocale.getLanguage())) {
+         LOG.debug("Application locale already is '{}'. Nothing to do.", wantedApplicationLocale);
+         return;
+      }
+
+      LOG.info("Setting application locale to '{}', was '{}'.", wantedApplicationLocale, systemDefaultLocale);
+      Locale.setDefault(wantedApplicationLocale);
+      Locale.setDefault(Locale.Category.DISPLAY, wantedApplicationLocale);
+      // keep system locale for format conversions (date, currency, numbers)
+      Locale.setDefault(Locale.Category.FORMAT, systemDefaultLocale);
+   }
+
    @Override
    public void start(final Stage primaryStage) {
       LOG.info("Initialising the UI");
@@ -117,12 +137,13 @@ public void start(final Stage primaryStage) {
       }
    }
 
-   public static void showErrorDialogAndWait(String title, String header, String content, final Exception e, Window window) {
+   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) {
+      if (window != null) {
          alert.initOwner(window);
       }
       final StringWriter sw = new StringWriter();