Merge branch 'develop' into feature/#38_remember_last_position_on_screen

Author: JSchraff

CONTRIBUTING.md

@@ -6,3 +6,11 @@ If you want to contribute please follow this guideline.
 
 For editing fxml files, use the "JavaFX Scene Builder" in version 8.5.0.  
 Layouting is generally done with fxml files.
+
+For fontawesome support add Libraries 
+`de.jensd:fontawsomefx-commons:8.15`
+`de.jensd:fontawsomefx-fontawsome:4.7.0-5`
+to the "JavaFX Scene Builder"
+
+Scene Builder may sometimes delete unicode Charakters when fxml file is changed.
+reset Glyph Name to reset uniocode Charakter.

pom.xml

@@ -93,6 +93,18 @@
       <version>3.1.1</version>
       <type>maven-plugin</type>
     </dependency>
+    
+    <dependency>
+      <groupId>de.jensd</groupId>
+      <artifactId>fontawesomefx-commons</artifactId>
+      <version>8.15</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>de.jensd</groupId>
+      <artifactId>fontawesomefx-fontawesome</artifactId>
+      <version>4.7.0-5</version>
+    </dependency>
   </dependencies>
 
   <build>

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

@@ -140,7 +140,8 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       FontProvider.loadFonts();
       readSettings();
 
