#178: adding "Sync to" prefix now consistently. scrolling to newly added row in sync view

Author: Death111

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

@@ -163,14 +163,17 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
             projects.add(project);
             final long keepTimeSeconds = existingMapping.keeptimeSeconds() + projectWorkSeconds;
             final long heimatSeconds = existingMapping.heimatSeconds();
-            final boolean shouldBeSynced = isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatSeconds, keepTimeSeconds);
+            final boolean shouldBeSynced =
+                  isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatSeconds, keepTimeSeconds);
             final Mapping mapping = new Mapping(isMappedInHeimat ? optHeimatMapping.get().getExternalTaskId() : -1,
                   isMappedInHeimat, shouldBeSynced, canBeSyncedMessage, existingMapping.existingTimes(), projects,
-                  existingMapping.heimatNotes(), existingMapping.keeptimeNotes() + ". " + keeptimeNotes, heimatSeconds, keepTimeSeconds);
+                  existingMapping.heimatNotes(), existingMapping.keeptimeNotes() + ". " + keeptimeNotes, heimatSeconds,
+                  keepTimeSeconds);
             list.remove(existingMapping);
             list.add(mapping);
          } else {
-            final boolean shouldBeSynced = isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatTimeSeconds, projectWorkSeconds);
+            final boolean shouldBeSynced =
+                  isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatTimeSeconds, projectWorkSeconds);
             final List<Project> projects = Collections.singletonList(project);
             final Mapping mapping = new Mapping(isMappedInHeimat ? optHeimatMapping.get().getExternalTaskId() : -1,
                   isMappedInHeimat, shouldBeSynced, canBeSyncedMessage, optionalAlreadyBookedTimes, projects,
@@ -219,21 +222,22 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
          long heimatTimeSeconds = addHeimatTimes(times);
 
          final Mapping mapping2 = new Mapping(id, true, false,
-               "Present in HEIMAT but not KeepTime\n\n" + externalProjectMapping.getExternalTaskName() + "\n"
-                     + externalProjectMapping.getExternalProjectName(), times, mappedProjects.stream()
-                                                                                             .filter(
-                                                                                                   mp -> mp.getExternalTaskId()
-                                                                                                         == id)
-                                                                                             .map(ExternalProjectMapping::getProject)
-                                                                                             .toList(), heimatNotes, "",
-               heimatTimeSeconds, 0);
+               "Present in HEIMAT but not KeepTime\n\nSync to " + externalProjectMapping.getExternalTaskName() + "\n("
+                     + externalProjectMapping.getExternalProjectName() + ")", times, mappedProjects.stream()
+                                                                                                   .filter(
+                                                                                                         mp -> mp.getExternalTaskId()
+                                                                                                               == id)
+                                                                                                   .map(ExternalProjectMapping::getProject)
+                                                                                                   .toList(),
+               heimatNotes, "", heimatTimeSeconds, 0);
          list.add(mapping2);
       });
 
       return list;
    }
 
-   private static boolean differenceGreaterOrEqual15Minutes(final long heimatTimeSeconds, final long projectWorkSeconds) {
+   private static boolean differenceGreaterOrEqual15Minutes(final long heimatTimeSeconds,
+         final long projectWorkSeconds) {
       return heimatTimeSeconds == 0L || Math.abs(heimatTimeSeconds - projectWorkSeconds) >= 15 * 60L;
    }
 

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

@@ -203,11 +203,12 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
       addHeimatTaskButton.setOnAction(ae -> {
          final HeimatTask task = heimatTaskComboBox.getValue();
          final TableRow addedRow = new TableRow(new HeimatController.Mapping(task.id(), true, true,
-               "Manually added\n\n" + task.name() + "\n(" + task.taskHolderName() + ")", List.of(), List.of(), "", "",
-               0, 0), "", 0);
+               "Manually added\n\nSync to " + task.name() + "\n(" + task.taskHolderName() + ")", List.of(), List.of(),
+               "", "", 0, 0), "", 0);
          items.add(addedRow);
          items2.add(addedRow); // add new row also to items2 - as it is not added automatically :(
          heimatTaskComboBox.getSelectionModel().clearSelection();
+         mappingTableView.scrollTo(items.size() - 1); // scroll to newly added row
       });
 
    }
@@ -482,7 +483,8 @@ protected List<HeimatController.HeimatErrors> call() {
             LOG.error("Task failed unexpectedly.", exception);
             loadingScreenShowSyncing("Something very unexpected has happened :(", loadingFailure);
 
-            showErrorDialog(Collections.singletonList("Please report this to a developer. The error was:" + exception.getMessage()));
+            showErrorDialog(Collections.singletonList(
+                  "Please report this to a developer. The error was:" + exception.getMessage()));
             showLoadingScreen(false);
             thisStage.close();
          });