PTBAS-738: fix element not present error for booking hint. also show booking hint when manually added. prefix booking hint. show (i) at the end

Author: Death111

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

@@ -110,6 +110,7 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
          String heimatNotes = "";
          long heimatTimeSeconds = 0;
          boolean isMappedInHeimat = false;
+         String bookingHint = "";
          final Optional<ExternalProjectMapping> optHeimatMapping = mappedProjects.stream()
                                                                                  .filter(mp -> mp.getProject().getId()
                                                                                        == project.getId())
@@ -118,6 +119,11 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
          Optional<Mapping> optionalExistingMapping = Optional.empty();
          if (optHeimatMapping.isPresent()) {
             isMappedInHeimat = true;
+            bookingHint = heimatTasks.stream()
+                                     .filter(ht -> ht.id() == optHeimatMapping.get().getExternalTaskId())
+                                     .map(HeimatTask::bookingHint)
+                                     .findAny()
+                                     .orElseGet(String::new);
             optionalExistingMapping = list.stream()
                                           .filter(mapping -> mapping.heimatTaskId == optHeimatMapping.get()
                                                                                                      .getExternalTaskId())
@@ -161,12 +167,6 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
                   new StyledMessage.TextSegment("\n(" + externalProjectMapping.getExternalProjectName() + ")"));
          }
 
-         final String bookingHint = heimatTasks.stream()
-                                               .filter(ht -> ht.id() == optHeimatMapping.get().getExternalTaskId())
-                                               .map(HeimatTask::bookingHint)
-                                               .findAny()
-                                               .orElseGet(String::new);
-
          if (optionalExistingMapping.isPresent()) {
             final Mapping existingMapping = optionalExistingMapping.get();
             final ArrayList<Project> projects = new ArrayList<>(existingMapping.projects());
@@ -212,8 +212,7 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
          }
 
          final Mapping mapping = new Mapping(id, true, false,
-               StyledMessage.of(new StyledMessage.TextSegment("Not mapped in KeepTime\n\n" + taskName)), "",
-               times,
+               StyledMessage.of(new StyledMessage.TextSegment("Not mapped in KeepTime\n\n" + taskName)), "", times,
 
                new ArrayList<>(0), heimatNotes, "", heimatTimeSeconds, 0);
          list.add(mapping);

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

@@ -223,7 +223,7 @@ public void initForDate(LocalDate currentReportDate, List<Work> currentWorkItems
                new StyledMessage.TextSegment("\n(" + selectedTask.taskHolderName() + ")"));
 
          TableRow addedRow = new TableRow(
-               new HeimatController.Mapping(selectedTask.id(), true, true, syncMessage, "", List.of(), List.of(), "",
+               new HeimatController.Mapping(selectedTask.id(), true, true, syncMessage, selectedTask.bookingHint(), List.of(), List.of(), "",
                      "", 0, 0), "", 0);
          items.add(addedRow);
          itemsForBindings.add(addedRow); // add new row also to items2 - as it is not added automatically :(
@@ -443,12 +443,13 @@ protected void updateItem(TableRow item, boolean empty) {
                                       .map(n -> ((Text) n).getText())
                                       .collect(Collectors.joining());
 
-            if (!item.bookingHint.isEmpty().get()) {
+            final String bookingHint = item.bookingHint.get();
+            if (!bookingHint.isEmpty()) {
                statusFlow = new TextFlow(statusFlow);
-               tooltip.setText(statusForTooltip + "\n" + item.bookingHint.get());
-               Text icon = new Text("ⓘ ");
+               tooltip.setText(statusForTooltip + "\nBookinghint: " + bookingHint);
+               Text icon = new Text(" ⓘ");
                icon.setStyle("-fx-text-fill: #1c2070; -fx-font-size: 14px;");
-               statusFlow.getChildren().add(0, icon);
+               statusFlow.getChildren().add(icon);
             } else {
                tooltip.setText(statusForTooltip);
             }