-      final List<Work> todaysWorkItems = model.getWorkRepository().findByCreationDate(LocalDate.now());
+      final List<Work> todaysWorkItems = model.getWorkRepository()
+            .findByCreationDateOrderByStartTimeAsc(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 
@@ -317,7 +318,6 @@ public void changed(final ObservableValue<? extends Number> observable, final Nu
 
       registerMinimizeEventlistener(mainScene, primaryStage);
       registerMaximizeEventlistener(mainScene, primaryStage);
-      // Image(Resources.getResource(RESOURCE.ICON_MAIN).toString())); // TODO use an app icon
 
       primaryStage.setTitle("KeepTime");
       primaryStage.setScene(mainScene);

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

@@ -39,11 +39,10 @@ public enum RESOURCE {
       FXML_REPORT("/layouts/report.fxml"),
       FXML_ABOUT("/layouts/about.fxml"),
       FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
-
-      // icon
-      ICON_MAIN("/icons/icon.png"),
+      FXML_MANAGE_WORK("/layouts/manage-work.fxml"),
 
       ;
+
       String resourceLocation;
 
       private RESOURCE(final String resourceLocation) {

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

@@ -187,6 +187,27 @@ public void editProject(final Project projectToBeUpdated, final Project newValue
       model.getProjectRepository().saveAll(changedProjects);
    }
 
+   public void editWork(final Work workToBeEdited, final Work newValuedWork) {
+      LOG.info("Changing work '{}' to '{}'.", workToBeEdited, newValuedWork);
+
+      workToBeEdited.setCreationDate(newValuedWork.getCreationDate());
+      workToBeEdited.setStartTime(newValuedWork.getStartTime());
+      workToBeEdited.setEndTime(newValuedWork.getEndTime());
+      workToBeEdited.setNotes(newValuedWork.getNotes());
+      workToBeEdited.setProject(newValuedWork.getProject());
+
+      final Work editedWork = model.getWorkRepository().save(workToBeEdited);
+
+      // remove old
+      model.getPastWorkItems().removeIf(w -> (w.getId() == workToBeEdited.getId()));
+      // add if started today
+      final LocalDate dateNow = dateProvider.dateTimeNow().toLocalDate();
+      if (dateNow.equals(editedWork.getCreationDate())) {
+         model.getPastWorkItems().add(editedWork);
+      }
+
+   }
+
    /**
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
@@ -301,4 +322,5 @@ public long calcSeconds(final List<Work> workItems) {
 
       return seconds;
    }
+
 }

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

@@ -19,6 +19,7 @@
 import java.util.Comparator;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
@@ -64,6 +65,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    private ObservableList<Project> allProjects = FXCollections.observableArrayList();
 
    protected final ObservableList<Work> pastWorkItems = FXCollections.observableArrayList();
+   private final SortedList<Work> sortedPastWorkItems = new SortedList<>(pastWorkItems,
+         Comparator.comparing(Work::getStartTime));
    public final ObjectProperty<Work> activeWorkItem = new SimpleObjectProperty<>();
 
    public final ObjectProperty<Color> taskBarColor = new SimpleObjectProperty<>(ORIGINAL_TASK_BAR_FONT_COLOR);
@@ -77,12 +80,15 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
    public final ObjectProperty<Boolean> useHotkey = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> displayProjectsRight = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Boolean> hideProjectsOnMouseExit = new SimpleObjectProperty<>(true);
+   public final ObjectProperty<Boolean> emptyNoteReminder = new SimpleObjectProperty<>(false);
 
    public final ObjectProperty<Boolean> saveWindowPosition = new SimpleObjectProperty<>(false);
    public final ObjectProperty<Double> windowPositionY = new SimpleObjectProperty<>(0.5);
    public final ObjectProperty<Double> windowPositionX = new SimpleObjectProperty<>(0.5);
    public final ObjectProperty<Integer> screenHash = new SimpleObjectProperty<>(0);
 
+   private ConfigurableApplicationContext springContext;
+
    public void setWorkRepository(final WorkRepository workRepository) {
       this.workRepository = workRepository;
    }
@@ -156,4 +162,16 @@ private Screen getScreenWithHashOrPrimary(final int hash) {
       }
       return Screen.getPrimary();
    }
+
+   public void setSpringContext(final ConfigurableApplicationContext springContext) {
+      this.springContext = springContext;
+   }
+
+   public ConfigurableApplicationContext getSpringContext() {
+      return this.springContext;
+   }
+
+   public SortedList<Work> getSortedPastWorkItems() {
+      return sortedPastWorkItems;
+   }
 }

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

@@ -36,6 +36,7 @@ public class Work {
    @Column(name = "id", updatable = false, nullable = false)
    private long id;
 
+   // TODO revise CreationDate Logic to use Date of StartTime
    private LocalDate creationDate;
    private LocalDateTime startTime;
    private LocalDateTime endTime;
@@ -45,7 +46,8 @@ public class Work {
    @Lob
    private String notes;
 
-   public Work() {}
+   public Work() {
+   }
 
    public Work(final LocalDate creationDate, final LocalDateTime startTime, final LocalDateTime endTime,
          final Project project, final String notes) {
@@ -89,6 +91,10 @@ public Project getProject() {
       return project;
    }
 
+   public void setProject(final Project project) {
+      this.project = project;
+   }
+
    public String getNotes() {
       return notes;
    }
@@ -97,4 +103,10 @@ public void setNotes(final String notes) {
       this.notes = notes;
    }
 
+   @Override
+   public String toString() {
+      return "Work [id=" + id + ", creationDate=" + creationDate + ", startTime=" + startTime + ", endTime=" + endTime
+            + ", projectName=" + project.getName() + ", notes=" + notes + "]";
+   }
+
 }

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

@@ -27,5 +27,5 @@
 @Repository
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
-   List<Work> findByCreationDate(LocalDate creationDate);
+   List<Work> findByCreationDateOrderByStartTimeAsc(LocalDate creationDate);
 }

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

@@ -140,6 +140,7 @@ public ObservableList<LicenseTableRow> loadLicenseRows() {
       licenseRows.add(new LicenseTableRow("spring-boot-starter-data-jpa", Licenses.APACHEV2));
       licenseRows.add(new LicenseTableRow("mockito-core", Licenses.MIT));
       licenseRows.add(new LicenseTableRow("h2", Licenses.EPLV1));
+      licenseRows.add(new LicenseTableRow("fontawesomefx", Licenses.APACHEV2));
 
       licenseRows.sort(Comparator.comparing(LicenseTableRow::getName));
 
@@ -154,7 +155,7 @@ private void showLicense(final Licenses license) {
          alert.setContentText(String.format(
                "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".",
                license.getPath(), license.getUrl()));
-         
+
          alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
 
          alert.show();